diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-12-23 17:08:31 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-12-23 17:09:04 +0000 |
| commit | cd089916834f1a0fa77a93ecb028e3582497ac41 (patch) | |
| tree | 892d23ba52096d1467d94f4181ff951e92230d42 /main | |
| parent | 7bb9f040d8cc5ba95b30e8b9ba2ae4ae252a2a03 (diff) | |
| download | aports-cd089916834f1a0fa77a93ecb028e3582497ac41.tar.bz2 aports-cd089916834f1a0fa77a93ecb028e3582497ac41.tar.xz | |
main/mkinitfs: upgrade to 2.2.0
ref #486
Diffstat (limited to 'main')
| -rw-r--r-- | main/mkinitfs/0001-init-mount-devices-as-read-only.patch | 53 | ||||
| -rw-r--r-- | main/mkinitfs/APKBUILD | 13 |
2 files changed, 4 insertions, 62 deletions
diff --git a/main/mkinitfs/0001-init-mount-devices-as-read-only.patch b/main/mkinitfs/0001-init-mount-devices-as-read-only.patch deleted file mode 100644 index e0077dd7f5..0000000000 --- a/main/mkinitfs/0001-init-mount-devices-as-read-only.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 13cfce8f525fcb656044da419e03747892abd174 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Tue, 21 Dec 2010 10:08:39 +0000 -Subject: [PATCH] init: mount devices as read-only - ---- - initramfs-init.in | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/initramfs-init.in b/initramfs-init.in -index 2fb2626..9acf1c7 100755 ---- a/initramfs-init.in -+++ b/initramfs-init.in -@@ -138,7 +138,7 @@ find_ovl_dev() { - # wait for usb to settle if needed - wait_usb - for i in usb floppy cdrom; do -- mount /media/$i 2>/dev/null || continue -+ mount -o ro /media/$i 2>/dev/null || continue - ovl=$(find_ovl /media/$i) - [ -f "$ovl" ] && return - umount /media/$i 2>/dev/null -@@ -276,7 +276,7 @@ if [ -n "$KOPT_root" ]; then - ;; - esac - ebegin "Mounting root" -- retry_mount $KOPT_root $sysroot 2>/dev/null -+ retry_mount -o ro $KOPT_root $sysroot 2>/dev/null - eend $? - cat /proc/mounts | while read DEV DIR TYPE OPTS ; do - if [ "$DIR" != "/" -a "$DIR" != "$sysroot" -a -d "$DIR" ]; then -@@ -302,7 +302,7 @@ if [ -n "$ALPINE_DEV_FS" ]; then - mount_opts="-t $ALPINE_DEV_FS" - fi - --retry_mount $mount_opts $ALPINE_DEV $ALPINE_MNT >/dev/null 2>&1 -+retry_mount -o ro $mount_opts $ALPINE_DEV $ALPINE_MNT >/dev/null 2>&1 - eend $? - - # generate apk repositories file -@@ -329,7 +329,8 @@ if [ -n "$OVL_DEV" ]; then - mount_opts="-t $OVL_DEV_FS" - fi - -- retry_mount $mount_opts /dev/$OVL_DEV /media/$OVL_DEV >/dev/null 2>&1 -+ retry_mount -o ro $mount_opts /dev/$OVL_DEV /media/$OVL_DEV \ -+ >/dev/null 2>&1 - ovl=$(find_ovl /media/$OVL_DEV) - else - find_ovl_dev --- -1.7.3.4 - diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index a18c4e8496..03edd8f643 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -1,14 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mkinitfs -pkgver=2.1.3 -pkgrel=1 +pkgver=2.2.0 +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 eglibc.patch - 0001-init-mount-devices-as-read-only.patch " arch="x86 x86_64" license="GPL-2" @@ -16,9 +15,6 @@ license="GPL-2" prepare() { cd "$srcdir"/$pkgname-$pkgver - patch -p1 -i "$srcdir"/0001-init-mount-devices-as-read-only.patch \ - || return 1 - # If we are using eglibc/glibc we need to include eglibc libs # instead of uclibc libs. case "$CHOST" in @@ -37,6 +33,5 @@ package() { cd "$srcdir"/$pkgname-$pkgver make install DESTDIR="$pkgdir" || return 1 } -md5sums="36bea9db1d83d2fd9860130b1cdec0d0 mkinitfs-2.1.3.tar.bz2 -e59c2f7de496fe430b07e32fd812ebe0 eglibc.patch -96cfe927afb70e1af94a9c6fe8f5acca 0001-init-mount-devices-as-read-only.patch" +md5sums="b3abed1ee80ae69947350b795c7211e5 mkinitfs-2.2.0.tar.bz2 +e59c2f7de496fe430b07e32fd812ebe0 eglibc.patch" |