From: Robin H. Johnson Date: Sat, 10 Mar 2012 21:23:28 +0000 (-0800) Subject: Merge remote-tracking branch 'origin/bug-405495' X-Git-Tag: v3.4.25~1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4a3e1ff1cfae09860b87b04fa9f315326910a465;p=genkernel.git Merge remote-tracking branch 'origin/bug-405495' Conflicts: ChangeLog arch/x86_64/modules_load --- 4a3e1ff1cfae09860b87b04fa9f315326910a465 diff --cc ChangeLog index 4d9f866,11b18a4..73f8a9a --- a/ChangeLog +++ b/ChangeLog @@@ -4,98 -4,12 +4,103 @@@ # - 2008-2011 Various authors (see AUTHORS) # Distributed under the GPL v2 # $Id$ - ++ + 25 Feb 2012; Sebastian Pipping arch/x86/modules_load, + arch/x86_64/modules_load, defaults/modules_load: + Make sure the sha256 module makes it into the initramfs (bug #405495). + Reported by Ogelpre. + 20 Feb 2012; Robin H. Johnson defaults/linuxrc: + With the new /usr mounting, if the device path that ends up in /proc/mounts + ends up being different than in /etc/fstab due to symlinks, mount -a will + always exit 32. Avoid by resolving symlinks like util-linux does. + + 14 Feb 2012; Robin H. Johnson gen_compile.sh, + gen_initramfs.sh: + dmraid is entirely broken if you try to use the system static + LVM/device-mapper. Instead start always building LVM2 for the initramfs, + using DESTDIR for cleaner install. Dead code paths for old LVM2 build not + removed yet until more users have tested. + + 12 Feb 2012; Robin H. Johnson gen_compile.sh: + More UTILS_CROSS_COMPILE prefix on strip calls. + + 12 Feb 2012; Robin H. Johnson arch/alpha/modules_load, + arch/arm/modules_load, arch/ia64/modules_load, arch/mips/modules_load, + arch/parisc/modules_load, arch/parisc64/modules_load, arch/ppc/modules_load, + arch/ppc64/modules_load, arch/sparc/modules_load, arch/sparc64/modules_load, + arch/um/modules_load, arch/x86/modules_load, arch/x86_64/modules_load, + defaults/modules_load: + Bug #401583: include more DM and MD modules for other RAID/LVM + configurations. + + 12 Feb 2012; Robin H. Johnson gen_compile.sh: + Bug #265005: ensure CROSS_COMPILE is set for cross-compile strip calls to + work. + + 12 Feb 2012; Robin H. Johnson + +patches/dmraid/dmraid-1.0.0_rc16-as-needed2.patch, + +patches/dmraid/dmraid-1.0.0_rc16-return-all-sets.patch, + +patches/dmraid/dmraid-1.0.0_rc16-static-build-fixes.patch, + +patches/dmraid/dmraid-1.0.0_rc16-undo-p-rename.patch, + +patches/dmraid/dmraid-1.0.0.rc16-3-staticlink.patch, genkernel.conf: + Bug #398467: Update dmraid. Also add other patches from Portage tree. + + 12 Feb 2012; Robin H. Johnson gen_cmdline.sh, + gen_compile.sh, gen_determineargs.sh, gen_funcs.sh, genkernel.conf: + device-mapper "update". It was merged into LVM2-2.02.67 upstream in 2010. + Bug #398467 is wrong for the device-mapper update. + + 09 Feb 2012; Robin H. Johnson defaults/initrd.scripts, + defaults/linuxrc: + Dogfooding of the /usr mount code with the matching OpenRC change to make the + mounts RW revealed some bugs and gotchas in our prior code, now fixed and + verified to work. + + 06 Feb 2012; Robin H. Johnson arch/alpha/config.sh, + arch/arm/config.sh, arch/ia64/config.sh, arch/mips/config.sh, + arch/parisc/config.sh, arch/parisc64/config.sh, arch/ppc/config.sh, + arch/ppc64/config.sh, arch/sparc/config.sh, arch/sparc64/config.sh, + arch/um/config.sh, arch/x86/config.sh, arch/x86_64/config.sh: + Ensure default for new initramfs compression is used. + + 06 Feb 2012; Robin H. Johnson gen_initramfs.sh: + Bugfixes in new code branches that I didn't test fully. + + 06 Feb 2012; Robin H. Johnson doc/genkernel.8.txt, + gen_cmdline.sh: + Update documentation for new initramfs compression. + + 06 Feb 2012; Robin H. Johnson defaults/config.sh, + gen_cmdline.sh, gen_determineargs.sh, gen_initramfs.sh, genkernel.conf: + Import customizable compression for initramfs, based on Pentoo development. + + 06 Feb 2012: Richard Yao arch/alpha/modules_load, + arch/arm/modules_load, arch/ia64/modules_load, arch/mips/modules_load, + arch/parisc/modules_load, arch/parisc64/modules_load, arch/ppc/modules_load, + arch/ppc64/modules_load, arch/sparc/modules_load, arch/sparc64/modules_load, + arch/um/modules_load, arch/x86/modules_load, arch/x86_64/modules_load, + defaults/busy-config, defaults/initrd.scripts, defaults/linuxrc, + defaults/modules_load, doc/genkernel.8.txt, gen_cmdline.sh, + gen_determineargs.sh, gen_initramfs.sh, genkernel: + This provides ZFS support, to go with the sys-fs/zfs package. + + 06 Feb 2012; Robin H. Johnson gen_initramfs.sh: + Refactor copy_binaries and multipath slightly for ease of usage and readability. + + 06 Feb 2012: Richard Yao gen_initramfs.sh: + Refactor multipath initramfs generation using copy_binaries. + + 06 Feb 2012: Richard Yao gen_initramfs.sh: + copy_binaries utility function for putting binaries and librares into + initramfs (see git commit for full details). + + 06 Feb 2012; Robin H. Johnson defaults/initrd.scripts: + Support virtio devices, and provide fallback of all remaining devices. + + 03 Feb 2012; Sebastian Pipping defaults/initrd.scripts: + Support SD card readers. Patch by Rick Farina + 24 Jan 2012; Sebastian Pipping .gitignore, genkernel: Bump version to 3.4.24 diff --cc arch/x86/modules_load index 3e9f5ec,bce80c1..2c023e4 --- a/arch/x86/modules_load +++ b/arch/x86/modules_load @@@ -25,5 -25,7 +25,7 @@@ MODULES_PCMCIA="pcmcia pcmcia_core yent MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-logitech hid-microsoft hid-monterey hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus" # Filesystems -MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs fuse" +MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" + # Crypto + MODULES_CRYPTO="sha256_generic" diff --cc arch/x86_64/modules_load index 4e7d877,7ec2d6e..6d87b80 --- a/arch/x86_64/modules_load +++ b/arch/x86_64/modules_load @@@ -24,4 -24,7 +24,7 @@@ MODULES_PCMCIA="pcmcia pcmcia_core yent MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-logitech hid-microsoft hid-monterey hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus" # Filesystems -MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs fuse" +MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" + + # Crypto + MODULES_CRYPTO="sha256_generic" diff --cc defaults/modules_load index b726242,82db084..7ebd0dd --- a/defaults/modules_load +++ b/defaults/modules_load @@@ -24,5 -24,7 +24,7 @@@ MODULES_PCMCIA="pcmcia pcmcia_core yent MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd" # Filesystems -MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs fuse" +MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" + # Crypto + MODULES_CRYPTO="sha256_generic"