Commit 327fff3e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

Pull misc kbuild updates from Michal Marek:
 "In the kbuild misc branch, I have:
   - make rpm-pkg updates, most importantly the rpm package now calls
     /sbin/installkernel
   - make deb-pkg: debuginfo split, correct kernel image path for
     parisc, mips and powerpc and a couple more minor fixes
   - New coccinelle check"

* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  scripts/checkkconfigsymbols.sh: replace echo -e with printf
  Provide version number for Debian firmware package
  coccinelle: replace 0/1 with false/true in functions returning bool
  deb-pkg: add a hook argument to match debian hooks parameters
  deb-pkg: fix installed image path on parisc, mips and powerpc
  deb-pkg: split debug symbols in their own package
  deb-pkg: use KCONFIG_CONFIG instead of .config file directly
  rpm-pkg: add generation of kernel-devel
  rpm-pkg: install firmware files in kernel relative directory
  rpm-pkg: add %post section to create initramfs and grub hooks
parents 1ff5e37e 36b5401b

scripts/checkkconfigsymbols.sh

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ paths="$@" 
# Doing this once at the beginning saves a lot of time, on a cache-hot tree.

Kconfigs="`find . -name 'Kconfig' -o -name 'Kconfig*[^~]'`"



/bin/echo -e "File list \tundefined symbol used"

printf "File list \tundefined symbol used\n"

find $paths -name '*.[chS]' -o -name 'Makefile' -o -name 'Makefile*[^~]'| while read i

do

	# Output the bare Kconfig variable and the filename; the _MODULE part at
@@ -54,6 +54,6 @@ while read symb files; do 
	# beyond the purpose of this script.

	symb_bare=`echo $symb | sed -e 's/_MODULE//'`

	if ! grep -q "\<$symb_bare\>" $Kconfigs; then

		/bin/echo -e "$files: \t$symb"

		printf "$files: \t$symb\n"

	fi

done|sort

scripts/coccinelle/misc/boolreturn.cocci

0 → 100644
+58 −0
Original line number Diff line number Diff line 
/// Return statements in functions returning bool should use

/// true/false instead of 1/0.

//

// Confidence: High

// Options: --no-includes --include-headers



virtual patch

virtual report

virtual context



@r1 depends on patch@

identifier fn;

typedef bool;

symbol false;

symbol true;

@@



bool fn ( ... )

{

<...

return

(

- 0

+ false

|

- 1

+ true

)

  ;

...>

}



@r2 depends on report || context@

identifier fn;

position p;

@@



bool fn ( ... )

{

<...

return

(

* 0@p

|

* 1@p

)

  ;

...>

}





@script:python depends on report@

p << r2.p;

fn << r2.fn;

@@



msg = "WARNING: return of 0/1 in function '%s' with return type bool" % fn

coccilib.report.print_report(p[0], msg)

scripts/package/builddeb

+78 −16
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@ create_package() { 
	parisc*)

		debarch=hppa ;;

	mips*)

		debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y .config && echo el) ;;

		debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo el) ;;

	arm*)

		debarch=arm$(grep -q CONFIG_AEABI=y .config && echo el) ;;

		debarch=arm$(grep -q CONFIG_AEABI=y $KCONFIG_CONFIG && echo el) ;;

	*)

		echo "" >&2

		echo "** ** **  WARNING  ** ** **" >&2
@@ -78,17 +78,35 @@ tmpdir="$objtree/debian/tmp" 
fwdir="$objtree/debian/fwtmp"

kernel_headers_dir="$objtree/debian/hdrtmp"

libc_headers_dir="$objtree/debian/headertmp"

dbg_dir="$objtree/debian/dbgtmp"

packagename=linux-image-$version

fwpackagename=linux-firmware-image

fwpackagename=linux-firmware-image-$version

kernel_headers_packagename=linux-headers-$version

libc_headers_packagename=linux-libc-dev

dbg_packagename=$packagename-dbg



if [ "$ARCH" = "um" ] ; then

	packagename=user-mode-linux-$version

fi



# Not all arches have the same installed path in debian

# XXX: have each arch Makefile export a variable of the canonical image install

# path instead

case $ARCH in

um)

	installed_image_path="usr/bin/linux-$version"

	;;

parisc|mips|powerpc)

	installed_image_path="boot/vmlinux-$version"

	;;

*)

	installed_image_path="boot/vmlinuz-$version"

esac



BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"



# Setup the directory structure

rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir"

rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir"

mkdir -m 755 -p "$tmpdir/DEBIAN"

mkdir -p  "$tmpdir/lib" "$tmpdir/boot" "$tmpdir/usr/share/doc/$packagename"

mkdir -m 755 -p "$fwdir/DEBIAN"
@@ -101,26 +119,29 @@ mkdir -p "$kernel_headers_dir/lib/modules/$version/" 
if [ "$ARCH" = "um" ] ; then

	mkdir -p "$tmpdir/usr/lib/uml/modules/$version" "$tmpdir/usr/bin"

fi

if [ -n "$BUILD_DEBUG" ] ; then

	mkdir -p "$dbg_dir/usr/share/doc/$dbg_packagename"

	mkdir -m 755 -p "$dbg_dir/DEBIAN"

fi



# Build and install the kernel

if [ "$ARCH" = "um" ] ; then

	$MAKE linux

	cp System.map "$tmpdir/usr/lib/uml/modules/$version/System.map"

	cp .config "$tmpdir/usr/share/doc/$packagename/config"

	cp $KCONFIG_CONFIG "$tmpdir/usr/share/doc/$packagename/config"

	gzip "$tmpdir/usr/share/doc/$packagename/config"

	cp $KBUILD_IMAGE "$tmpdir/usr/bin/linux-$version"

else 

	cp System.map "$tmpdir/boot/System.map-$version"

	cp .config "$tmpdir/boot/config-$version"

	cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version"

fi

# Not all arches include the boot path in KBUILD_IMAGE

if [ -e $KBUILD_IMAGE ]; then

		cp $KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"

	cp $KBUILD_IMAGE "$tmpdir/$installed_image_path"

else

		cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"

	fi

	cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path"

fi



if grep -q '^CONFIG_MODULES=y' .config ; then

if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then

	INSTALL_MOD_PATH="$tmpdir" $MAKE KBUILD_SRC= modules_install

	rm -f "$tmpdir/lib/modules/$version/build"

	rm -f "$tmpdir/lib/modules/$version/source"
@@ -128,6 +149,20 @@ if grep -q '^CONFIG_MODULES=y' .config ; then 
		mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/"

		rmdir "$tmpdir/lib/modules/$version"

	fi

	if [ -n "$BUILD_DEBUG" ] ; then

		(

			cd $tmpdir

			for module in $(find lib/modules/ -name *.ko); do

				mkdir -p $(dirname $dbg_dir/usr/lib/debug/$module)

				# only keep debug symbols in the debug file

				objcopy --only-keep-debug $module $dbg_dir/usr/lib/debug/$module

				# strip original module from debug symbols

				objcopy --strip-debug $module

				# then add a link to those

				objcopy --add-gnu-debuglink=$dbg_dir/usr/lib/debug/$module $module

			done

		)

	fi

fi



if [ "$ARCH" != "um" ]; then
@@ -149,7 +184,7 @@ set -e 
# Pass maintainer script parameters to hook scripts

export DEB_MAINT_PARAMS="\$*"



test -d $debhookdir/$script.d && run-parts --arg="$version" $debhookdir/$script.d

test -d $debhookdir/$script.d && run-parts --arg="$version" --arg="/$installed_image_path" $debhookdir/$script.d

exit 0

EOF

	chmod 755 "$tmpdir/DEBIAN/$script"
@@ -245,11 +280,12 @@ fi 
# Build header package

(cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")

(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")

(cd $objtree; find arch/$SRCARCH/include .config Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")

(cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")

destdir=$kernel_headers_dir/usr/src/linux-headers-$version

mkdir -p "$destdir"

(cd $srctree; tar -c -f - -T "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -)

(cd $objtree; tar -c -f - -T "$objtree/debian/hdrobjfiles") | (cd $destdir; tar -xf -)

(cd $objtree; cp $KCONFIG_CONFIG $destdir/.config) # copy .config manually to be where it's expected to be

ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"

rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"

arch=$(dpkg --print-architecture)
@@ -299,4 +335,30 @@ fi 


create_package "$packagename" "$tmpdir"



if [ -n "$BUILD_DEBUG" ] ; then

	# Build debug package

	# Different tools want the image in different locations

	# perf

	mkdir -p $dbg_dir/usr/lib/debug/lib/modules/$version/

	cp vmlinux $dbg_dir/usr/lib/debug/lib/modules/$version/

	# systemtap

	mkdir -p $dbg_dir/usr/lib/debug/boot/

	ln -s ../lib/modules/$version/vmlinux $dbg_dir/usr/lib/debug/boot/vmlinux-$version

	# kdump-tools

	ln -s lib/modules/$version/vmlinux $dbg_dir/usr/lib/debug/vmlinux-$version



	cat <<EOF >> debian/control



Package: $dbg_packagename

Section: debug

Provides: linux-debug, linux-debug-$version

Architecture: any

Description: Linux kernel debugging symbols for $version

 This package will come in handy if you need to debug the kernel. It provides

 all the necessary debug symbols for the kernel and its modules.

EOF



	create_package "$dbg_packagename" "$dbg_dir"

fi



exit 0

scripts/package/mkspec

+40 −6
Original line number Diff line number Diff line 
#!/bin/sh

#

#	Output a simple RPM spec file that uses no fancy features requiring

#	RPM v4. This is intended to work with any RPM distro.

#	Output a simple RPM spec file.

#	This version assumes a minimum of RPM 4.0.3.

#

#	The only gothic bit here is redefining install_post to avoid

#	stripping the symbols from files in the kernel which we want
@@ -59,6 +59,14 @@ echo "header files define structures and constants that are needed for" 
echo "building most standard programs and are also needed for rebuilding the"

echo "glibc package."

echo ""

echo "%package devel"

echo "Summary: Development package for building kernel modules to match the $__KERNELRELEASE kernel"

echo "Group: System Environment/Kernel"

echo "AutoReqProv: no"

echo "%description -n kernel-devel"

echo "This package provides kernel headers and makefiles sufficient to build modules"

echo "against the $__KERNELRELEASE kernel package."

echo ""



if ! $PREBUILT; then

echo "%prep"
@@ -77,13 +85,14 @@ echo "%install" 
echo 'KBUILD_IMAGE=$(make image_name)'

echo "%ifarch ia64"

echo 'mkdir -p $RPM_BUILD_ROOT/boot/efi $RPM_BUILD_ROOT/lib/modules'

echo 'mkdir -p $RPM_BUILD_ROOT/lib/firmware'

echo "%else"

echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib/modules'

echo 'mkdir -p $RPM_BUILD_ROOT/lib/firmware'

echo "%endif"

echo 'mkdir -p $RPM_BUILD_ROOT'"/lib/firmware/$KERNELRELEASE"



echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{?_smp_mflags} KBUILD_SRC= modules_install'

echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{?_smp_mflags} KBUILD_SRC= mod-fw= modules_install'

echo 'INSTALL_FW_PATH=$RPM_BUILD_ROOT'"/lib/firmware/$KERNELRELEASE"

echo 'make INSTALL_FW_PATH=$INSTALL_FW_PATH' firmware_install

echo "%ifarch ia64"

echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/efi/vmlinuz-$KERNELRELEASE"

echo 'ln -s '"efi/vmlinuz-$KERNELRELEASE" '$RPM_BUILD_ROOT'"/boot/"
@@ -108,18 +117,43 @@ echo 'mv vmlinux.bz2 $RPM_BUILD_ROOT'"/boot/vmlinux-$KERNELRELEASE.bz2" 
echo 'mv vmlinux.orig vmlinux'

echo "%endif"



echo 'rm -f $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE/{build,source}"

echo "mkdir -p "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE"

echo "EXCLUDES=\"$RCS_TAR_IGNORE --exclude .tmp_versions --exclude=*vmlinux* --exclude=*.o --exclude=*.ko --exclude=*.cmd --exclude=Documentation --exclude=firmware --exclude .config.old --exclude .missing-syscalls.d\""

echo "tar "'$EXCLUDES'" -cf- . | (cd "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE;tar xvf -)"

echo 'cd $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE"

echo "ln -sf /usr/src/kernels/$KERNELRELEASE build"

echo "ln -sf /usr/src/kernels/$KERNELRELEASE source"



echo ""

echo "%clean"

echo 'rm -rf $RPM_BUILD_ROOT'

echo ""

echo "%post"

echo "if [ -x /sbin/installkernel -a -r /boot/vmlinuz-$KERNELRELEASE -a -r /boot/System.map-$KERNELRELEASE ]; then"

echo "cp /boot/vmlinuz-$KERNELRELEASE /boot/vmlinuz-$KERNELRELEASE-rpm"

echo "cp /boot/System.map-$KERNELRELEASE /boot/System.map-$KERNELRELEASE-rpm"

echo "rm -f /boot/vmlinuz-$KERNELRELEASE /boot/System.map-$KERNELRELEASE"

echo "/sbin/installkernel $KERNELRELEASE /boot/vmlinuz-$KERNELRELEASE-rpm /boot/System.map-$KERNELRELEASE-rpm"

echo "rm -f /boot/vmlinuz-$KERNELRELEASE-rpm /boot/System.map-$KERNELRELEASE-rpm"

echo "fi"

echo ""

echo "%files"

echo '%defattr (-, root, root)'

echo "%dir /lib/modules"

echo "/lib/modules/$KERNELRELEASE"

echo "/lib/firmware"

echo "%exclude /lib/modules/$KERNELRELEASE/build"

echo "%exclude /lib/modules/$KERNELRELEASE/source"

echo "/lib/firmware/$KERNELRELEASE"

echo "/boot/*"

echo ""

echo "%files headers"

echo '%defattr (-, root, root)'

echo "/usr/include"

echo ""

echo "%files devel"

echo '%defattr (-, root, root)'

echo "/usr/src/kernels/$KERNELRELEASE"

echo "/lib/modules/$KERNELRELEASE/build"

echo "/lib/modules/$KERNELRELEASE/source"

echo ""

CRA Git | Maintained and supported by SUSTech CRA and CCSE