diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2019-01-23 18:28:41 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-01-23 18:29:00 +0000 |
commit | 762ae2caf0fe84a3189b457b85f94c8494d84052 (patch) | |
tree | cb288b7db8e3bac233d854f585d9895ad2c9f0f5 | |
parent | 1912c8b654b9dca049f7528b1f505ac4cd310663 (diff) | |
download | alpine_aports-762ae2caf0fe84a3189b457b85f94c8494d84052.tar.bz2 alpine_aports-762ae2caf0fe84a3189b457b85f94c8494d84052.tar.xz alpine_aports-762ae2caf0fe84a3189b457b85f94c8494d84052.zip |
main/alpine-conf: upgrade to 3.8.1
-rw-r--r-- | main/alpine-conf/APKBUILD | 11 | ||||
-rw-r--r-- | main/alpine-conf/grub.patch | 29 |
2 files changed, 4 insertions, 36 deletions
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 18ae129ee5..f79d343913 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.8.0 | 3 | pkgver=3.8.1 |
4 | pkgrel=1 | 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.24.1-r6 busybox>=1.26.1-r3" | 9 | depends="openrc>=0.24.1-r6 busybox>=1.26.1-r3" |
10 | source="https://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz | 10 | source="https://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz" |
11 | grub.patch | ||
12 | " | ||
13 | 11 | ||
14 | builddir="$srcdir"/$pkgname-$pkgver | 12 | builddir="$srcdir"/$pkgname-$pkgver |
15 | build() { | 13 | build() { |
@@ -25,5 +23,4 @@ package() { | |||
25 | done | 23 | done |
26 | } | 24 | } |
27 | 25 | ||
28 | sha512sums="402d01dbc2b2aa987658f689e8a88feda6a633a393e746d2db3ee108274ff20be21f292406fa4aad543a665edfaff342795deb2c59cbc8c2ff8577f8f7c2485d alpine-conf-3.8.0.tar.xz | 26 | sha512sums="6aa0f0eaab6ee1ff8f9259d5c4e4634bf6d736a2cb52efb3cbabfdfcdd5dcd81b9fe05073ac16f964e7b74b5006b5f4219b33ab4ff5f984273b3bb48982afd6a alpine-conf-3.8.1.tar.xz" |
29 | d1080c84499bcf2f14131899aa57680b64cfe256d390faf5ce1ad1d2a32768ba32a721b0177962b74eb9887e555ceeb9197022a33bac7b3ecc8eca1ffea9c2f4 grub.patch" | ||
diff --git a/main/alpine-conf/grub.patch b/main/alpine-conf/grub.patch deleted file mode 100644 index d5d22a2ffd..0000000000 --- a/main/alpine-conf/grub.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | diff --git a/setup-disk.in b/setup-disk.in | ||
2 | index 4ed0cbd..5eb8638 100644 | ||
3 | --- a/setup-disk.in | ||
4 | +++ b/setup-disk.in | ||
5 | @@ -306,16 +306,14 @@ setup_grub() { | ||
6 | esac | ||
7 | fi | ||
8 | |||
9 | - # setup GRUB config | ||
10 | - | ||
11 | - # all_video is needed to remove the video error on boot | ||
12 | - cat > "$mnt"/boot/grub/grub.cfg <<- EOF | ||
13 | - set timeout=2 | ||
14 | - insmod all_video | ||
15 | - menuentry "Alpine Linux" { | ||
16 | - linux /boot/vmlinuz-$KERNEL_FLAVOR modules=$modules root=$root $kernel_opts | ||
17 | - initrd /boot/initramfs-$KERNEL_FLAVOR | ||
18 | - } | ||
19 | + # setup GRUB config. trigger will generate final grub.cfg | ||
20 | + install -d "$mnt"/etc/default/ | ||
21 | + cat > "$mnt"/etc/default/grub <<- EOF | ||
22 | + GRUB_DISTRIBUTOR="Alpine" | ||
23 | + GRUB_TIMEOUT=2 | ||
24 | + GRUB_DISABLE_SUBMENU=y | ||
25 | + GRUB_DISABLE_RECOVERY=true | ||
26 | + GRUB_CMDLINE_LINUX_DEFAULT="modules=$modules $kernel_opts" | ||
27 | EOF | ||
28 | } | ||
29 | |||