OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kernel-source?expand=0&rev=20

README.SUSE

@@ -319,13 +319,13 @@ WHERE TO FIND CONFIGURATION FILES
 Kernel configuration files are stored in the kernel CVS repository. When
 packing up the repository, they end up in config.tar.bz.  When
 kernel-source.$ARCH.rpm is built, the config files are copied from
-config/$ARCH/$FLAVOR to arch/$ARCH/defconfig.$FLAVOR in the kernel
-source tree (for eaxmple, arch/i386/defconfig.default).
+config/$ARCH/$FLAVOR to .config in the kernel source tree.
 
-The kernel-$FLAVOR packages are based on arch/$ARCH/defconfig.$FLAVOR
-(kernel-default is based on arch/$ARCH/defconfig.default, for example).
+The kernel-$FLAVOR packages are based on config/$ARCH/$FLAVOR.
+(kernel-default is based on config/$ARCH/default, for example).
 The kernel-$FLAVOR packages install their configuration files as
-/boot/config-$VER_STR (for example, boot/config-2.6.5-99-default).
+/boot/config-$VER_STR (for example, /boot/config-2.6.5-99-default) as
+well as /usr/src/linux-obj/$ARCH/$FLAVOR/.config.
 
 In addition, the running kernel exposes a gzip compressed version of its
 configuration file as /proc/config.gz. The kernel sources can be

build-source-timestamp

@@ -1,2 +1 @@
-2008-09-29 23:39:54 +0200
-CVS Date: 2008.09.29.21.50.20
+2008-10-11 20:45:44 +0200

built-in-where

@@ -23,7 +23,7 @@ built_in_exports() {
 # file that don't have a match in the second. Finally remove the
 # duplicate column.
 join -t $'\t' -1 2 -2 1 -a 1 \
-    <(sort -k2) \
+    <(cut -f1,2,3 | sort -k2) \
     <(built_in_exports | sort -k1) \
 | awk '
 BEGIN	{ FS = "\t" ; OFS = "\t" }

check-supported-list

@@ -15,7 +15,7 @@ done
 # Check if any installed module was not listed
 status=
 cd $modpath
-for module in $(find . -name '*.ko'); do
+for module in $(find . -name '*.ko' | sort); do
     module=${module%.ko}
     m=${module##*/}
     m=${m//-/_}

config.conf

@@ -6,8 +6,8 @@
 +IA32		i386/debug
 +IA32		i386/xen
 +IA32		i386/vanilla
-+IA32 -		i386/rt
-+IA32 -		i386/rt_debug
++IA32 		i386/rt
++IA32 		i386/rt_debug
 +IA32		i386/trace
 
 +ia64		ia64/default
@@ -19,8 +19,8 @@
 +x86_64		x86_64/xen
 +x86_64		x86_64/debug
 +x86_64		x86_64/vanilla
-+x86_64	-	x86_64/rt
-+x86_64	-	x86_64/rt_debug
++x86_64		x86_64/rt
++x86_64		x86_64/rt_debug
 +x86_64 -	x86_64/rt_timing
 +x86_64		x86_64/trace
 
@@ -33,4 +33,4 @@
 
 +s390		s390/s390
 +s390x		s390/default
-+s390x		s390/vanilla
++S390		s390/vanilla

config.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e1d3e055280e87ff79c37d47e575e228d20f1d8397544c7efc7799f54a998a8f
-size 139134
+oid sha256:9969d9944e53e3bbe3281e63cc4ece59ca5c1772b4904187ae9b4e082b59373f
+size 134786

get_release_number.sh

@@ -1,5 +1,5 @@
 #! /bin/sh
-prefix=rc7.
+prefix=
 suffix=
 if [ "$3" = kernel-dummy -o -n "$suffix" ]; then
     [ -n "$suffix" ] || suffix=$2

kabi.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e8d8d82e4a375c1cf6cce93cdf57b19633194f647c15acca93e17375c8b11566
-size 2269
+oid sha256:e42c4d109b2a8f57b5e2e616a6212b1efe26bd6b8c5628d3249d0017c6a214e3
+size 2272

kernel-module-subpackage

@@ -47,73 +47,24 @@ END		{ exit(! good) }
 )
 %post -n %{-n*}-%1
 version=%(echo %{-v*}-%3 | tr - _)
-if [ -e /boot/System.map-%2 ]; then
-    /sbin/depmod -a -F /boot/System.map-%2 %2
-fi
-modules=( $(rpm -ql %{-n*}-%1-$version-%{-r*} | grep '\.ko$') )
-if [ -x /usr/lib/module-init-tools/weak-modules ]; then
-    printf '%s\n' "${modules[@]}" \
-    | /usr/lib/module-init-tools/weak-modules --add-modules
-fi
-if [ -e /etc/sysconfig/kernel -a -e /boot/initrd-%2 ]; then
-    source /etc/sysconfig/kernel
-    run_mkinitrd=
-    set -- "${modules[@]##*/}" ; set -- "${@%.ko}"
-    for module in $INITRD_MODULES; do
-	case " $* " in
-	*" $module "*)
-	    run_mkinitrd=1
-	    break ;;
-	esac
-    done
-    if [ -n "$run_mkinitrd" ]; then
-	for image in vmlinuz image vmlinux linux bzImage; do
-	    if [ -f /boot/$image-%2 ]; then
-		/sbin/mkinitrd -k /boot/$image-%2 \
-			       -i /boot/initrd-%2 \
-		|| exit 1
-		break
-	    fi
-	done
-    fi
+nvr=%{-n*}-%1-$version-%{-r*}
+wm2=/usr/lib/module-init-tools/weak-modules2
+if [ -x $wm2 ]; then
+    $wm2 --add-kmp $nvr
 fi
 %preun -n %{-n*}-%1
 version=%(echo %{-v*}-%3 | tr - _)
+nvr=%{-n*}-%1-$version-%{-r*}
 set -o noclobber
-rpm -ql %{-n*}-%1-$version-%{-r*} | grep '\.ko$' \
-    > /var/run/rpm-%{-n*}-%1-$version-%{-r*}-modules
+rpm -ql $nvr | grep '\.ko$' > /var/run/rpm-$nvr-modules
 %postun -n %{-n*}-%1
 version=%(echo %{-v*}-%3 | tr - _)
-modules=( $(cat /var/run/rpm-%{-n*}-%1-$version-%{-r*}-modules) )
-rm -f /var/run/rpm-%{-n*}-%1-$version-%{-r*}-modules
-if [ -e /boot/System.map-%2 ]; then
-    /sbin/depmod -a -F /boot/System.map-%2 %2
-fi
-if [ -x /usr/lib/module-init-tools/weak-modules ]; then
-    printf '%s\n' "${modules[@]}" \
-    | /usr/lib/module-init-tools/weak-modules --remove-modules
-fi
-if [ -e /etc/sysconfig/kernel -a -e /boot/initrd-%2 ]; then
-    source /etc/sysconfig/kernel
-    run_mkinitrd=
-    set -- "${modules[@]##*/}" ; set -- "${@%.ko}"
-    for module in $INITRD_MODULES; do
-	case " $* " in
-	*" $module "*)
-	    run_mkinitrd=1
-	    break ;;
-	esac
-    done
-    if [ -n "$run_mkinitrd" ]; then
-	for image in vmlinuz image vmlinux linux bzImage; do
-	    if [ -f /boot/$image-%2 ]; then
-		/sbin/mkinitrd -k /boot/$image-%2 \
-			       -i /boot/initrd-%2 \
-		|| exit 1
-		break
-	    fi
-	done
-    fi
+nvr=%{-n*}-%1-$version-%{-r*}
+modules=( $(cat /var/run/rpm-$nvr-modules) )
+rm -f /var/run/rpm-$nvr-modules
+wm2=/usr/lib/module-init-tools/weak-modules2
+if [ -x $wm2 ]; then
+    printf '%s\n' "${modules[@]}" | $wm2 --remove-kmp $nvr
 fi
 %files -n %{-n*}-%1
 %{-f:%{expand:%(cd %_sourcedir; cat %{-f*})}}

kernel-source-rt.rpmlintrc

@@ -0,0 +1,2 @@
+# These zero-length files are correct:
+addFilter("zero-length /usr/src/linux-2\.6\..*obj/.*include/config.*h")

kernel-source.rpmlintrc

@@ -1,4 +1,2 @@
 # These zero-length files are correct:
 addFilter("zero-length /usr/src/linux-2\.6\..*obj/.*include/config.*h")
-# This is not a conf-file but placed in /etc nevertheless:
-addFilter("non-conffile-in-etc /etc/rpm/macros.kernel-source")

linux-2.6.26.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:666488e2511393fdb901eaf1e67275bcc38ab37c930e8a9adb290a95c1721a2a
-size 49441874

linux-2.6.27.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0e99bf9e83f4d1ae0c656741a84dfddfa9c4d2469cf35475f5939d02dc3e4393
+size 50355835

patches.addon.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d8d4e488de975090915904b6eb5d154aa7232aeab36765eb3329e729e4fc2d91
-size 132
+oid sha256:dc1839b5e1ba07b961aadd162d88715481cd1b2dd78a2c2ce95b30459ad7d9ed
+size 126

patches.apparmor.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dbdc5f725a2dfda9ae99dbf0f64a5471c945246cddc3701e020719027862b180
-size 58871
+oid sha256:624f9470ad6868b6a48f9a29ec0db56448dd6ba0208f222db6aae626970e94e9
+size 59111

patches.arch.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aba9f91c2f7bd330f56dd044bdc64d696a6aa073f9599ff110739a1b2ee05e41
-size 80462
+oid sha256:abce751bd04c928b70a4bcebe5ebc5bf34143647fbdb125543786be5251021e6
+size 120870

patches.drivers.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e3146cfd3bcec0574902ff6a45fbd15d5cf6acfbef38474428e476befc47d57
-size 320457
+oid sha256:3cdf4c184caf973e2b854867f056a8004a79f553102f8d6615bdd3037e837c29
+size 518625

patches.fixes.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:023886364a867af03d71004b5ab572c0fcb945dfcc84bcb1b9ea7e444524b48c
-size 81440
+oid sha256:04110b4ca6bd3c82f3a39883eb023a69e21609f4d3c15260aea5db079533897e
+size 80471

patches.kernel.org.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e092fbcfe89a77b4db601fe59d312821c3a55f3f8d3f2f5ec9d39b13c4d89a68
-size 14822889
+oid sha256:0f15b49b661ca1428e372fe8a656aa3d4351c31727b39aea9e464c17e32bc931
+size 5373

patches.rpmify.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5b38eb53977e83d03959ec1c26bc657b703982ed028d74d09401061f664b14cb
-size 1626
+oid sha256:2f41a715f97942579ffbe54175c368a86eee764b2ce2a88370d2bc6cb8dc55ca
+size 1613

patches.rt.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1716626c40b4fa154fda69981d56e322de2dbe0d0971c19d04de9b9c9ce6c47d
-size 436999
+oid sha256:a4c7496a8bfb0740986c5341619fcea23a293c5e958bf080aee0fa6d845817d1
+size 352358

patches.suse.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f2bba65af5ffaa10958cb4aebefda2982cb6a19fbab6a2f93689effbdc5f6e88
-size 1124899
+oid sha256:d7f0ebe5dd0d202fdd3a3bbd7299d0fc21629a3da13970c9fd6309d06293ed3d
+size 1194969

patches.trace.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:24a06a4ce9d843e59f02b66421dbb1464c28bf61b3f2c01cca5e06692686009f
-size 28527
+oid sha256:c250b75a2ac701e3c38bec47ffdcdbd60165c812894b1f80275ad1b7654764c8
+size 28490

patches.uml.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3eae647839c0ae7103ef5ab0d6918768a9f25776dda1028411d439e78fcaf9d9
-size 11061

patches.xen.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ede4fae06100b4bab42251905a8e9f367ecd50d060893e538bf74d897b5a8c84
-size 1434255
+oid sha256:1824e1abab0f35c259e853a8f0936fde0b9d232b9b48bafc6c07cb42f3e401dd
+size 1460639

post.sh

@@ -26,18 +26,19 @@ if [ -f /proc/cpuinfo ]; then
     esac
 fi
 
+suffix=
+case @FLAVOR@ in
+    kdump|ps3|um|xen*)
+	suffix=-@FLAVOR@
+	;;
+esac
+for x in /boot/@IMAGE@ /boot/initrd; do
+    rm -f $x$suffix
+    ln -s ${x##*/}-@KERNELRELEASE@ $x$suffix
+done
+
 if [ -e /lib/modules/@KERNELRELEASE@ ]; then
     echo Setting up /lib/modules/@KERNELRELEASE@
-    suffix=
-    case @FLAVOR@ in
-	kdump|ps3|um|xen*)
-	    suffix=-@FLAVOR@
-	    ;;
-    esac
-    for x in /boot/@IMAGE@ /boot/initrd; do
-	rm -f $x$suffix
-	ln -s ${x##*/}-@KERNELRELEASE@ $x$suffix
-    done
 
     if [ -x /sbin/module_upgrade ]; then
 	/sbin/module_upgrade --rename mptscsih="mptspi mptfc mptsas"
@@ -56,11 +57,6 @@ message_install_bl () {
 }
 
 run_bootloader () {
-    # Only create the bootloader entry when installing kernel-$flavor-base.
-    if [ @SUBPACKAGE@ != kernel-@FLAVOR@-base ]; then
-	return 1
-    fi
-
     if [ -f /etc/sysconfig/bootloader ] &&
 	    [ -f /boot/grub/menu.lst -o \
 	      -f /etc/lilo.conf      -o \
@@ -76,21 +72,29 @@ run_bootloader () {
 if [ -f /etc/fstab -a ! -e /.buildenv -a -x /sbin/mkinitrd ] ; then
     if ! /sbin/mkinitrd -k /boot/@IMAGE@-@KERNELRELEASE@ \
 			-i /boot/initrd-@KERNELRELEASE@; then
-	echo "/sbin/mkinitrd failed" >&2
-	exit 1
+	# mkinitrd fails with status 10 if any required kernel modules missing.
+	# We expect those modules to be added later (by one of the other
+	# kernel-$flavor packages).
+	if [ $? -ne 10 ]; then
+	    echo "/sbin/mkinitrd failed" >&2
+	    exit 1
+	fi
     fi
 
     # only run the bootloader if the usual bootloader configuration
     # files are there -- this is different on every architecture
-    if run_bootloader ; then
-	# handle 10.2 and SLES10 SP1
+    initrd=/boot/initrd-@KERNELRELEASE
+    if [ -e $initrd -o ! -e /lib/modules/@KERNELRELEASE@ ] && \
+       run_bootloader ; then
+       [ -e $initrd ] || initrd=
+	# handle 10.2 and SLES10 SP1 or later
 	if [ -x /usr/lib/bootloader/bootloader_entry ]; then
 	    /usr/lib/bootloader/bootloader_entry \
 		add \
 		@FLAVOR@ \
 		@KERNELRELEASE@ \
 		@IMAGE@-@KERNELRELEASE@ \
-		initrd-@KERNELRELEASE@
+		$initrd
 
 	# handle 10.1 and SLES10 GA
 	elif [ -x /sbin/update-bootloader ]; then
@@ -110,7 +114,7 @@ if [ -f /etc/fstab -a ! -e /.buildenv -a -x /sbin/mkinitrd ] ; then
 		    echo "bootloader_entry script unavailable, updating /boot/@IMAGE@"
 		    /sbin/update-bootloader \
 			--image /boot/@IMAGE@ \
-			--initrd /boot/initrd \
+			${initrd:+--initrd /boot/initrd} \
 			--add \
 			--force $opt_xen_kernel
 

source-post.sh

@@ -1,2 +1,2 @@
 relink linux-@KERNELRELEASE@@VARIANT@ /usr/src/linux@VARIANT@
-relink linux-@KERNELRELEASE@-obj /usr/src/linux-obj
+relink linux-@KERNELRELEASE@@VARIANT@-obj /usr/src/linux@VARIANT@-obj