diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2017-05-23 17:06:45 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-05-23 17:07:04 +0000 |
commit | 122ec5b9707438c3c80c1b5a5adc32ef1b8d2b54 (patch) | |
tree | eb7a6c36d1ae1335b0791819cdd1eee279d2076a | |
parent | 7569d2dc1122e5b01cfb5b2ade1431dc01fcfae6 (diff) | |
download | alpine_aports-122ec5b9707438c3c80c1b5a5adc32ef1b8d2b54.tar.bz2 alpine_aports-122ec5b9707438c3c80c1b5a5adc32ef1b8d2b54.tar.xz alpine_aports-122ec5b9707438c3c80c1b5a5adc32ef1b8d2b54.zip |
main/alpine-conf: upgrade to 3.6.0_rc2
3 files changed, 3 insertions, 77 deletions
diff --git a/main/alpine-conf/0001-setup-disk-add-xfs-support-as-boot_fs.patch b/main/alpine-conf/0001-setup-disk-add-xfs-support-as-boot_fs.patch deleted file mode 100644 index f754af797a..0000000000 --- a/main/alpine-conf/0001-setup-disk-add-xfs-support-as-boot_fs.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From c15da3bf6ba6d7b05cac6c6182efdd4149554b82 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jakub Skrzypnik <j.skrzypnik@openmailbox.orxg> | ||
3 | Date: Fri, 6 Jan 2017 08:47:02 +0100 | ||
4 | Subject: [PATCH] setup-disk: add xfs support as boot_fs | ||
5 | |||
6 | --- | ||
7 | setup-disk.in | 4 ++-- | ||
8 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
9 | |||
10 | diff --git a/setup-disk.in b/setup-disk.in | ||
11 | index 023974e..c4103e4 100644 | ||
12 | --- a/setup-disk.in | ||
13 | +++ b/setup-disk.in | ||
14 | @@ -141,7 +141,7 @@ find_mount_dev() { | ||
15 | } | ||
16 | |||
17 | supported_boot_fs() { | ||
18 | - local supported="ext2 ext3 ext4 btrfs" | ||
19 | + local supported="ext2 ext3 ext4 btrfs xfs" | ||
20 | local fs= | ||
21 | for fs in $supported; do | ||
22 | [ "$fs" = "$1" ] && return 0 | ||
23 | @@ -941,7 +941,7 @@ usage() { | ||
24 | If BOOTFS, ROOTFS, VARFS are specified, then format a partition with specified | ||
25 | filesystem. If not specified, the default filesystem is ext4. | ||
26 | Supported filesystems for | ||
27 | - boot: ext2, ext3, ext4, btrfs | ||
28 | + boot: ext2, ext3, ext4, btrfs, xfs | ||
29 | root: ext2, ext3, ext4, btrfs, xfs | ||
30 | var: ext2, ext3, ext4, btrfs, xfs | ||
31 | __EOF__ | ||
32 | -- | ||
33 | 2.13.0 | ||
34 | |||
diff --git a/main/alpine-conf/0001-setup-keymap-allow-specify-the-variant-together-with.patch b/main/alpine-conf/0001-setup-keymap-allow-specify-the-variant-together-with.patch deleted file mode 100644 index 3214d0bc4f..0000000000 --- a/main/alpine-conf/0001-setup-keymap-allow-specify-the-variant-together-with.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From be87a08bc2200b80c068347568bea07a4fa09fb7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | Date: Fri, 19 May 2017 14:39:35 +0200 | ||
4 | Subject: [PATCH] setup-keymap: allow specify the variant together with layout | ||
5 | |||
6 | Some users may know exactly which variant they want, and instead of | ||
7 | asking them two questions, we accept if users types in the variant at | ||
8 | the first question. | ||
9 | |||
10 | if the variant does not exist, then user is prompted. | ||
11 | --- | ||
12 | setup-keymap.in | 8 +++++++- | ||
13 | 1 file changed, 7 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/setup-keymap.in b/setup-keymap.in | ||
16 | index 67f89cb..ebcd29c 100644 | ||
17 | --- a/setup-keymap.in | ||
18 | +++ b/setup-keymap.in | ||
19 | @@ -38,7 +38,13 @@ select_layout() { | ||
20 | default_read layout "$layout" | ||
21 | if [ "$layout" = "abort" ] || [ "$layout" = "none" ] ; then | ||
22 | goodbye 0 | ||
23 | - elif [ -d "$MAPDIR/$layout" ] ; then | ||
24 | + fi | ||
25 | + set -- $layout | ||
26 | + if [ $# -eq 2 ]; then | ||
27 | + layout="$1" | ||
28 | + variant="$2" | ||
29 | + fi | ||
30 | + if [ -d "$MAPDIR/$layout" ] ; then | ||
31 | return 0 | ||
32 | fi | ||
33 | done | ||
34 | -- | ||
35 | 2.13.0 | ||
36 | |||
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 640eb4c359..5324700701 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD | |||
@@ -1,15 +1,13 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=alpine-conf | 2 | pkgname=alpine-conf |
3 | pkgver=3.6.0_rc1 | 3 | pkgver=3.6.0_rc2 |
4 | pkgrel=2 | 4 | pkgrel=0 |
5 | pkgdesc="Alpine configuration management scripts" | 5 | pkgdesc="Alpine configuration management scripts" |
6 | url=http://git.alpinelinux.org/cgit/$pkgname | 6 | url=http://git.alpinelinux.org/cgit/$pkgname |
7 | arch="all" | 7 | arch="all" |
8 | license="MIT" | 8 | license="MIT" |
9 | depends="openrc>0.13 busybox>=1.26.1-r3" | 9 | depends="openrc>0.13 busybox>=1.26.1-r3" |
10 | source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz | 10 | source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz |
11 | 0001-setup-keymap-allow-specify-the-variant-together-with.patch | ||
12 | 0001-setup-disk-add-xfs-support-as-boot_fs.patch | ||
13 | " | 11 | " |
14 | 12 | ||
15 | builddir="$srcdir"/$pkgname-$pkgver | 13 | builddir="$srcdir"/$pkgname-$pkgver |
@@ -26,6 +24,4 @@ package() { | |||
26 | done | 24 | done |
27 | } | 25 | } |
28 | 26 | ||
29 | sha512sums="3d1b7c18a406791948485cd871942b94a0f2eadd6f1f0e9c87f92fb15750b9b41ffec0d7d2d16361a1e25f029765005e72b266ce48609ea0b7c5e5c99606d04f alpine-conf-3.6.0_rc1.tar.xz | 27 | sha512sums="1f78f8d532e2713f93ca47377ff195b78bf90d22b290f8460a413ff912bd1283307dc2366624612aac588318d8227fdf1d1a3e89f760455f02f4cec4982188f4 alpine-conf-3.6.0_rc2.tar.xz" |
30 | 67a1d72e45ba74d710a841c0a2671f74f792f6649fb530f86763fe2f10fc0005c644dfdcec25b00bc5eb0b97b2418775e95202269ef3b3f56b6c22044630fb86 0001-setup-keymap-allow-specify-the-variant-together-with.patch | ||
31 | fee1cb10a077ea7b5c01dc6367bc929d6c2eecf257848263435b5c9c130f6fb552f39809ea6403232d2f8ecea4b14b29a725a694228878ee0b1bb7ead696071b 0001-setup-disk-add-xfs-support-as-boot_fs.patch" | ||