Merge branch 'experimental' using --no-ff

ChangeLog

@@ -5,6 +5,23 @@
 # Distributed under the GPL v2
 # $Id$
 
+  22 Jan 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog:
+  Enable CONFIG_USB_SUSPEND for x86/amd64 (bug #351376)
+  Replace "${MAKEOPTS/-j?/j1}" by "${MAKEOPTS} -j1" (bug #277607)
+
+  21 Jan 2011; Sebastian Pipping <sping@gentoo.org> gen_determineargs.sh:
+  Do not query generated files (like include/config/kernel.release) for kernel
+  version, as they may be out of sync (bug #263927)
+
+  20 Jan 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog:
+  Add proper mdadm support (bug #282100)
+
+  Special thanks:
+  - Craig Andrews (Testing)
+  - Laurent Pinchart (mdmon/IMSM support)
+  - Matthias Dahl (Initial patch)
+  - Xake (Testing)
+
   20 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.11.1
 

arch/x86/kernel-config

@@ -2940,7 +2940,7 @@ CONFIG_USB=m
 CONFIG_USB_DEVICEFS=y
 CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_SUSPEND is not set
+CONFIG_USB_SUSPEND=y
 # CONFIG_USB_PERSIST is not set
 # CONFIG_USB_OTG is not set
 

arch/x86_64/kernel-config

@@ -2440,7 +2440,7 @@ CONFIG_USB=m
 CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_DEVICE_CLASS is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_SUSPEND is not set
+CONFIG_USB_SUSPEND=y
 # CONFIG_USB_PERSIST is not set
 # CONFIG_USB_OTG is not set
 

defaults/initrd.scripts

@@ -398,11 +398,6 @@ whereis(){
 	esac
 }
 
-bind_mount_dev() {
-	# bind-mount /dev/ so that loop devices can be found
-	mount -o bind ${NEW_ROOT}/dev /dev
-}
-
 setup_hotplug() {
 	if [ "${KV_2_6_OR_GREATER}" ]
 	then
@@ -615,9 +610,10 @@ startVolumes() {
 	then
 		if [ ! -e '/etc/mdadm.conf' ]
 		then
-			/sbin/mdadm --examine > /etc/mdadm.conf
+			echo "DEVICE /dev/sd[a-z]* /dev/hd[a-z]*" >/etc/mdadm.conf
+			/sbin/mdadm --examine --scan >>/etc/mdadm.conf
 		fi
-		/sbin/mdadm --assemble
+		/sbin/mdadm --assemble --scan
 	fi
 
 	if [ "${USE_DMRAID_NORMAL}" = '1' ]

defaults/linuxrc

@@ -135,6 +135,7 @@ do
 		# Redirect output to a specific tty
 		CONSOLE\=*|console\=*)
 			CONSOLE=`parse_opt "${x}"`
+			CONSOLE=`basename ${CONSOLE}`
 #			exec >${CONSOLE} <${CONSOLE} 2>&1
 		;;
 		# /dev/md

doc/genkernel.8.txt

@@ -137,9 +137,6 @@ KERNEL COMPILATION
 *--oldconfig*::
     Implies *--no-clean*, and thus *--no-mrproper*, running a "make oldconfig".
 
-*--gensplash*::
-    Install framebuffer splash support into initramfs.
-
 *--*[*no-*]*splash*::
     Installs, or not, framebuffer splash support into initramfs.
 
@@ -222,10 +219,10 @@ LOW-LEVEL COMPILATION OPTIONS
 
 INITIALIZATION
 ~~~~~~~~~~~~~~
-*--gensplash*=<theme>::
+*--splash*=<theme>::
     Enable framebuffer splash using <theme>.
 
-*--gensplash-res*=<resolutions>::
+*--splash-res*=<resolutions>::
     Select gensplash resolutions to include.
 
 *--*[*no-*]*splash*=<theme>::
@@ -233,9 +230,6 @@ INITIALIZATION
     <theme>  rather than the default theme specified in your splash
     configuration. If *--no-splash* is specified, then splash is disabled.
 
-*--splash-res*=<resolutions>::
-    Optionally select splash resolutions to include.
-
 *--do-keymap-auto*::
     Force keymap selection at boot.
 
@@ -243,18 +237,17 @@ INITIALIZATION
     Disables keymap selection at boot.
 
 *--evms*::
-*--evms2*::
     Add in EVMS support from static binaries if they exist on the system:
     you should run "emerge evms" first (in the host system).
 
 *--lvm*::
-*--lvm2*::
     Add in LVM support from static binaries if they exist on the
     system,  or compile static LVM binaries if static ones do not
     exist.
 
 *--mdadm*::
-    Copy '/etc/mdadm.conf' to initramfs.
+    Copy '/etc/mdadm.conf' and mdadm/mdmon binaries to initramfs.
+    Without sys-fs/mdadm[static] installed, this will compile mdadm for you.
 
 *--dmraid*::
     Add DMRAID support.
@@ -471,6 +464,7 @@ AUTHORS
 - Eric Edgar <rocket@gentoo.org>
 - NFS Support by Thomas Seiler <thseiler@gmail.com>
 - GnuPG 1.x integration by dacook <schism@subverted.org>
+- MDADM integration by Matthias Dahl <ua_bugz_gentoo@mortal-soul.de>
 
 
 SEE ALSO

gen_cmdline.sh

@@ -35,7 +35,6 @@ longusage() {
   echo "	--no-clean		Do not run make clean before compilation"
   echo "	--no-mrproper		Do not run make mrproper before compilation"
   echo "	--oldconfig		Implies --no-clean and runs a 'make oldconfig'"
-  echo "	--gensplash		Install framebuffer splash support into initramfs"
   echo "	--splash		Install framebuffer splash support into initramfs"
   echo "	--no-splash		Do not install framebuffer splash"
   echo "	--install		Install the kernel after building"
@@ -70,8 +69,8 @@ longusage() {
   echo "	--no-mountboot		Don't mount BOOTDIR automatically"  
   echo "	--bootdir=<dir>		Set the location of the boot-directory, default is /boot"
   echo "  Initialization"
-  echo "	--gensplash=<theme>	Enable framebuffer splash using <theme>"
+  echo "	--splash=<theme>	Enable framebuffer splash using <theme>"
-  echo "	--gensplash-res=<res>	Select splash theme resolutions to install"
+  echo "	--splash-res=<res>	Select splash theme resolutions to install"
   echo "	--splash=<theme>	Enable framebuffer splash using <theme>"
   echo "	--splash-res=<res>	Select splash theme resolutions to install"
   echo "	--do-keymap-auto	Forces keymap selection at boot"
@@ -79,11 +78,7 @@ longusage() {
   echo "	--evms			Include EVMS support"
   echo "				--> 'emerge evms' in the host operating system"
   echo "				first"
-  echo "	--evms2			Include EVMS support"
-  echo "				--> 'emerge evms' in the host operating system"
-  echo "				first"
   echo "	--lvm			Include LVM support"
-  echo "	--lvm2			Include LVM support"
   echo "	--mdadm			Copy /etc/mdadm.conf to initramfs"
   echo "	--dmraid		Include DMRAID support"
   echo "	--multipath		Include Multipath support"
@@ -98,10 +93,10 @@ longusage() {
   echo "	--luks			Include LUKS support"
   echo "				--> 'emerge cryptsetup-luks' with USE=-dynamic"
   echo "	--gpg			Include GPG-armored LUKS key support"
-  echo "	--no-busybox    Do not include busybox in the initramfs."
+  echo "	--no-busybox		Do not include busybox in the initramfs."
-  echo "	--unionfs       Include support for unionfs"
+  echo "	--unionfs		Include support for unionfs"
-  echo "	--netboot       Create a self-contained env in the initramfs"
+  echo "	--netboot		Create a self-contained env in the initramfs"
-  echo "	--real-root=<foo> Specify a default for real_root="
+  echo "	--real-root=<foo>	Specify a default for real_root="
   echo "  Internals"
   echo "	--arch-override=<arch>	Force to arch instead of autodetect"
   echo "	--cachedir=<dir>	Override the default cache location"

gen_compile.sh

@@ -252,8 +252,8 @@ compile_generic() {
 	# ARGS='CC="ccache gcc"'
 	if [ "${argstype}" == 'runtask' ]
 	then
-		print_info 2 "COMMAND: ${MAKE} ${MAKEOPTS/-j?/j1} ${ARGS} ${target} $*" 1 0 1
+		print_info 2 "COMMAND: ${MAKE} ${MAKEOPTS} -j1 ${ARGS} ${target} $*" 1 0 1
-		eval ${MAKE} -s ${MAKEOPTS/-j?/-j1} "${ARGS}" ${target} $*
+		eval ${MAKE} -s ${MAKEOPTS} -j1 "${ARGS}" ${target} $*
 		RET=$?
 	elif [ "${LOGLEVEL}" -gt "1" ]
 	then
@@ -457,6 +457,42 @@ compile_lvm() {
 	fi
 }
 
+compile_mdadm() {
+	if [ ! -f "${MDADM_BINCACHE}" ]
+	then
+		[ -f "${MDADM_SRCTAR}" ] ||
+			gen_die "Could not find MDADM source tarball: ${MDADM_SRCTAR}! Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"
+		cd "${TEMP}"
+		rm -rf "${MDADM_DIR}" > /dev/null
+		/bin/tar -jxpf "${MDADM_SRCTAR}" ||
+			gen_die 'Could not extract MDADM source tarball!'
+		[ -d "${MDADM_DIR}" ] ||
+			gen_die 'MDADM directory ${MDADM_DIR} is invalid!'
+
+		cd "${MDADM_DIR}"
+		sed -i "/^CFLAGS = /s:^CFLAGS = \(.*\)$:CFLAGS = -Os:" Makefile
+		sed -i "/^CXFLAGS = /s:^CXFLAGS = \(.*\)$:CXFLAGS = -Os:" Makefile
+		sed -i "/^CWFLAGS = /s:^CWFLAGS = \(.*\)$:CWFLAGS = -Wall:" Makefile
+		sed -i "s/^# LDFLAGS = -static/LDFLAGS = -static/" Makefile
+
+		print_info 1 'mdadm: >> Compiling...'
+			compile_generic 'mdadm mdmon' utils
+
+		mkdir -p "${TEMP}/mdadm/sbin"
+		install -m 0755 -s mdadm "${TEMP}/mdadm/sbin/mdadm"
+		install -m 0755 -s mdmon "${TEMP}/mdadm/sbin/mdmon"
+		print_info 1 '      >> Copying to bincache...'
+		cd "${TEMP}/mdadm"
+		strip "sbin/mdadm" "sbin/mdmon" ||
+			gen_die 'Could not strip mdadm binaries!'
+		/bin/tar -cjf "${MDADM_BINCACHE}" sbin/mdadm sbin/mdmon ||
+			gen_die 'Could not create binary cache'
+
+		cd "${TEMP}"
+		rm -rf "${MDADM_DIR}" mdadm
+	fi
+}
+
 compile_dmraid() {
 	compile_device_mapper
 	if [ ! -f "${DMRAID_BINCACHE}" ]

gen_configkernel.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 # $Id$
 
+# Fills variable KERNEL_CONFIG
 determine_config_file() {
 	if [ "${CMD_KERNEL_CONFIG}" != "" ]
 	then

gen_determineargs.sh

@@ -39,28 +39,20 @@ get_KV() {
 			EXV=`grep ^EXTRAVERSION\ \= ${KERNEL_SOURCE_DIR}/Makefile | sed -e "s/EXTRAVERSION =//" -e "s/ //g" -e 's/\$([a-z]*)//gi'`
 		fi
 
-		cd ${KERNEL_DIR}
+		# Extract local version suffix from .config
-		#compile_generic prepare kernel > /dev/null 2>&1
+		# Not, that we explicitly do not look at generated files like
-		cd - > /dev/null 2>&1
+		# - include/config/kernel.release
-		[ -f "${KERNEL_DIR}/include/linux/version.h" ] && \
+		# - include/linux/version.h
-			VERSION_SOURCE="${KERNEL_DIR}/include/linux/version.h"
+		# - include/linux/utsrelease.h
-		[ -f "${KERNEL_DIR}/include/linux/utsrelease.h" ] && \
+		# as they require "make prepare" to be up to date (bug #263927)
-			VERSION_SOURCE="${KERNEL_DIR}/include/linux/utsrelease.h"
+		local future_config="${KERNEL_DIR}"/.config
-		# Handle new-style releases where version.h doesn't have UTS_RELEASE
+		if isTrue "${MRPROPER}" || [ ! -f "${future_config}" ]
-		if [ -f ${KERNEL_DIR}/include/config/kernel.release ]
 		then
-			UTS_RELEASE=`cat ${KERNEL_DIR}/include/config/kernel.release`
+			determine_config_file
-			LOV=`echo ${UTS_RELEASE}|sed -e "s/${VER}.${PAT}.${SUB}${EXV}//"`
+			future_config=${KERNEL_CONFIG}
-			KV=${VER}.${PAT}.${SUB}${EXV}${LOV}
-		elif [ -n "${VERSION_SOURCE}" ]
-		then
-			UTS_RELEASE=`grep UTS_RELEASE ${VERSION_SOURCE} | sed -e 's/#define UTS_RELEASE "\(.*\)"/\1/'`
-			LOV=`echo ${UTS_RELEASE}|sed -e "s/${VER}.${PAT}.${SUB}${EXV}//"`
-			KV=${VER}.${PAT}.${SUB}${EXV}${LOV}
-		else
-			LCV=`grep ^CONFIG_LOCALVERSION= ${KERNEL_DIR}/.config | sed -r -e "s/.*=\"(.*)\"/\1/"`
-			KV=${VER}.${PAT}.${SUB}${EXV}${LCV}
 		fi
+		LOV=`grep ^CONFIG_LOCALVERSION= "${future_config}" | sed -r -e "s/.*=\"(.*)\"/\1/"`
+		KV=${VER}.${PAT}.${SUB}${EXV}${LOV}
 	fi
 }
 
@@ -135,6 +127,7 @@ determine_real_args() {
 	BUSYBOX_BINCACHE=`cache_replace "${BUSYBOX_BINCACHE}"`
 	DEVICE_MAPPER_BINCACHE=`cache_replace "${DEVICE_MAPPER_BINCACHE}"`
 	LVM_BINCACHE=`cache_replace "${LVM_BINCACHE}"`
+	MDADM_BINCACHE=`cache_replace "${MDADM_BINCACHE}"`
 	DMRAID_BINCACHE=`cache_replace "${DMRAID_BINCACHE}"`
 	ISCSI_BINCACHE=`cache_replace "${ISCSI_BINCACHE}"`
 	BLKID_BINCACHE=`cache_replace "${BLKID_BINCACHE}"`
@@ -147,6 +140,7 @@ determine_real_args() {
 	BUSYBOX_BINCACHE=`arch_replace "${BUSYBOX_BINCACHE}"`
 	DEVICE_MAPPER_BINCACHE=`arch_replace "${DEVICE_MAPPER_BINCACHE}"`
 	LVM_BINCACHE=`arch_replace "${LVM_BINCACHE}"`
+	MDADM_BINCACHE=`arch_replace "${MDADM_BINCACHE}"`
 	DMRAID_BINCACHE=`arch_replace "${DMRAID_BINCACHE}"`
 	ISCSI_BINCACHE=`arch_replace "${ISCSI_BINCACHE}"`
 	BLKID_BINCACHE=`arch_replace "${BLKID_BINCACHE}"`

gen_initramfs.sh

@@ -339,10 +339,23 @@ append_mdadm(){
 	fi
 	cd ${TEMP}
 	mkdir -p "${TEMP}/initramfs-mdadm-temp/etc/"
+	mkdir -p "${TEMP}/initramfs-mdadm-temp/sbin/"
 	if [ "${MDADM}" = '1' ]
 	then
 		cp -a /etc/mdadm.conf "${TEMP}/initramfs-mdadm-temp/etc" \
 			|| gen_die "Could not copy mdadm.conf!"
+		if [ -e '/sbin/mdadm' ] && LC_ALL="C" ldd /sbin/mdadm | grep -q 'not a dynamic executable' \
+		&& [ -e '/sbin/mdmon' ] && LC_ALL="C" ldd /sbin/mdmon | grep -q 'not a dynamic executable'
+		then
+			print_info 1 '		MDADM: Adding support (using local static binaries /sbin/mdadm and /sbin/mdmon)...'
+			cp /sbin/mdadm /sbin/mdmon "${TEMP}/initramfs-mdadm-temp/sbin/mdadm" ||
+				gen_die 'Could not copy over mdadm!'
+		else
+			print_info 1 '		MDADM: Adding support (compiling binaries)...'
+			compile_mdadm
+			/bin/tar -jxpf "${MDADM_BINCACHE}" -C "${TEMP}/initramfs-mdadm-temp" ||
+				gen_die "Could not extract mdadm binary cache!";
+		fi
 	fi
 	cd "${TEMP}/initramfs-mdadm-temp/"
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \

genkernel.conf

@@ -70,7 +70,8 @@ USECOLOR="yes"
 # If included, busybox is rebuilt if the cached copy is out of date.
 # BUSYBOX="yes"
 
-# Copy /etc/mdadm.conf to initramfs.
+# Copy /etc/mdadm.conf, mdadm/mdmon binaries to initramfs.
+# Without sys-fs/mdadm[static] installed, this will build a static mdadm.
 # MDADM="no"
 
 # Add Multipath support.
@@ -169,6 +170,11 @@ LVM_DIR="LVM2.${LVM_VER}"
 LVM_SRCTAR="${DISTDIR}/LVM2.${LVM_VER}.tgz"
 LVM_BINCACHE="%%CACHE%%/LVM2.${LVM_VER}-%%ARCH%%.tar.bz2"
 
+MDADM_VER="VERSION_MDADM"
+MDADM_DIR="mdadm-${MDADM_VER}"
+MDADM_SRCTAR="${DISTDIR}/mdadm-${MDADM_VER}.tar.bz2"
+MDADM_BINCACHE="%%CACHE%%/mdadm-${MDADM_VER}-%%ARCH%%.tar.bz2"
+
 DMRAID_VER="VERSION_DMRAID"
 DMRAID_DIR="dmraid/${DMRAID_VER}"
 DMRAID_SRCTAR="${DISTDIR}/dmraid-${DMRAID_VER}.tar.bz2"

maintenance/docmatcher.py

@@ -15,12 +15,15 @@ NON_VARIABLES = ('UTF', 'USE', 'TCP', 'SMP', 'PXE', 'PPC', 'MAC',
 	'GRP', 'DOCTYPE', 'DHCP', 'DEFAULT', 'ATARAID', 'APPEND')
 
 EXTRA_VARIABLES = ['ARCH_OVERRIDE', 'BOOTLOADER', 'CLEAR_CACHE_DIR', 'DEFAULT_KERNEL_SOURCE', 'DISTDIR', 'GK_SHARE', 'BUSYBOX_APPLETS']
-for app in ('DEVICE_MAPPER', 'UNIONFS_FUSE', 'BUSYBOX', 'DMRAID', 'LVM', 'ISCSI', 'FUSE', 'GPG'):
+for app in ('DEVICE_MAPPER', 'UNIONFS_FUSE', 'BUSYBOX', 'DMRAID', 'LVM', 'ISCSI', 'FUSE', 'GPG', 'MDADM'):
 	for prop in ('DIR', 'SRCTAR', 'VER'):
 		EXTRA_VARIABLES.append('%s_%s' % (app, prop))
 EXTRA_VARIABLES = tuple(EXTRA_VARIABLES)
 
 IGNORE_OPTIONS = ('help', 'version')
+_GPG_PARAMETERS = ('encrypt', 'symmetric')
+IGNORE_PARAMETERS = _GPG_PARAMETERS
+DEPRECATED_PARAMETERS = ('lvm2', 'evms2', 'gensplash', 'gensplash-res')
 
 
 def exract_gen_cmdline_sh():
@@ -55,6 +58,8 @@ def exract_gen_cmdline_sh():
 		para_name = match.group(1)
 		if para_name in IGNORE_OPTIONS:
 			continue
+		if para_name in DEPRECATED_PARAMETERS:
+			continue
 		gen_cmdline_sh_parsing_long_params.add(para_name)
 
 	gen_cmdline_sh_variables = set()
@@ -96,6 +101,9 @@ def extract_genkernel_8_txt():
 		if para_name == 'no-':
 			continue
 
+		if para_name in IGNORE_PARAMETERS:
+			continue
+
 		m = yes_no.match(para_name)
 		if m:
 			p_yes = m.group(2)
@@ -244,21 +252,21 @@ def main():
 
 
 	# Future work (due extensions)
-	print('Options missing from the *man page*:')
+	print('Variables missing from *web page*:')
-	print_set(gen_cmdline_sh_parsing_long_params.difference(genkernel_8_txt_long_params))
+	print_set(known_variales.difference(genkernel_xml_variables))
-
-	print('Options missing from *--help*:')
-	print_set(gen_cmdline_sh_parsing_long_params.difference(gen_cmdline_sh_usage_long_params))
 
 	print('Options missing from *web page*:')
 	print_set(gen_cmdline_sh_parsing_long_params.difference(genkernel_xml_long_params))
 
-	print('Variables missing from *web page*:')
-	print_set(known_variales.difference(genkernel_xml_variables))
-
 	print('Variables missing from *genkernel.conf*:')
 	print_set(known_variales.difference(genkernel_conf_variables))
 
+	print('Options missing from the *man page*:')
+	print_set(gen_cmdline_sh_parsing_long_params.difference(genkernel_8_txt_long_params))
+
+	print('Options missing from *--help*:')
+	print_set(gen_cmdline_sh_parsing_long_params.difference(gen_cmdline_sh_usage_long_params))
+
 
 	# Future work (due removal and updates)
 	print('Removed options still mentioned in the *man page*:')

patches/busybox/1.18.1/README

@@ -1,8 +1,3 @@
-1.18.1-mdadm.diff:
-This adds a minimal mdadm implementation to busybox for scanning for and
-activating mdraid arrays. You can blame robbat2 for this one :)
-Patch ported from 1.7.4 to 1.18.1 by Denis Kaganovich.
-
 1.18.1-mdstart.diff:
 This adds a 'mdstart' command to busybox, which is used for the activation of
 individual mdraid arrays. It originated with 1.1.3+gentoo or earlier.

patches/busybox/1.7.4/README

@@ -2,10 +2,6 @@
 This patch adds support for the -t option to the 'read' command in ash. It's
 used for prompting for the keymap. It originated with 1.1.3+gentoo or earlier.
 
-1.7.4-mdadm.diff:
-This adds a minimal mdadm implementation to busybox for scanning for and
-activating mdraid arrays. You can blame robbat2 for this one :)
-
 1.7.4-mdstart.diff:
 This adds a 'mdstart' command to busybox, which is used for the activation of
 individual mdraid arrays. It originated with 1.1.3+gentoo or earlier.