initramfs-tools: update to 0.93.

--HG--
extra : convert_revision : 94d98a512aabe9692c6785e20c61a81aa1313498
This commit is contained in:
Juan RP 2009-03-07 07:27:06 +01:00
parent 551d1760d3
commit 593e754ad6
2 changed files with 47 additions and 44 deletions

View file

@ -50,8 +50,8 @@
echo "W: ${cm_x} hook script requires at least kernel version ${minver}" >&2 echo "W: ${cm_x} hook script requires at least kernel version ${minver}" >&2
echo "W: not generating requested initramfs for kernel ${curversion}" >&2 echo "W: not generating requested initramfs for kernel ${curversion}" >&2
exit 2 exit 2
--- mkinitramfs.orig 2009-01-07 15:14:31.000000000 +0100 --- mkinitramfs.orig 2009-02-17 15:56:33.000000000 +0100
+++ mkinitramfs 2009-01-30 16:33:00.000000000 +0100 +++ mkinitramfs 2009-03-07 06:23:35.514727457 +0100
@@ -8,8 +8,7 @@ keep="n" @@ -8,8 +8,7 @@ keep="n"
CONFDIR="/etc/initramfs-tools" CONFDIR="/etc/initramfs-tools"
verbose="n" verbose="n"
@ -60,31 +60,9 @@
-BUSYBOXDIR="/bin" -BUSYBOXDIR="/bin"
+BUSYBOXDIR="/usr/lib/initramfs-tools/bin/" +BUSYBOXDIR="/usr/lib/initramfs-tools/bin/"
OPTIONS=`getopt -o d:ko:r:v --long supported-host-version:,supported-target-version: -n "$0" -- "$@"` OPTIONS=`getopt -o d:ko:r:v -n "$0" -- "$@"`
@@ -63,21 +62,6 @@ while true; do @@ -141,7 +140,7 @@ fi
esac
done
-# FIXME: remove after Lenny (needed for Etch linux-images)
-if [ -n "$supported_host_version" ] || [ -n "$supported_target_version" ]; then
- if [ -n "$supported_host_version" ]; then
- host_upstream_version="${supported_host_version%%-*}"
- fi
- if [ -n "$supported_target_version" ]; then
- target_upstream_version="${supported_target_version%%-*}"
- if dpkg --compare-versions "$target_upstream_version" lt "2.6.12"; then
- exit 2
- fi
- fi
- echo "Depreciation warning: use ramdisk=mkinitramfs-kpkg."
- exit 0
-fi
-
# For dependency ordered mkinitramfs hook scripts.
. /usr/share/initramfs-tools/scripts/functions
. /usr/share/initramfs-tools/hook-functions
@@ -164,7 +148,7 @@ fi
DESTDIR="$(mktemp -t -d mkinitramfs_XXXXXX)" || exit 1 DESTDIR="$(mktemp -t -d mkinitramfs_XXXXXX)" || exit 1
__TMPCPIOGZ="$(mktemp -t mkinitramfs-OL_XXXXXX)" || exit 1 __TMPCPIOGZ="$(mktemp -t mkinitramfs-OL_XXXXXX)" || exit 1
@ -93,7 +71,7 @@
# Export environment for hook scripts. # Export environment for hook scripts.
# #
@@ -272,12 +256,9 @@ fi @@ -249,12 +248,9 @@ fi
copy_exec /sbin/modprobe /sbin copy_exec /sbin/modprobe /sbin
copy_exec /sbin/depmod /sbin copy_exec /sbin/depmod /sbin
copy_exec /sbin/rmmod /sbin copy_exec /sbin/rmmod /sbin
@ -109,13 +87,44 @@
fi fi
run_scripts /usr/share/initramfs-tools/hooks run_scripts /usr/share/initramfs-tools/hooks
--- hooks/udevhelper.orig 2009-02-25 18:45:49.668815336 +0100 --- update-initramfs.orig 2009-03-07 06:30:03.039700454 +0100
+++ hooks/udevhelper 2009-02-25 18:45:57.992588909 +0100 +++ update-initramfs 2009-03-07 06:32:05.679694852 +0100
@@ -29,7 +29,6 @@ if [ -e $DESTDIR/lib/udev/ ] && [ -e $DE @@ -1,4 +1,4 @@
exit 0 -#!/bin/sh
fi +#!/bin/sh -e
-cp /lib/udev/hotplug.functions $DESTDIR/lib/udev/ STATEDIR=/var/lib/initramfs-tools
for program in /lib/udev/*_id; do BOOTDIR=/boot
copy_exec $program /lib/udev/ @@ -8,22 +8,8 @@ USETRIGGERS=true
done mode=""
version=""
-set -e
-
[ -r ${CONF} ] && . ${CONF}
-if $USETRIGGERS \
- && [ x"$DPKG_MAINTSCRIPT_PACKAGE" != x ] \
- && [ $# = 1 ] \
- && [ x"$1" = x-u ] \
- && dpkg-trigger --check-supported 2>/dev/null
-then
- if dpkg-trigger --no-await update-initramfs; then
- echo "update-initramfs: deferring update (trigger activated)"
- exit 0
- fi
-fi
-
usage()
{
if [ -n "${1}" ]; then
@@ -313,7 +299,8 @@ get_sorted_versions()
fi
worklist=""
for gsv_i in $version_list; do
- if dpkg --compare-versions "${gsv_x}" '>' "${gsv_i}"; then
+ rv=$(xbps-cmpver "${gsv_x}" "${gsv_i}")
+ if [ "$rv" -eq 0 ]; then
worklist="${worklist} ${gsv_x} ${gsv_i}"
gsv_x=""
else

View file

@ -1,14 +1,13 @@
# Template file for 'initramfs-tools' # Template file for 'initramfs-tools'
pkgname=initramfs-tools pkgname=initramfs-tools
version=0.92o version=0.93
wrksrc=$pkgname
patch_files="$pkgname-xbps.diff" patch_files="$pkgname-xbps.diff"
distfiles=" distfiles="
http://ftp.de.debian.org/debian/pool/main/i/$pkgname/${pkgname}_${version}.tar.gz" http://ftp.de.debian.org/debian/pool/main/i/$pkgname/${pkgname}_${version}.tar.gz"
build_style=custom-install build_style=custom-install
short_desc="Tools for generating an initramfs" short_desc="Tools for generating an initramfs"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
checksum=c6d76f51c08e23463fffd2fce027d62ffcfa317f549c58e14495459a1773a55e checksum=1d56acc8dd64504d1e383a9e671179979369624323814ea691bceaa3560e0ec7
long_desc=" long_desc="
This package contains tools to create and boot an initramfs for packaged 2.6 This package contains tools to create and boot an initramfs for packaged 2.6
Linux kernel. The initramfs is a gzipped cpio archive. At boot time, the Linux kernel. The initramfs is a gzipped cpio archive. At boot time, the
@ -50,9 +49,6 @@ do_install()
install -d $etcdir/scripts/local-bottom install -d $etcdir/scripts/local-bottom
install -d $etcdir/scripts/local-premount install -d $etcdir/scripts/local-premount
install -d $etcdir/scripts/local-top install -d $etcdir/scripts/local-top
install -d $etcdir/scripts/nfs-bottom
install -d $etcdir/scripts/nfs-premount
install -d $etcdir/scripts/nfs-top
install -d $destdir/usr/share/$pkgname install -d $destdir/usr/share/$pkgname
install -d $destdir/usr/share/$pkgname/conf.d install -d $destdir/usr/share/$pkgname/conf.d
install -d $destdir/usr/share/$pkgname/hooks install -d $destdir/usr/share/$pkgname/hooks
@ -86,8 +82,6 @@ do_install()
$destdir/usr/share/$pkgname/scripts/init-top $destdir/usr/share/$pkgname/scripts/init-top
install -m 755 $wrksrc/scripts/local-premount/* \ install -m 755 $wrksrc/scripts/local-premount/* \
$destdir/usr/share/$pkgname/scripts/local-premount $destdir/usr/share/$pkgname/scripts/local-premount
install -m 755 $wrksrc/scripts/local-top/* \
$destdir/usr/share/$pkgname/scripts/local-top
install -m 755 $wrksrc/hooks/* $destdir/usr/share/$pkgname/hooks install -m 755 $wrksrc/hooks/* $destdir/usr/share/$pkgname/hooks
install -m 644 $wrksrc/hook-functions $destdir/usr/share/$pkgname install -m 644 $wrksrc/hook-functions $destdir/usr/share/$pkgname
install -m 644 $wrksrc/conf/modules $etcdir install -m 644 $wrksrc/conf/modules $etcdir