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 | aports-762ae2caf0fe84a3189b457b85f94c8494d84052.tar.bz2 aports-762ae2caf0fe84a3189b457b85f94c8494d84052.tar.xz | |
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 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf -pkgver=3.8.0 -pkgrel=1 +pkgver=3.8.1 +pkgrel=0 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname arch="all" license="MIT" depends="openrc>=0.24.1-r6 busybox>=1.26.1-r3" -source="https://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz - grub.patch - " +source="https://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz" builddir="$srcdir"/$pkgname-$pkgver build() { @@ -25,5 +23,4 @@ package() { done } -sha512sums="402d01dbc2b2aa987658f689e8a88feda6a633a393e746d2db3ee108274ff20be21f292406fa4aad543a665edfaff342795deb2c59cbc8c2ff8577f8f7c2485d alpine-conf-3.8.0.tar.xz -d1080c84499bcf2f14131899aa57680b64cfe256d390faf5ce1ad1d2a32768ba32a721b0177962b74eb9887e555ceeb9197022a33bac7b3ecc8eca1ffea9c2f4 grub.patch" +sha512sums="6aa0f0eaab6ee1ff8f9259d5c4e4634bf6d736a2cb52efb3cbabfdfcdd5dcd81b9fe05073ac16f964e7b74b5006b5f4219b33ab4ff5f984273b3bb48982afd6a alpine-conf-3.8.1.tar.xz" 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 @@ -diff --git a/setup-disk.in b/setup-disk.in -index 4ed0cbd..5eb8638 100644 ---- a/setup-disk.in -+++ b/setup-disk.in -@@ -306,16 +306,14 @@ setup_grub() { - esac - fi - -- # setup GRUB config -- -- # all_video is needed to remove the video error on boot -- cat > "$mnt"/boot/grub/grub.cfg <<- EOF -- set timeout=2 -- insmod all_video -- menuentry "Alpine Linux" { -- linux /boot/vmlinuz-$KERNEL_FLAVOR modules=$modules root=$root $kernel_opts -- initrd /boot/initramfs-$KERNEL_FLAVOR -- } -+ # setup GRUB config. trigger will generate final grub.cfg -+ install -d "$mnt"/etc/default/ -+ cat > "$mnt"/etc/default/grub <<- EOF -+ GRUB_DISTRIBUTOR="Alpine" -+ GRUB_TIMEOUT=2 -+ GRUB_DISABLE_SUBMENU=y -+ GRUB_DISABLE_RECOVERY=true -+ GRUB_CMDLINE_LINUX_DEFAULT="modules=$modules $kernel_opts" - EOF - } - |