diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2017-05-29 14:46:41 +0200 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-06-13 19:39:19 +0200 |
commit | c83758cd9046d3b0a1fb3629091dc741d84819a8 (patch) | |
tree | cd9974a44a31bd607024214a04d766e023b417cf | |
parent | 4ff479b83c659760fabec54a42b44133ebcd045e (diff) | |
download | alpine_aports-c83758cd9046d3b0a1fb3629091dc741d84819a8.tar.bz2 alpine_aports-c83758cd9046d3b0a1fb3629091dc741d84819a8.tar.xz alpine_aports-c83758cd9046d3b0a1fb3629091dc741d84819a8.zip |
scripts/mkimg.*: add title and description
(cherry picked from commit 21c35028cd0ee91e6032a19465170cbb48e8f30f)
-rwxr-xr-x | scripts/mkimg.arm.sh | 8 | ||||
-rwxr-xr-x | scripts/mkimg.minirootfs.sh | 4 | ||||
-rwxr-xr-x | scripts/mkimg.standard.sh | 16 | ||||
-rwxr-xr-x | scripts/mkimg.xen.sh | 4 |
4 files changed, 32 insertions, 0 deletions
diff --git a/scripts/mkimg.arm.sh b/scripts/mkimg.arm.sh index 7599257cc4..15c5e3e191 100755 --- a/scripts/mkimg.arm.sh +++ b/scripts/mkimg.arm.sh | |||
@@ -46,6 +46,10 @@ section_rpi_config() { | |||
46 | 46 | ||
47 | profile_rpi() { | 47 | profile_rpi() { |
48 | profile_base | 48 | profile_base |
49 | title="Raspberry Pi" | ||
50 | desc="Includes Raspberry Pi kernel. | ||
51 | Does not include grsec patchset. | ||
52 | And much more..." | ||
49 | image_ext="tar.gz" | 53 | image_ext="tar.gz" |
50 | arch="armhf" | 54 | arch="armhf" |
51 | rpi_firmware_commit="32c28990b18908ce899c289bcd12c6e9daeb1588" | 55 | rpi_firmware_commit="32c28990b18908ce899c289bcd12c6e9daeb1588" |
@@ -76,6 +80,10 @@ section_uboot() { | |||
76 | 80 | ||
77 | profile_uboot() { | 81 | profile_uboot() { |
78 | profile_base | 82 | profile_base |
83 | title="Generic ARM" | ||
84 | desc="Has default ARM kernel. | ||
85 | Includes the uboot bootloader. | ||
86 | Supports armhf and aarch64." | ||
79 | image_ext="tar.gz" | 87 | image_ext="tar.gz" |
80 | arch="aarch64 armhf armv7" | 88 | arch="aarch64 armhf armv7" |
81 | case "$ARCH" in | 89 | case "$ARCH" in |
diff --git a/scripts/mkimg.minirootfs.sh b/scripts/mkimg.minirootfs.sh index 27644f39bc..ec2b1435dc 100755 --- a/scripts/mkimg.minirootfs.sh +++ b/scripts/mkimg.minirootfs.sh | |||
@@ -14,6 +14,10 @@ create_image_rootfs() { | |||
14 | } | 14 | } |
15 | 15 | ||
16 | profile_minirootfs() { | 16 | profile_minirootfs() { |
17 | title="Mini root filesystem" | ||
18 | desc="Minimal root filesystem. | ||
19 | For use in containers | ||
20 | and minimal chroots." | ||
17 | image_ext=tar.gz | 21 | image_ext=tar.gz |
18 | output_format=rootfs | 22 | output_format=rootfs |
19 | arch="x86 x86_64 armhf aarch64 ppc64le s390x" | 23 | arch="x86 x86_64 armhf aarch64 ppc64le s390x" |
diff --git a/scripts/mkimg.standard.sh b/scripts/mkimg.standard.sh index 32b5575a2a..4337e07105 100755 --- a/scripts/mkimg.standard.sh +++ b/scripts/mkimg.standard.sh | |||
@@ -1,4 +1,8 @@ | |||
1 | profile_standard() { | 1 | profile_standard() { |
2 | title="Standard" | ||
3 | desc="Alpine as it was intended. | ||
4 | Just enough to get you started. | ||
5 | Network connection is required." | ||
2 | profile_base | 6 | profile_base |
3 | image_ext="iso" | 7 | image_ext="iso" |
4 | arch="x86 x86_64" | 8 | arch="x86 x86_64" |
@@ -9,6 +13,10 @@ profile_standard() { | |||
9 | 13 | ||
10 | profile_vanilla() { | 14 | profile_vanilla() { |
11 | profile_standard | 15 | profile_standard |
16 | title="Vanilla" | ||
17 | desc="Includes a vanilla kernel. | ||
18 | Does not include grsec patch set. | ||
19 | Suitable for debugging." | ||
12 | #arch="$arch aarch64" | 20 | #arch="$arch aarch64" |
13 | arch="$arch ppc64le" | 21 | arch="$arch ppc64le" |
14 | kernel_flavors="vanilla" | 22 | kernel_flavors="vanilla" |
@@ -17,6 +25,10 @@ profile_vanilla() { | |||
17 | 25 | ||
18 | profile_extended() { | 26 | profile_extended() { |
19 | profile_standard | 27 | profile_standard |
28 | title="Extended" | ||
29 | desc="Most common used packages included. | ||
30 | Suitable for routers and servers. | ||
31 | Runs from RAM." | ||
20 | kernel_addons="dahdi-linux xtables-addons zfs spl" | 32 | kernel_addons="dahdi-linux xtables-addons zfs spl" |
21 | apks="$apks | 33 | apks="$apks |
22 | dahdi-linux dahdi-tools ethtool hwdata lftp links | 34 | dahdi-linux dahdi-tools ethtool hwdata lftp links |
@@ -53,6 +65,10 @@ profile_extended() { | |||
53 | 65 | ||
54 | profile_virt() { | 66 | profile_virt() { |
55 | profile_standard | 67 | profile_standard |
68 | title="Virtual" | ||
69 | desc="Similar to standard. | ||
70 | Slimmed down kernel. | ||
71 | Optimized for virtual systems." | ||
56 | kernel_addons= | 72 | kernel_addons= |
57 | kernel_flavors="virthardened" | 73 | kernel_flavors="virthardened" |
58 | kernel_cmdline="console=tty0 console=ttyS0,115200" | 74 | kernel_cmdline="console=tty0 console=ttyS0,115200" |
diff --git a/scripts/mkimg.xen.sh b/scripts/mkimg.xen.sh index 5b725e66c0..556abd9af9 100755 --- a/scripts/mkimg.xen.sh +++ b/scripts/mkimg.xen.sh | |||
@@ -9,6 +9,10 @@ section_xen() { | |||
9 | 9 | ||
10 | profile_xen() { | 10 | profile_xen() { |
11 | profile_standard | 11 | profile_standard |
12 | title="Xen" | ||
13 | desc="Build-in support for Xen Hypervisor. | ||
14 | Includes packages targed at Xen usage. | ||
15 | Includes grsec kernel." | ||
12 | arch="x86_64" | 16 | arch="x86_64" |
13 | kernel_cmdline="nomodeset" | 17 | kernel_cmdline="nomodeset" |
14 | xen_params="" | 18 | xen_params="" |