denes
/
genkernel_fork
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch experimental using --no-ff

Browse Source
cleanup-cruft
Sebastian Pipping 14 years ago
parent 50f20720f9 dca5432961
commit 3261a50884
21 changed files with 62 additions and 26 deletions
Show Stats Download Patch File Download Diff File

14
ChangeLog
Unescape View File

@ -5,6 +5,20 @@
# Distributed under the GPL v2
# $Id$
16 Mar 2011; Fabio Erculiani <lxnay@sabayon.org> **/modules_load:
Add btrfs to MODULES_FS
07 Mar 2011; Peter Hjalmarsson <xake@rymdraket.net> defaults/initrd.scripts:
Fix typo where the kernelcmd version "dokeymap" was added to MY_HWOPTS
instead of the HWOPTS version "keymap".
Broke setups where only "keymap=<...>" was added to kernelcmd (bug #356167)
24 Feb 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog:
Fix handling of mdadm.conf (bug #354809)
Special thanks:
- Peter Hjalmarsson
10 Feb 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
Bump version to 3.4.13

2
arch/alpha/modules_load
Unescape View File

@ -25,5 +25,5 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
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 reiserfs jfs nfs xfs fuse"
MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs fuse"

2
arch/arm/modules_load
Unescape View File

@ -22,5 +22,5 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
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 reiserfs jfs nfs xfs fuse"
MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs fuse"

2
arch/ia64/modules_load
Unescape View File

@ -25,4 +25,4 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
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 reiserfs jfs nfs xfs fuse"
MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs fuse"

2
arch/mips/modules_load
Unescape View File

@ -25,5 +25,5 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
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 reiserfs jfs nfs xfs fuse"
MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs fuse"

2
arch/parisc/modules_load
Unescape View File

@ -25,5 +25,5 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
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 reiserfs jfs nfs xfs fuse"
MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs fuse"

2
arch/parisc64/modules_load
Unescape View File

@ -25,4 +25,4 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
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 reiserfs jfs nfs xfs fuse"
MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs fuse"

2
arch/ppc/modules_load
Unescape View File

@ -25,5 +25,5 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
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 reiserfs jfs nfs xfs fuse"
MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs fuse"

2
arch/ppc64/modules_load
Unescape View File

@ -25,4 +25,4 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
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 reiserfs jfs nfs xfs fuse"
MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs fuse"

2
arch/sparc/modules_load
Unescape View File

@ -25,5 +25,5 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
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 reiserfs jfs nfs xfs fuse"
MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs fuse"

2
arch/sparc64/modules_load
Unescape View File

@ -25,4 +25,4 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
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 reiserfs jfs nfs xfs fuse"
MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs fuse"

2
arch/um/modules_load
Unescape View File

@ -25,5 +25,5 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
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 reiserfs jfs nfs xfs fuse"
MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs fuse"

2
arch/x86/modules_load
Unescape View File

@ -26,5 +26,5 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
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 reiserfs jfs nfs xfs fuse"
MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs fuse"

2
arch/x86_64/modules_load
Unescape View File

@ -25,4 +25,4 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
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 reiserfs jfs nfs xfs fuse"
MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs fuse"

7
defaults/initrd.scripts
Unescape View File

@ -466,7 +466,7 @@ cmdline_hwopts() {
fi
if [ "$(echo ${y} | cut -b -7)" = "keymap=" ]
then
MY_HWOPTS="${MY_HWOPTS} dokeymap"
MY_HWOPTS="${MY_HWOPTS} keymap"
fi
done
done
@ -621,11 +621,6 @@ startVolumes() {
if [ "${USE_MDADM}" = '1' ]
then
if [ ! -e '/etc/mdadm.conf' ]
then
echo "DEVICE /dev/sd[a-z]* /dev/hd[a-z]*" >/etc/mdadm.conf
/sbin/mdadm --examine --scan >>/etc/mdadm.conf
fi
/sbin/mdadm --assemble --scan
fi

2
defaults/modules_load
Unescape View File

@ -25,5 +25,5 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide
MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
# Filesystems
MODULES_FS="ext2 ext3 ext4 reiserfs jfs nfs xfs fuse"
MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs fuse"

9
doc/genkernel.8.txt
Unescape View File

@ -246,11 +246,16 @@ INITIALIZATION
exist.
*--mdadm*::
Copy '/etc/mdadm.conf' and mdadm/mdmon binaries to initramfs.
Include mdadm/mdmon support.
Without sys-fs/mdadm[static] installed, this will compile mdadm for you.
*--mdadm-config*=<file>::
Use <file> as configfile for MDADM.
By default the ramdisk will be built *without* an mdadm.conf and
will auto-detect arrays during boot-up.
*--dmraid*::
Add DMRAID support.
Include DMRAID support.
*--multipath*::
Include Multipath support

7
gen_cmdline.sh
Unescape View File

@ -79,7 +79,8 @@ longusage() {
echo " --> 'emerge evms' in the host operating system"
echo " first"
echo " --lvm Include LVM support"
echo " --mdadm Copy /etc/mdadm.conf to initramfs"
echo " --mdadm Include MDADM/MDMON support"
echo " --mdadm-config=<file> Use file as mdadm.conf in initramfs"
echo " --dmraid Include DMRAID support"
echo " --multipath Include Multipath support"
echo " --iscsi Include iSCSI support"
@ -248,6 +249,10 @@ parse_cmdline() {
CMD_MDADM=1
print_info 2 "CMD_MDADM: $CMD_MDADM"
;;
--mdadm-config=*)
CMD_MDADM_CONFIG=`parse_opt "$*"`
print_info 2 "CMD_MDADM_CONFIG: $CMD_MDADM_CONFIG"
;;
--no-busybox)
CMD_BUSYBOX=0
print_info 2 "CMD_BUSYBOX: ${CMD_BUSYBOX}"

1
gen_determineargs.sh
Unescape View File

@ -119,6 +119,7 @@ determine_real_args() {
set_config_with_override 1 LUKS CMD_LUKS
set_config_with_override 1 GPG CMD_GPG
set_config_with_override 1 MDADM CMD_MDADM
set_config_with_override 2 MDADM_CONFIG CMD_MDADM_CONFIG
set_config_with_override 1 MULTIPATH CMD_MULTIPATH
set_config_with_override 1 FIRMWARE CMD_FIRMWARE
set_config_with_override 2 FIRMWARE_DIR CMD_FIRMWARE_DIR "/lib/firmware"

15
gen_initramfs.sh
Unescape View File

@ -342,8 +342,19 @@ append_mdadm(){
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 [ -n "${MDADM_CONFIG}" ]
then
if [ -f "${MDADM_CONFIG}" ]
then
cp -a "${MDADM_CONFIG}" "${TEMP}/initramfs-mdadm-temp/etc/mdadm.conf" \
|| gen_die "Could not copy mdadm.conf!"
else
gen_die '${MDADM_CONFIG} does not exist!'
fi
else
print_info 1 ' MDADM: Skipping inclusion of mdadm.conf'
fi
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

7
genkernel.conf
Unescape View File

@ -70,10 +70,15 @@ USECOLOR="yes"
# If included, busybox is rebuilt if the cached copy is out of date.
# BUSYBOX="yes"
# Copy /etc/mdadm.conf, mdadm/mdmon binaries to initramfs.
# Includes mdadm/mdmon binaries in initramfs.
# Without sys-fs/mdadm[static] installed, this will build a static mdadm.
# MDADM="no"
# Specify a custom mdadm.conf.
# By default the ramdisk will be built *without* an mdadm.conf and will auto-detect
# arrays during bootup. Usually, this should not be needed.
# MDADM_CONFIG="/etc/mdadm.conf"
# Add Multipath support.
# MULTIPATH="no"

Write Preview
Loading…
Cancel
Save