diff options
Diffstat (limited to 'main')
4 files changed, 7 insertions, 132 deletions
diff --git a/main/mkinitfs/0001-Revert-init-only-use-etc-apk-world-when-it-exists.patch b/main/mkinitfs/0001-Revert-init-only-use-etc-apk-world-when-it-exists.patch deleted file mode 100644 index 41d1bdd1d2..0000000000 --- a/main/mkinitfs/0001-Revert-init-only-use-etc-apk-world-when-it-exists.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4c8535b759fb9f2b34d05f971bee3a4ecc86b734 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Thu, 17 May 2012 14:33:18 +0000 -Subject: [PATCH] Revert "init: only use /etc/apk/world when it exists" - -We can not only use /etc/apk/world since it will always -be there due to previous apk add --initdb. - -Instead, clean up the /var/lib/apk/world after upgrade - -This reverts commit 8981ccbf5b2636c7d2e06b08ffdf87be80fe19c8. - -Conflicts: - initramfs-init.in ---- - initramfs-init.in | 12 +++++------- - 1 file changed, 5 insertions(+), 7 deletions(-) - -diff --git a/initramfs-init.in b/initramfs-init.in -index b14ebf9..6e1ebc1 100755 ---- a/initramfs-init.in -+++ b/initramfs-init.in -@@ -481,13 +481,11 @@ if [ -f "$ovl" ]; then - # hack, incase /root/.ssh was included in apkovl - [ -d "$sysroot/root" ] && chmod 700 "$sysroot/root" - pkgs="$pkgs $(sed 's/\#.*//' $sysroot/etc/lbu/packages.list 2>/dev/null)" -- rm -f "$sysroot"/etc/lbu/packages.list -- for world in etc/apk/world var/lib/apk/world; do -- if [ -e "$sysroot/$world" ]; then -- pkgs="$pkgs $(cat $sysroot/$world)" -- break; -- fi -- done -+ pkgs="$pkgs $(cat $sysroot/var/lib/apk/world \ -+ $sysroot/etc/apk/world 2>/dev/null)" -+ # clean up after upgrade -+ rm -f $sysroot/etc/lbu/packages.list \ -+ $sysroot/var/lib/apk/world - - # fix up inittab from pre openrc times (alpine v1.8) - if [ -f "$sysroot"/etc/inittab ]; then --- -1.7.10.2 - diff --git a/main/mkinitfs/0001-init-fix-inittab-for-users-who-upgrades-from-pre-ope.patch b/main/mkinitfs/0001-init-fix-inittab-for-users-who-upgrades-from-pre-ope.patch deleted file mode 100644 index a1bc1b36d4..0000000000 --- a/main/mkinitfs/0001-init-fix-inittab-for-users-who-upgrades-from-pre-ope.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8da5b2ebf893af5710024e7111143f2521707647 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed, 2 May 2012 09:21:05 +0000 -Subject: [PATCH] init: fix inittab for users who upgrades from pre openrc - -The /etc/init.d/rc[SLK] have been replaced with openrc but users -might have references to the old scripts in their /etc/inittab. - -We fix this from initramfs init. ---- - initramfs-init.in | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/initramfs-init.in b/initramfs-init.in -index bec3b52..4425990 100755 ---- a/initramfs-init.in -+++ b/initramfs-init.in -@@ -490,6 +490,14 @@ if [ -f "$ovl" ]; then - break; - fi - done -+ -+ # fix up inittab from pre openrc times (alpine v1.8) -+ if [ -f "$sysroot"/etc/inittab ]; then -+ sed -i -e 's|:/etc/init.d/rcS|:/sbin/rc sysinit|' \ -+ -e 's|:/etc/init.d/rcL|:/sbin/rc default|' \ -+ -e 's|:/etc/init.d/rcK|:/sbin/rc shutdown|' \ -+ "$sysroot"/etc/inittab -+ fi - else - # add some boot services by default - rc_add devfs sysinit --- -1.7.10 - diff --git a/main/mkinitfs/0001-init-search-boot-repositories-after-relocation.patch b/main/mkinitfs/0001-init-search-boot-repositories-after-relocation.patch deleted file mode 100644 index 293ab3ea93..0000000000 --- a/main/mkinitfs/0001-init-search-boot-repositories-after-relocation.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 5da682acedf4011a647394843e819c50e8f5200b Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed, 2 May 2012 11:44:04 +0000 -Subject: [PATCH] init: search boot repositories after relocation - ---- - initramfs-init.in | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/initramfs-init.in b/initramfs-init.in -index 4425990..b14ebf9 100755 ---- a/initramfs-init.in -+++ b/initramfs-init.in -@@ -84,6 +84,7 @@ unpack_apkovl() { - fi - - # we need openssl. let apk handle deps -+ find_boot_repositories > /tmp/repositories - apk add --quiet --initdb --repositories-file /tmp/repositories openssl\ - || return 1 - -@@ -434,9 +435,6 @@ fi - retry_mount -o ro $mount_opts $ALPINE_DEV $ALPINE_MNT >/dev/null 2>&1 - eend $? - --# generate apk repositories file --find_boot_repositories > /tmp/repositories -- - # early console? - if [ "$SINGLEMODE" = "yes" ]; then - echo "Entering single mode. Type 'exit' to continue booting." -@@ -543,6 +541,9 @@ pkgs="$pkgs alpine-base" - mkdir -p $sysroot/etc/apk/keys/ - cp -a /etc/apk/keys $sysroot/etc/apk - -+# generate apk repositories file. needs to be done after relocation -+find_boot_repositories > /tmp/repositories -+ - # generate repo opts for apk - for i in $(cat /tmp/repositories); do - repo_opt="$repo_opt --repository $i" --- -1.7.10 - diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index 1341fe6a7c..bd2c8f3dc9 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -1,15 +1,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mkinitfs -pkgver=2.4.3 -pkgrel=2 +pkgver=2.4.4 +pkgrel=0 pkgdesc="Tool to generate initramfs images for Alpine" url=http://git.alpinelinux.org/cgit/mkinitfs depends="busybox apk-tools>=2.0" triggers="$pkgname.trigger=/usr/share/kernel/*" source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 - 0001-init-fix-inittab-for-users-who-upgrades-from-pre-ope.patch - 0001-init-search-boot-repositories-after-relocation.patch - 0001-Revert-init-only-use-etc-apk-world-when-it-exists.patch eglibc.patch " arch="noarch" @@ -45,8 +42,9 @@ package() { cd "$srcdir"/$pkgname-$pkgver make install DESTDIR="$pkgdir" || return 1 } -md5sums="7373acb2159e24ba120ee46b0deb6bc4 mkinitfs-2.4.3.tar.bz2 -ba969f3b8d8a0dd74319492eb41a712b 0001-init-fix-inittab-for-users-who-upgrades-from-pre-ope.patch -bd9fd3813c9c28b42a1eeb30f65718e5 0001-init-search-boot-repositories-after-relocation.patch -7aea167ef747a6f0d92081628358083a 0001-Revert-init-only-use-etc-apk-world-when-it-exists.patch +md5sums="5b897ab38204bf62ed8abf63d6b7cafd mkinitfs-2.4.4.tar.bz2 067649665a767ff1a08578e1f4e61524 eglibc.patch" +sha256sums="454e43149322e9cdfd7ea397480621b42169b5d78dd8eab1be46b96762fc5dc5 mkinitfs-2.4.4.tar.bz2 +2db513d1a058be0f5794dc74d00418807253d8ac850c9713ea0eeb0be5f3f65a eglibc.patch" +sha512sums="9f0e49b20a592b4315155453e4398abf710c8bae62496d4b8d281e21d13366804084be26f0303d35ef3f0bf295eba76885ca43ff452d4aea1e59f0bdce0de18e mkinitfs-2.4.4.tar.bz2 +3498d9930889cd776a34863733d467b50b83679ea7f91d79963c81e4f1dc138f887ef1f2a696da6d836d1f6f862dcfd2c2fb9a55b0e3b2926e9f3fc648bc5a15 eglibc.patch" |