Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at Mon Jun 29 17:43:11 CEST 2009. -------- --- mkinitrd/mkinitrd.changes 2009-05-25 12:16:01.000000000 +0200 +++ mkinitrd/mkinitrd.changes 2009-06-24 18:48:36.000000000 +0200 @@ -1,0 +2,16 @@ +Wed Jun 24 18:47:12 CEST 2009 - thomas@novell.com + +- only copy *.sh files to scripts directory + +------------------------------------------------------------------- +Wed Jun 24 16:23:12 CEST 2009 - thomas@novell.com + +- only include scripts with .sh extension in rpm file to fix + build failure + +------------------------------------------------------------------- +Tue Jun 23 07:38:22 CEST 2009 - thomas@novell.com + +- mounting /root/proc for SELinux (bnc#457984) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- mkinitrd-2.5.9_selinux.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.s27452/_old 2009-06-29 17:41:21.000000000 +0200 +++ /var/tmp/diff_new_pack.s27452/_new 2009-06-29 17:41:21.000000000 +0200 @@ -26,7 +26,7 @@ Requires: coreutils modutils util-linux grep gzip sed cpio udev sysvinit file perl-Bootloader AutoReqProv: on Version: 2.5.9 -Release: 6 +Release: 7 Conflicts: udev < 118 Requires: dhcpcd Summary: Creates an Initial RAM Disk Image for Preloading Modules @@ -35,6 +35,7 @@ Patch0: mkinitrd-2.5.9.patch Patch1: mkinitrd-setup-udev-firmware-fix Patch2: mkinitrd-silence.patch +Patch3: mkinitrd-2.5.9_selinux.patch %description Mkinitrd creates file system images for use as initial RAM disk @@ -68,6 +69,7 @@ %patch0 -p0 %patch1 -p1 %patch2 +%patch3 -p1 %build gcc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c @@ -91,7 +93,7 @@ mkdir -p $RPM_BUILD_ROOT/lib/mkinitrd/scripts mkdir -p $RPM_BUILD_ROOT/lib/mkinitrd/setup mkdir -p $RPM_BUILD_ROOT/lib/mkinitrd/boot -cp -a scripts $RPM_BUILD_ROOT/lib/mkinitrd +cp -a scripts/*.sh $RPM_BUILD_ROOT/lib/mkinitrd/scripts/ cp -a lib/mkinitrd/bin $RPM_BUILD_ROOT/lib/mkinitrd/bin make -C sbin DESTDIR=$RPM_BUILD_ROOT install chmod -R 755 $RPM_BUILD_ROOT/lib/mkinitrd @@ -105,6 +107,7 @@ # %install_mkinitrd /usr/bin/perl /sbin/mkinitrd_setup EOF + %posttrans /sbin/mkinitrd_setup @@ -119,7 +122,7 @@ %dir /lib/mkinitrd/boot %dir /lib/mkinitrd/setup %config /etc/rpm/macros.mkinitrd -/lib/mkinitrd/scripts/* +/lib/mkinitrd/scripts/*.sh /lib/mkinitrd/bin/* /sbin/mkinitrd /sbin/mkinitrd_setup ++++++ mkinitrd-2.5.9_selinux.patch ++++++ --- mkinitrd-2.5.9/scripts/boot-boot.sh.bak 2009-06-23 11:06:36.000000000 +0200 +++ mkinitrd-2.5.9/scripts/boot-boot.sh 2009-06-23 11:24:30.000000000 +0200 @@ -16,7 +16,7 @@ # Move device nodes /bin/mount --move /dev /root/dev -/bin/mount /root/proc +/bin/mount -t proc /root/proc /root/proc # ready to leave cd /root ++++++ mkinitrd.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.5.9/scripts/setup-udev.sh new/mkinitrd-2.5.9/scripts/setup-udev.sh --- old/mkinitrd-2.5.9/scripts/setup-udev.sh 2009-02-09 09:58:03.000000000 +0100 +++ new/mkinitrd-2.5.9/scripts/setup-udev.sh 2009-06-23 11:02:37.000000000 +0200 @@ -36,4 +36,8 @@ fi done +for bin in /sbin/blkid; do + cp_bin $bin ${tmp_mnt}${bin} +done + save_var udev_timeout diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.5.9/scripts/setup-udev.sh.orig new/mkinitrd-2.5.9/scripts/setup-udev.sh.orig --- old/mkinitrd-2.5.9/scripts/setup-udev.sh.orig 1970-01-01 01:00:00.000000000 +0100 +++ new/mkinitrd-2.5.9/scripts/setup-udev.sh.orig 2009-02-09 09:58:03.000000000 +0100 @@ -0,0 +1,39 @@ +#!/bin/bash +# +#%stage: setup +#%depends: start +# + +# Default udev timeout is 30 seconds +udev_timeout=30 + +mkdir -p $tmp_mnt/lib/udev/rules.d +mkdir -p $tmp_mnt/etc/udev/rules.d +# copy needed rules +for rule in \ + 05-udev-early.rules \ + 50-udev-default.rules \ + 59-dasd.rules \ + 60-persistent-storage.rules \ + 60-persistent-input.rules \ + 62-dm_linear.rules \ + 64-device-mapper.rules \ + 64-md-raid.rules \ + 80-drivers.rules; do + if [ -f /lib/udev/rules.d/$rule ]; then + cp /lib/udev/rules.d/$rule $tmp_mnt/lib/udev/rules.d + elif [ -f /etc/udev/rules.d/$rule ]; then + cp /etc/udev/rules.d/$rule $tmp_mnt/etc/udev/rules.d + fi +done +# copy helper +mkdir -p $tmp_mnt/lib/udev +for script in /lib/udev/* /sbin/*_id ; do + if [ ! -d "$script" ] && [ -x "$script" ] ; then + cp_bin $script ${tmp_mnt}${script} + elif [ -f "$script" ] ; then + cp -pL $script ${tmp_mnt}${script} + fi +done + +save_var udev_timeout ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org