diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2009-08-06 12:13:31 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2009-08-06 12:13:31 +0000 |
| commit | 424aa9d495b77913823c736e4300e709b4e94661 (patch) | |
| tree | 6fda94f0a36c7e0b9a809801e19c211b09947d75 | |
| parent | dd2128cffe618ac1e3ebf109da0df111a4988044 (diff) | |
| download | aports-424aa9d495b77913823c736e4300e709b4e94661.tar.bz2 aports-424aa9d495b77913823c736e4300e709b4e94661.tar.xz | |
main/alpine-conf: backport fix for setup-disk
needed for new apk behaviour
| -rw-r--r-- | main/alpine-conf/0002-setup-disk-copy-apk-config-to-new-root.patch | 38 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 8 |
2 files changed, 43 insertions, 3 deletions
diff --git a/main/alpine-conf/0002-setup-disk-copy-apk-config-to-new-root.patch b/main/alpine-conf/0002-setup-disk-copy-apk-config-to-new-root.patch new file mode 100644 index 000000000..066c8a02e --- /dev/null +++ b/main/alpine-conf/0002-setup-disk-copy-apk-config-to-new-root.patch @@ -0,0 +1,38 @@ +From 2e3bdc6d581b3efc5446d3b765272f7125bc0cba Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Thu, 6 Aug 2009 12:08:06 +0000 +Subject: [PATCH 2/2] setup-disk: copy apk config to new root + +--- + setup-disk.in | 7 +++++-- + 1 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/setup-disk.in b/setup-disk.in +index 6a90d3a..e1a2c6d 100644 +--- a/setup-disk.in ++++ b/setup-disk.in +@@ -42,8 +42,12 @@ install_mounted_root() { + + echon "Installing system on $rootdev: " + lbu package - | tar -C "$mnt" -zx ++ # apk reads config from target root so we need to copy the config ++ mkdir -p "$mnt"/etc/apk/keys/ ++ cp /etc/apk/keys/* "$mnt"/etc/apk/keys/ ++ + apk add -q --progress --root "$mnt" $(cat "$mnt"/var/lib/apk/world) \ +- linux-grsec acct mkinitfs ++ acct linux-grsec alpine-base >/dev/null || return 1 + echo "" + # make things bootable + kernel=$(ls "$mnt"/lib/modules) +@@ -61,7 +65,6 @@ install_mounted_root() { + rootdisk="$rootdisk /dev/${i}" + done + fi +- chroot "$mnt" /sbin/mkinitfs -F "$features" $kernel + + # create an extlinux.conf + sed '/append initrd/d' /media/*/syslinux.cfg > "$mnt"/boot/extlinux.conf +-- +1.6.4 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 46d5b9824..e520e1e74 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,19 +1,20 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf pkgver=2.0_beta3 -pkgrel=1 +pkgrel=2 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname depends="openrc" source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 0001-lbu-remove-packages.list-if-exist.patch + 0002-setup-disk-copy-apk-config-to-new-root.patch " license="GPL-2" build() { cd "$srcdir/$pkgname-$pkgver" patch -p1 -i ../0001-lbu-remove-packages.list-if-exist.patch || return 1 - + patch -p1 -i ../0002-setup-disk-copy-apk-config-to-new-root.patch || return 1 make || return 1 make install PREFIX= DESTDIR="$pkgdir" for i in commit exclude include status update; do @@ -21,4 +22,5 @@ build() { done } md5sums="7786d6d526e96a3fdf51b9284d063caa alpine-conf-2.0_beta3.tar.bz2 -b09f9702fc6599fcb7d9bfbc855c8b5c 0001-lbu-remove-packages.list-if-exist.patch" +b09f9702fc6599fcb7d9bfbc855c8b5c 0001-lbu-remove-packages.list-if-exist.patch +6b32656c7d90567084753471fe9df972 0002-setup-disk-copy-apk-config-to-new-root.patch" |