commit kiwi for openSUSE:Factory

22 Mar 2011

Hello community,

here is the log from the commit of package kiwi for openSUSE:Factory
checked in at Tue Mar 22 17:58:02 CET 2011.



--------

--- kiwi/kiwi.changes	2011-03-21 16:06:56.000000000 +0100
+++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes	2011-03-22 13:23:18.000000000 +0100
@@ -1,0 +2,16 @@
+Tue Mar 22 13:12:38 CET 2011 - ms@suse.de
+  
+- fixed start of udev and blogd
+  
+-------------------------------------------------------------------
+Tue Mar 22 11:47:06 CET 2011 - ms@suse.de
+  
+- enable loading of agp modules before udev is started (bnc #659843)
+  
+-------------------------------------------------------------------
+Tue Mar 22 08:36:16 CET 2011 - ms@suse.de
+  
+- reverts commit 8f5df54fd23cc6c16e7d72fe5954e62fd70bb458
+  busybox is distributed with 11.4 (bnc #679660)
+  
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.7gDGlZ/_old	2011-03-22 17:57:40.000000000 +0100
+++ /var/tmp/diff_new_pack.7gDGlZ/_new	2011-03-22 17:57:40.000000000 +0100
@@ -66,7 +66,7 @@
 %endif
 Summary:        OpenSuSE - KIWI Image System
 Version:        4.82
-Release:        1
+Release:        2
 Group:          System/Management
 License:        GPLv2
 Source:         %{name}.tar.bz2

++++++ kiwi.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision	2011-03-18 14:26:05.000000000 +0100
+++ new/kiwi/.revision	2011-03-18 14:26:05.000000000 +0100
@@ -1 +1 @@
-a65d7d7eb8780e42462df6b18429a9c93622efce
+4c0dbabe52edd5da25069676731a5ab6124c2589
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIConfig.sh new/kiwi/modules/KIWIConfig.sh
--- old/kiwi/modules/KIWIConfig.sh	2011-03-21 16:02:02.000000000 +0100
+++ new/kiwi/modules/KIWIConfig.sh	2011-03-22 13:18:53.000000000 +0100
@@ -984,6 +984,7 @@
 		gettext diff bc utimer cmp busybox kexec pam_console_apply
 		setterm kpartx vgcfgbackup vgcfgrestore lsdasd dasd_configure
 		qeth_configure fdasd mkdosfs egrep mkfs.xfs mdadm yes fdisk
+		startproc
 	"
 	tools="$tools $@"
 	for path in /sbin /usr/sbin /usr/bin /bin;do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh
--- old/kiwi/modules/KIWILinuxRC.sh	2011-03-16 14:57:08.000000000 +0100
+++ new/kiwi/modules/KIWILinuxRC.sh	2011-03-22 13:18:53.000000000 +0100
@@ -518,6 +518,16 @@
 	fi
 }
 #======================================
+# udevTrigger
+#--------------------------------------
+function udevTrigger {
+	if [ -x /sbin/udevadm ];then
+		/sbin/udevadm trigger
+	else
+		/sbin/udevtrigger
+	fi
+}
+#======================================
 # udevSystemStart
 #--------------------------------------
 function udevSystemStart {
@@ -570,19 +580,40 @@
 	createInitialDevices /dev
 	# terminal devices
 	mount -t devpts devpts /dev/pts
+	# load modules required before udev
+	moduleLoadBeforeUdev
 	# start the udev daemon
-	udevd udev_log="debug" &
-	echo UDEVD_PID=$! >> /iprocs
-	# trigger udev events
-	if [ -x /sbin/udevadm ];then
-		/sbin/udevadm trigger
-	else
-		/sbin/udevtrigger
-	fi
+	startproc /sbin/udevd --daemon
+	UDEVD_PID=$(pidof /sbin/udevd)
+	echo UDEVD_PID=$UDEVD_PID >> /iprocs
+	# trigger events for all devices
+	udevTrigger
+	# wait for events to finish
+	udevPending
 	# start splashy if configured
 	startSplashy
 }
 #======================================
+# moduleLoadBeforeUdev
+#--------------------------------------
+function moduleLoadBeforeUdev {
+	# /.../
+	# load modules which have to be loaded before the
+	# udev daemon is started in this function
+	# ----
+	loadAGPModules
+}
+#======================================
+# loadAGPModules
+#--------------------------------------
+function loadAGPModules {
+	local krunning=$(uname -r)
+	for i in /lib/modules/$krunning/kernel/drivers/char/agp/*; do
+		test -e $i || continue
+		modprobe $(echo $i | sed "s#.*\\/\\([^\\/]\\+\\).ko#\\1#")
+	done
+}
+#======================================
 # udevKill
 #--------------------------------------
 function udevKill {
@@ -605,8 +636,8 @@
 		> /dev/shm/initrd.msg
 		ln -sf /dev/shm/initrd.msg /var/log/boot.msg
 		mkdir -p /var/run
-		/sbin/blogd $REDIRECT
-		BLOGD_PID=$(cat /var/run/blogd.pid)
+		startproc /sbin/blogd $REDIRECT
+		BLOGD_PID=$(pidof /sbin/blogd)
 		echo BLOGD_PID=$BLOGD_PID >> /iprocs
 	fi
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml
--- old/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml	2010-12-03 16:08:51.000000000 +0100
+++ new/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml	2011-03-22 13:18:54.000000000 +0100
@@ -27,6 +27,8 @@
 		<file name="usb/storage/usb-storage.ko"/>
 	</drivers>
 	<drivers type="drivers">
+		<file name="drivers/gpu/drm/i915/i915.ko"/>
+		<file name="drivers/char/agp/intel-agp.ko"/>
 		<file name="crypto/*"/>
 		<file name="drivers/virtio/*"/>
 		<file name="drivers/block/virtio_blk.ko"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml
--- old/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml	2010-12-03 16:08:51.000000000 +0100
+++ new/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml	2011-03-22 13:18:54.000000000 +0100
@@ -27,6 +27,8 @@
 		<file name="usb/storage/usb-storage.ko"/>
 	</drivers>
 	<drivers type="drivers">
+		<file name="drivers/gpu/drm/i915/i915.ko"/>
+		<file name="drivers/char/agp/intel-agp.ko"/>
 		<file name="crypto/*"/>
 		<file name="drivers/virtio/*"/>
 		<file name="drivers/block/virtio_blk.ko"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-11.4/config.xml new/kiwi/system/boot/ix86/netboot/suse-11.4/config.xml
--- old/kiwi/system/boot/ix86/netboot/suse-11.4/config.xml	2011-03-15 12:07:26.000000000 +0100
+++ new/kiwi/system/boot/ix86/netboot/suse-11.4/config.xml	2011-03-22 13:18:54.000000000 +0100
@@ -169,6 +169,7 @@
 		<package name="psmisc"/>
 		<package name="iputils"/>
 		<package name="atftp"/>
+		<package name="busybox"/>
 		<package name="bind-libs"/>
 		<package name="bind-utils"/>
 		<package name="dhcpcd"/>
@@ -202,6 +203,7 @@
 		<package name="clicfs"/>
 		<package name="iputils"/>
 		<package name="atftp"/>
+		<package name="busybox"/>
 		<package name="dhcpcd"/>
 		<package name="file"/>
 		<package name="hwinfo"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml
--- old/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml	2011-01-20 09:19:55.000000000 +0100
+++ new/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml	2011-03-22 13:18:54.000000000 +0100
@@ -30,6 +30,8 @@
 		<file name="usb/storage/usb-storage.ko"/>
 	</drivers>
 	<drivers type="drivers" profiles="default,xen">
+		<file name="drivers/gpu/drm/i915/i915.ko"/>
+		<file name="drivers/char/agp/intel-agp.ko"/>
 		<file name="drivers/md/*"/>
 		<file name="drivers/hid/*"/>
 		<file name="drivers/ide/*"/>
@@ -67,6 +69,8 @@
 		<file name="drivers/acpi/dock.ko"/>
 	</drivers>
 	<drivers type="drivers" profiles="diskless">
+		<file name="drivers/gpu/drm/i915/i915.ko"/>
+		<file name="drivers/char/agp/intel-agp.ko"/>
 		<file name="drivers/md/*"/>
 		<file name="drivers/ide/*"/>
 		<file name="drivers/block/loop.ko"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml
--- old/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml	2011-01-20 09:19:55.000000000 +0100
+++ new/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml	2011-03-22 13:18:54.000000000 +0100
@@ -30,6 +30,8 @@
 		<file name="usb/storage/usb-storage.ko"/>
 	</drivers>
 	<drivers type="drivers" profiles="default,xen">
+		<file name="drivers/gpu/drm/i915/i915.ko"/>
+		<file name="drivers/char/agp/intel-agp.ko"/>
 		<file name="drivers/md/*"/>
 		<file name="drivers/hid/*"/>
 		<file name="drivers/ide/*"/>
@@ -67,6 +69,8 @@
 		<file name="drivers/acpi/dock.ko"/>
 	</drivers>
 	<drivers type="drivers" profiles="diskless">
+		<file name="drivers/gpu/drm/i915/i915.ko"/>
+		<file name="drivers/char/agp/intel-agp.ko"/>
 		<file name="drivers/md/*"/>
 		<file name="drivers/ide/*"/>
 		<file name="drivers/block/loop.ko"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml new/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml
--- old/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml	2011-03-15 12:07:26.000000000 +0100
+++ new/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml	2011-03-22 13:18:55.000000000 +0100
@@ -106,6 +106,7 @@
 	<packages type="image">
 		<package name="curl"/>
 		<package name="atftp"/>
+		<package name="busybox"/>
 		<package name="parted"/>
 		<package name="adaptec-firmware"/>
 		<package name="dialog"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml
--- old/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml	2010-12-03 16:08:52.000000000 +0100
+++ new/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml	2011-03-22 13:18:55.000000000 +0100
@@ -22,6 +22,8 @@
 		<profile name="rt" description="KERNEL: RealTime kernel"/>
 	</profiles>
 	<drivers type="drivers">
+		<file name="drivers/gpu/drm/i915/i915.ko"/>
+		<file name="drivers/char/agp/intel-agp.ko"/>
 		<file name="crypto/*"/>
 		<file name="drivers/thermal/*"/>
 		<file name="drivers/hwmon/*"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml
--- old/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml	2010-12-03 16:08:52.000000000 +0100
+++ new/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml	2011-03-22 13:18:55.000000000 +0100
@@ -22,6 +22,8 @@
 		<profile name="rt" description="KERNEL: RealTime kernel"/>
 	</profiles>
 	<drivers type="drivers">
+		<file name="drivers/gpu/drm/i915/i915.ko"/>
+		<file name="drivers/char/agp/intel-agp.ko"/>
 		<file name="crypto/*"/>
 		<file name="drivers/thermal/*"/>
 		<file name="drivers/hwmon/*"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-SLED11/config.xml
--- old/kiwi/system/boot/ix86/vmxboot/suse-SLED11/config.xml	2010-12-03 16:08:52.000000000 +0100
+++ new/kiwi/system/boot/ix86/vmxboot/suse-SLED11/config.xml	2011-03-22 13:18:55.000000000 +0100
@@ -22,6 +22,8 @@
 		<profile name="rt" description="KERNEL: RealTime kernel"/>
 	</profiles>
 	<drivers type="drivers">
+		<file name="drivers/gpu/drm/i915/i915.ko"/>
+		<file name="drivers/char/agp/intel-agp.ko"/>
 		<file name="crypto/*"/>
 		<file name="drivers/virtio/*"/>
 		<file name="drivers/block/virtio_blk.ko"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-SLES11/config.xml
--- old/kiwi/system/boot/ix86/vmxboot/suse-SLES11/config.xml	2010-12-03 16:08:52.000000000 +0100
+++ new/kiwi/system/boot/ix86/vmxboot/suse-SLES11/config.xml	2011-03-22 13:18:55.000000000 +0100
@@ -22,6 +22,8 @@
 		<profile name="rt" description="KERNEL: RealTime kernel"/>
 	</profiles>
 	<drivers type="drivers">
+		<file name="drivers/gpu/drm/i915/i915.ko"/>
+		<file name="drivers/char/agp/intel-agp.ko"/>
 		<file name="crypto/*"/>
 		<file name="drivers/virtio/*"/>
 		<file name="drivers/block/virtio_blk.ko"/>


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)