Remove support for sys-fs/evms, as it was removed from Gentoo (bug #372423)

cleanup-cruft
Sebastian Pipping 14 years ago
parent 4a7ccf8b08
commit bf0cad6a30

@ -5,6 +5,17 @@
# Distributed under the GPL v2
# $Id$
03 Jul 2011; Sebastian Pipping <sping@gentoo.org> 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/initrd.defaults, defaults/initrd.scripts, defaults/linuxrc,
defaults/modules_load, doc/genkernel.8.txt, gen_cmdline.sh,
gen_determineargs.sh, gen_initramfs.sh, genkernel, genkernel.conf,
maintenance/docmatcher.py:
Remove support for sys-fs/evms, as it was removed from Gentoo (bug #372423)
22 Jun 2011; Sebastian Pipping <sping@gentoo.org> gen_compile.sh:
Make --arch-override= affect "make menuconfig" (bug #247246)

@ -3,7 +3,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"

@ -3,7 +3,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"

@ -3,7 +3,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"

@ -3,7 +3,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"

@ -3,7 +3,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"

@ -3,7 +3,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"

@ -3,7 +3,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"

@ -3,7 +3,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"

@ -3,7 +3,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"

@ -3,7 +3,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"

@ -3,7 +3,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"

@ -4,7 +4,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"

@ -3,7 +3,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"

@ -79,5 +79,5 @@ DEFAULT_NFSOPTIONS="ro,nolock,rsize=1024,wsize=1024"
# Only sections that are in by default or those that
# are not module groups need to be defined here...
HWOPTS='keymap cache modules pata sata scsi usb firewire waitscan slowusb evms lvm dmraid mdadm fs net'
HWOPTS='keymap cache modules pata sata scsi usb firewire waitscan slowusb lvm dmraid mdadm fs net'
MY_HWOPTS='modules pata sata scsi slowusb usb firewire waitscan dmraid mdadm fs net iscsi'

@ -660,28 +660,10 @@ startVolumes() {
# And finally execute it all (/proc/... needed if lvm is compiled without readline)
good_msg "Scanning for and activating Volume Groups"
printf "%b\n" "${lvm_commands}" | /bin/lvm /proc/self/fd/0
# Disable EVMS since lvm is activated and they dont work together.
if [ "${USE_EVMS_NORMAL}" = '1' ]
then
bad_msg "Disabling EVMS Support because LVM started"
bad_msg "Do not add dolvm to the cmdline if this is not what you want"
bad_msg "LVM and EVMS do not work well together"
USE_EVMS_NORMAL=0
fi
else
bad_msg "vgscan or vgchange not found: skipping LVM volume group activation!"
fi
fi
if [ "${USE_EVMS_NORMAL}" = '1' ]
then
if [ -e '/sbin/evms_activate' ]
then
good_msg "Activating EVMS"
evms_activate
fi
fi
}
startiscsi() {

@ -96,13 +96,6 @@ do
DMRAID_OPTS=`parse_opt "${x}"`
USE_DMRAID_NORMAL=1
;;
doevms)
USE_EVMS_NORMAL=1
;;
doevms2)
bad_msg 'Using doevms2 is deprecated, use doevms, instead.'
USE_EVMS_NORMAL=1
;;
# Debug Options
debug)
DEBUG='yes'

@ -3,7 +3,6 @@
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
MODULES_DMRAID="dm-mod dm-mirror"
MODULES_EVMS="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"
MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr"
MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 raid6 raid10"

@ -236,10 +236,6 @@ INITIALIZATION
*--no-keymap*::
Disables keymap selection at boot.
*--evms*::
Add in EVMS support from static binaries if they exist on the system:
you should run "emerge evms" first (in the host system).
*--lvm*::
Add in LVM support from static binaries if they exist on the
system, or compile static LVM binaries if static ones do not
@ -417,9 +413,6 @@ which the ramdisk scripts would recognize.
location. Otherwise the location will be deduced from the DCHP
request (option root-path)
*doevms*::
Activate EVMS volumes on bootup
*dolvm*::
Activate LVM volumes on bootup

@ -75,9 +75,6 @@ longusage() {
echo " --splash-res=<res> Select splash theme resolutions to install"
echo " --do-keymap-auto Forces keymap selection at boot"
echo " --no-keymap Disables keymap selection support"
echo " --evms Include EVMS support"
echo " --> 'emerge evms' in the host operating system"
echo " first"
echo " --lvm Include LVM support"
echo " --mdadm Include MDADM/MDMON support"
echo " --mdadm-config=<file> Use file as mdadm.conf in initramfs"
@ -224,16 +221,6 @@ parse_cmdline() {
CMD_KEYMAP=0
print_info 2 "CMD_KEYMAP: ${CMD_KEYMAP}"
;;
--evms)
CMD_EVMS=1
print_info 2 "CMD_EVMS: ${CMD_EVMS}"
;;
--evms2)
CMD_EVMS=1
print_info 2 "CMD_EVMS: ${CMD_EVMS}"
echo
print_warning 1 "Please use --evms, as --evms2 is deprecated."
;;
--lvm)
CMD_LVM=1
print_info 2 "CMD_LVM: ${CMD_LVM}"

@ -108,7 +108,6 @@ determine_real_args() {
set_config_with_override STRING INSTALL_MOD_PATH CMD_INSTALL_MOD_PATH
set_config_with_override BOOL OLDCONFIG CMD_OLDCONFIG
set_config_with_override BOOL LVM CMD_LVM
set_config_with_override BOOL EVMS CMD_EVMS
set_config_with_override BOOL DMRAID CMD_DMRAID
set_config_with_override BOOL ISCSI CMD_ISCSI
set_config_with_override BOOL BUSYBOX CMD_BUSYBOX "yes"

@ -279,59 +279,6 @@ append_lvm(){
rm -r "${TEMP}/initramfs-lvm-temp/"
}
append_evms(){
if [ -d "${TEMP}/initramfs-evms-temp" ]
then
rm -r "${TEMP}/initramfs-evms-temp/"
fi
mkdir -p "${TEMP}/initramfs-evms-temp/lib/evms"
mkdir -p "${TEMP}/initramfs-evms-temp/etc/"
mkdir -p "${TEMP}/initramfs-evms-temp/bin/"
mkdir -p "${TEMP}/initramfs-evms-temp/sbin/"
if [ "${EVMS}" = '1' ]
then
print_info 1 ' EVMS: Adding support...'
mkdir -p ${TEMP}/initramfs-evms-temp/lib
cp -a /lib/ld-* "${TEMP}/initramfs-evms-temp/lib" \
|| gen_die 'Could not copy files for EVMS!'
if [ -n "`ls /lib/libgcc_s*`" ]
then
cp -a /lib/libgcc_s* "${TEMP}/initramfs-evms-temp/lib" \
|| gen_die 'Could not copy files for EVMS!'
fi
cp -a /lib/libc-* /lib/libc.* "${TEMP}/initramfs-evms-temp/lib" \
|| gen_die 'Could not copy files for EVMS!'
cp -a /lib/libdl-* /lib/libdl.* "${TEMP}/initramfs-evms-temp/lib" \
|| gen_die 'Could not copy files for EVMS!'
cp -a /lib/libpthread* "${TEMP}/initramfs-evms-temp/lib" \
|| gen_die 'Could not copy files for EVMS!'
cp -a /lib/libuuid*so* "${TEMP}/initramfs-evms-temp/lib" \
|| gen_die 'Could not copy files for EVMS!'
cp -a /lib/libevms*so* "${TEMP}/initramfs-evms-temp/lib" \
|| gen_die 'Could not copy files for EVMS!'
cp -a /lib/evms "${TEMP}/initramfs-evms-temp/lib" \
|| gen_die 'Could not copy files for EVMS!'
cp -a /lib/evms/* "${TEMP}/initramfs-evms-temp/lib/evms" \
|| gen_die 'Could not copy files for EVMS!'
cp -a /etc/evms.conf "${TEMP}/initramfs-evms-temp/etc" \
|| gen_die 'Could not copy files for EVMS!'
cp /sbin/evms_activate "${TEMP}/initramfs-evms-temp/sbin" \
|| gen_die 'Could not copy over evms_activate!'
# Fix EVMS complaining that it can't find the swap utilities.
# These are not required in the initramfs
for swap_libs in "${TEMP}/initramfs-evms-temp/lib/evms/*/swap*.so"
do
rm ${swap_libs}
done
fi
cd "${TEMP}/initramfs-evms-temp/"
find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
|| gen_die "compressing evms cpio"
cd "${TEMP}"
rm -r "${TEMP}/initramfs-evms-temp/"
}
append_mdadm(){
if [ -d "${TEMP}/initramfs-mdadm-temp" ]
then
@ -676,7 +623,6 @@ create_initramfs() {
append_data 'lvm' "${LVM}"
append_data 'dmraid' "${DMRAID}"
append_data 'iscsi' "${ISCSI}"
append_data 'evms' "${EVMS}"
append_data 'mdadm' "${MDADM}"
append_data 'luks' "${LUKS}"
append_data 'multipath' "${MULTIPATH}"

@ -348,7 +348,6 @@ then
print_warning 1 'Additional kernel cmdline arguments that *may* be required to boot properly...'
[ "${SPLASH}" = '1' ] && print_warning 1 "add \"vga=791 splash=silent,theme:${SPLASH_THEME} console=tty1 quiet\" if you use a splash framebuffer ]"
[ "${LVM}" = '1' ] && print_warning 1 'add "dolvm" for lvm support'
[ "${EVMS}" = '1' ] && print_warning 1 'add "doevms" for evms support'
[ "${DMRAID}" = '1' ] && print_warning 1 'add "dodmraid" for dmraid support'
[ "${MDADM}" = '1' ] && print_warning 1 'add "domdadm" for RAID support'
[ "${DMRAID}" = '1' ] && print_warning 1 ' or "dodmraid=<additional options>"'

@ -62,10 +62,6 @@ USECOLOR="yes"
# Add in GnuPG support
# GPG="no"
# Add in EVMS support from static binaries if they exist on the system: you
# should run "emerge evms" first.
# EVMS="no"
# Add DMRAID support.
# DMRAID="no"

@ -27,7 +27,7 @@ EXTRA_VARIABLES = tuple(EXTRA_VARIABLES)
IGNORE_OPTIONS = ('help', 'version')
_GPG_PARAMETERS = ('symmetric', )
IGNORE_PARAMETERS = _GPG_PARAMETERS
DEPRECATED_PARAMETERS = ('lvm2', 'evms2', 'gensplash', 'gensplash-res')
DEPRECATED_PARAMETERS = ('lvm2', 'gensplash', 'gensplash-res')
def exract_gen_cmdline_sh():

Loading…
Cancel
Save