enable CONFIG_INSMOD in all arch busy-config files

disable building of static insmod and remove all code related to it

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@521 67a159dc-881f-0410-a524-ba9dfbe2cb84
cleanup-cruft
Andrew Gaffney 18 years ago
parent 8befa2ea18
commit 1bdb11467f

@ -2,6 +2,15 @@
# Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
# $Header: $ # $Header: $
26 Jul 2007; Andrew Gaffney <agaffney@gentoo.org> alpha/busy-config,
gen_compile.sh, gen_determineargs.sh, gen_initramfs.sh, gen_initrd.sh,
genkernel, genkernel.conf, ia64/busy-config, mips/busy-config,
parisc/busy-config, parisc64/busy-config, ppc/busy-config,
ppc64/busy-config, sparc/busy-config, sparc64/busy-config,
x86/busy-config, x86_64/busy-config, xen0/busy-config, xenU/busy-config:
enable CONFIG_INSMOD in all arch busy-config files
disable building of static insmod and remove all code related to it
26 Jul 2007; Andrew Gaffney <agaffney@gentoo.org> gen_package.sh: 26 Jul 2007; Andrew Gaffney <agaffney@gentoo.org> gen_package.sh:
Patch to compare new config instead of the one left laying around in the Patch to compare new config instead of the one left laying around in the
kerncache dir. Thanks to Pat Double <gentoo@patdouble.com> in bug #179739 kerncache dir. Thanks to Pat Double <gentoo@patdouble.com> in bug #179739

@ -327,7 +327,7 @@ CONFIG_FINDFS=y
# #
# Linux Module Utilities # Linux Module Utilities
# #
# CONFIG_INSMOD is not set CONFIG_INSMOD=y
# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set

@ -593,114 +593,6 @@ compile_suspend() {
rm -rf bincache suspend-0.5 rm -rf bincache suspend-0.5
} }
compile_modutils() {
# I've disabled dietlibc support for the time being since the
# version we use misses a few needed system calls.
local ARGS
if [ ! -f "${MODUTILS_BINCACHE}" ]
then
[ ! -f "${MODUTILS_SRCTAR}" ] &&
gen_die "Could not find modutils source tarball: ${MODUTILS_SRCTAR}!"
cd "${TEMP}"
rm -rf "${MODUTILS_DIR}"
/bin/tar -jxpf "${MODUTILS_SRCTAR}"
[ ! -d "${MODUTILS_DIR}" ] &&
gen_die "Modutils directory ${MODUTILS_DIR} invalid!"
cd "${MODUTILS_DIR}"
print_info 1 "modutils: >> Configuring..."
# if [ "${USE_DIETLIBC}" -eq '1' ]
# then
# extract_dietlibc_bincache
# OLD_CC="${UTILS_CC}"
# UTILS_CC="${TEMP}/diet/bin/diet ${UTILS_CC}"
# fi
export_utils_args
export ARCH=${ARCH}
./configure --disable-combined --enable-insmod-static >> ${DEBUGFILE} 2>&1 ||
gen_die 'Configuring modutils failed!'
unset_utils_args
print_info 1 'modutils: >> Compiling...'
compile_generic all utils
# if [ "${USE_DIETLIBC}" -eq '1' ]
# then
# clean_dietlibc_bincache
# UTILS_CC="${OLD_CC}"
# fi
print_info 1 'modutils: >> Copying to cache...'
[ -f "${TEMP}/${MODUTILS_DIR}/insmod/insmod.static" ] ||
gen_die 'insmod.static does not exist after the compilation of modutils!'
strip "${TEMP}/${MODUTILS_DIR}/insmod/insmod.static" ||
gen_die 'Could not strip insmod.static!'
bzip2 "${TEMP}/${MODUTILS_DIR}/insmod/insmod.static" ||
gen_die 'Compression of insmod.static failed!'
mv "${TEMP}/${MODUTILS_DIR}/insmod/insmod.static.bz2" "${MODUTILS_BINCACHE}" ||
gen_die 'Could not move the compressed insmod binary to the package cache!'
cd "${TEMP}"
rm -rf "${MODULE_INIT_TOOLS_DIR}" > /dev/null
fi
}
compile_module_init_tools() {
# I've disabled dietlibc support for the time being since the
# version we use misses a few needed system calls.
local ARGS
if [ ! -f "${MODULE_INIT_TOOLS_BINCACHE}" ]
then
[ ! -f "${MODULE_INIT_TOOLS_SRCTAR}" ] &&
gen_die "Could not find module-init-tools source tarball: ${MODULE_INIT_TOOLS_SRCTAR}"
cd "${TEMP}"
rm -rf "${MODULE_INIT_TOOLS_DIR}"
/bin/tar -jxpf "${MODULE_INIT_TOOLS_SRCTAR}"
[ ! -d "${MODULE_INIT_TOOLS_DIR}" ] &&
gen_die "Module-init-tools directory ${MODULE_INIT_TOOLS_DIR} is invalid"
cd "${MODULE_INIT_TOOLS_DIR}"
print_info 1 'module-init-tools: >> Configuring'
# if [ "${USE_DIETLIBC}" -eq '1' ]
# then
# extract_dietlibc_bincache
# OLD_CC="${UTILS_CC}"
# UTILS_CC="${TEMP}/diet/bin/diet ${UTILS_CC}"
# fi
export_utils_args
./configure >> ${DEBUGFILE} 2>&1 ||
gen_die 'Configure of module-init-tools failed!'
unset_utils_args
print_info 1 ' >> Compiling...'
compile_generic "all" utils
# if [ "${USE_DIETLIBC}" -eq '1' ]
# then
# clean_dietlibc_bincache
# UTILS_CC="${OLD_CC}"
# fi
print_info 1 ' >> Copying to cache...'
[ -f "${TEMP}/${MODULE_INIT_TOOLS_DIR}/insmod.static" ] ||
gen_die 'insmod.static does not exist after the compilation of module-init-tools!'
strip "${TEMP}/${MODULE_INIT_TOOLS_DIR}/insmod.static" ||
gen_die 'Could not strip insmod.static!'
bzip2 "${TEMP}/${MODULE_INIT_TOOLS_DIR}/insmod.static" ||
gen_die 'Compression of insmod.static failed!'
[ -f "${TEMP}/${MODULE_INIT_TOOLS_DIR}/insmod.static.bz2" ] ||
gen_die 'Could not find compressed insmod.static.bz2 binary!'
mv "${TEMP}/${MODULE_INIT_TOOLS_DIR}/insmod.static.bz2" "${MODULE_INIT_TOOLS_BINCACHE}" ||
gen_die 'Could not move the compressed insmod binary to the package cache!'
cd "${TEMP}"
rm -rf "${MODULE_INIT_TOOLS_DIR}" > /dev/null
fi
}
compile_devfsd() { compile_devfsd() {
# I've disabled dietlibc support for the time being since the # I've disabled dietlibc support for the time being since the
# version we use misses a few needed system calls. # version we use misses a few needed system calls.

@ -197,8 +197,6 @@ determine_real_args() {
CACHE_DIR=`arch_replace "${CACHE_DIR}"` CACHE_DIR=`arch_replace "${CACHE_DIR}"`
BUSYBOX_BINCACHE=`cache_replace "${BUSYBOX_BINCACHE}"` BUSYBOX_BINCACHE=`cache_replace "${BUSYBOX_BINCACHE}"`
MODULE_INIT_TOOLS_BINCACHE=`cache_replace "${MODULE_INIT_TOOLS_BINCACHE}"`
MODUTILS_BINCACHE=`cache_replace "${MODUTILS_BINCACHE}"`
DIETLIBC_BINCACHE=`cache_replace "${DIETLIBC_BINCACHE}"` DIETLIBC_BINCACHE=`cache_replace "${DIETLIBC_BINCACHE}"`
DIETLIBC_BINCACHE_TEMP=`cache_replace "${DIETLIBC_BINCACHE_TEMP}"` DIETLIBC_BINCACHE_TEMP=`cache_replace "${DIETLIBC_BINCACHE_TEMP}"`
DEVFSD_BINCACHE=`cache_replace "${DEVFSD_BINCACHE}"` DEVFSD_BINCACHE=`cache_replace "${DEVFSD_BINCACHE}"`
@ -216,8 +214,6 @@ determine_real_args() {
DEFAULT_KERNEL_CONFIG=`arch_replace "${DEFAULT_KERNEL_CONFIG}"` DEFAULT_KERNEL_CONFIG=`arch_replace "${DEFAULT_KERNEL_CONFIG}"`
BUSYBOX_CONFIG=`arch_replace "${BUSYBOX_CONFIG}"` BUSYBOX_CONFIG=`arch_replace "${BUSYBOX_CONFIG}"`
BUSYBOX_BINCACHE=`arch_replace "${BUSYBOX_BINCACHE}"` BUSYBOX_BINCACHE=`arch_replace "${BUSYBOX_BINCACHE}"`
MODULE_INIT_TOOLS_BINCACHE=`arch_replace "${MODULE_INIT_TOOLS_BINCACHE}"`
MODUTILS_BINCACHE=`arch_replace "${MODUTILS_BINCACHE}"`
DIETLIBC_BINCACHE=`arch_replace "${DIETLIBC_BINCACHE}"` DIETLIBC_BINCACHE=`arch_replace "${DIETLIBC_BINCACHE}"`
DIETLIBC_BINCACHE_TEMP=`arch_replace "${DIETLIBC_BINCACHE_TEMP}"` DIETLIBC_BINCACHE_TEMP=`arch_replace "${DIETLIBC_BINCACHE_TEMP}"`
DEVFSD_BINCACHE=`arch_replace "${DEVFSD_BINCACHE}"` DEVFSD_BINCACHE=`arch_replace "${DEVFSD_BINCACHE}"`

@ -72,25 +72,6 @@ append_busybox() {
rm -rf "${TEMP}/initramfs-busybox-temp" > /dev/null rm -rf "${TEMP}/initramfs-busybox-temp" > /dev/null
} }
append_insmod() {
if [ -d "${TEMP}/initramfs-insmod-temp" ]
then
rm -rf "${TEMP}/initramfs-insmod-temp" > /dev/null
fi
mkdir -p "${TEMP}/initramfs-insmod-temp/bin/"
cp "${MODULE_INIT_TOOLS_BINCACHE}" "${TEMP}/initramfs-insmod-temp/bin/insmod.static.bz2" ||
gen_die 'Could not copy insmod.static from bincache!'
bunzip2 "${TEMP}/initramfs-insmod-temp/bin/insmod.static.bz2" ||
gen_die 'Could not uncompress insmod.static!'
mv "${TEMP}/initramfs-insmod-temp/bin/insmod.static" "${TEMP}/initramfs-insmod-temp/bin/insmod"
chmod +x "${TEMP}/initramfs-insmod-temp/bin/insmod"
cd "${TEMP}/initramfs-insmod-temp/"
find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"
rm -rf "${TEMP}/initramfs-insmod-temp" > /dev/null
}
append_udev(){ append_udev(){
if [ -d "${TEMP}/initramfs-udev-temp" ] if [ -d "${TEMP}/initramfs-udev-temp" ]
then then
@ -503,7 +484,6 @@ create_initramfs() {
if [ "${NOINITRDMODULES}" = '' ] if [ "${NOINITRDMODULES}" = '' ]
then then
append_data 'insmod'
append_data 'modules' append_data 'modules'
else else
print_info 1 "initramfs: Not copying modules..." print_info 1 "initramfs: Not copying modules..."

@ -86,23 +86,6 @@ create_base_initrd_sys() {
gen_die 'Could not extract busybox bincache!' gen_die 'Could not extract busybox bincache!'
chmod +x "${TEMP}/initrd-temp/bin/busybox" chmod +x "${TEMP}/initrd-temp/bin/busybox"
if [ "${NOINITRDMODULES}" = '' ]
then
if [ "${PAT}" -gt "4" ]
then
cp "${MODULE_INIT_TOOLS_BINCACHE}" "${TEMP}/initrd-temp/bin/insmod.static.bz2" ||
gen_die 'Could not copy insmod.static from bincache!'
else
cp "${MODUTILS_BINCACHE}" "${TEMP}/initrd-temp/bin/insmod.static.bz2" ||
gen_die 'Could not copy insmod.static from bincache'
fi
bunzip2 "${TEMP}/initrd-temp/bin/insmod.static.bz2" ||
gen_die 'Could not uncompress insmod.static!'
mv "${TEMP}/initrd-temp/bin/insmod.static" "${TEMP}/initrd-temp/bin/insmod"
chmod +x "${TEMP}/initrd-temp/bin/insmod"
fi
# devfsd # devfsd
if [ "${DEVFS}" -eq '1' ] if [ "${DEVFS}" -eq '1' ]
then then

@ -288,18 +288,6 @@ fi
if [ "${BUILD_INITRD}" -eq '1' ] if [ "${BUILD_INITRD}" -eq '1' ]
then then
# Only compile insmod if we're installing modules onto the initrd
if [ "${NOINITRDMODULES}" = '' ]
then
if [ "${KERN_24}" != '1' ]
then
# Compile module-init-tools
[ ${BUILD_STATIC} -eq 0 ] && compile_module_init_tools
else
[ ${BUILD_STATIC} -eq 0 ] && compile_modutils
fi
fi
[ "${DISKLABEL}" -eq '1' ] && compile_e2fsprogs [ "${DISKLABEL}" -eq '1' ] && compile_e2fsprogs
if [ "${KERN_24}" != '1' -a "${UDEV}" -eq '1' ] if [ "${KERN_24}" != '1' -a "${UDEV}" -eq '1' ]

@ -92,16 +92,6 @@ BUSYBOX_SRCTAR="${GK_SHARE}/pkg/busybox-${BUSYBOX_VER}.tar.bz2"
# Directory created after busybox tarball is extracted # Directory created after busybox tarball is extracted
BUSYBOX_DIR="busybox-${BUSYBOX_VER}" BUSYBOX_DIR="busybox-${BUSYBOX_VER}"
MODULE_INIT_TOOLS_VER="0.9.15-pre4"
MODULE_INIT_TOOLS_SRCTAR="${GK_SHARE}/pkg/module-init-tools-${MODULE_INIT_TOOLS_VER}.tar.bz2"
MODULE_INIT_TOOLS_DIR="module-init-tools-${MODULE_INIT_TOOLS_VER}"
MODULE_INIT_TOOLS_BINCACHE="%%CACHE%%/insmod-%%ARCH%%-static-2.6.bz2"
MODUTILS_VER="2.4.26"
MODUTILS_SRCTAR="${GK_SHARE}/pkg/modutils-${MODUTILS_VER}.tar.bz2"
MODUTILS_DIR="modutils-${MODUTILS_VER}"
MODUTILS_BINCACHE="%%CACHE%%/insmod-%%ARCH%%-static-2.4.bz2"
DIETLIBC_VER="0.27" DIETLIBC_VER="0.27"
DIETLIBC_SRCTAR="${GK_SHARE}/pkg/dietlibc-${DIETLIBC_VER}.tar.bz2" DIETLIBC_SRCTAR="${GK_SHARE}/pkg/dietlibc-${DIETLIBC_VER}.tar.bz2"
DIETLIBC_DIR="dietlibc-${DIETLIBC_VER}" DIETLIBC_DIR="dietlibc-${DIETLIBC_VER}"

@ -327,7 +327,7 @@ CONFIG_FINDFS=y
# #
# Linux Module Utilities # Linux Module Utilities
# #
# CONFIG_INSMOD is not set CONFIG_INSMOD=y
# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set

@ -327,7 +327,7 @@ CONFIG_MESG=y
# #
# Linux Module Utilities # Linux Module Utilities
# #
# CONFIG_INSMOD is not set CONFIG_INSMOD=y
# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set

@ -327,7 +327,7 @@ CONFIG_FINDFS=y
# #
# Linux Module Utilities # Linux Module Utilities
# #
# CONFIG_INSMOD is not set CONFIG_INSMOD=y
# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set

@ -327,7 +327,7 @@ CONFIG_FINDFS=y
# #
# Linux Module Utilities # Linux Module Utilities
# #
# CONFIG_INSMOD is not set CONFIG_INSMOD=y
# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set

@ -327,7 +327,7 @@ CONFIG_FINDFS=y
# #
# Linux Module Utilities # Linux Module Utilities
# #
# CONFIG_INSMOD is not set CONFIG_INSMOD=y
# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set

@ -327,7 +327,7 @@ CONFIG_FINDFS=y
# #
# Linux Module Utilities # Linux Module Utilities
# #
# CONFIG_INSMOD is not set CONFIG_INSMOD=y
# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set

@ -327,7 +327,7 @@ CONFIG_FINDFS=y
# #
# Linux Module Utilities # Linux Module Utilities
# #
# CONFIG_INSMOD is not set CONFIG_INSMOD=y
# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set

@ -327,7 +327,7 @@ CONFIG_FINDFS=y
# #
# Linux Module Utilities # Linux Module Utilities
# #
# CONFIG_INSMOD is not set CONFIG_INSMOD=y
# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set

@ -327,7 +327,7 @@ CONFIG_FINDFS=y
# #
# Linux Module Utilities # Linux Module Utilities
# #
# CONFIG_INSMOD is not set CONFIG_INSMOD=y
# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set

@ -327,7 +327,7 @@ CONFIG_FINDFS=y
# #
# Linux Module Utilities # Linux Module Utilities
# #
# CONFIG_INSMOD is not set CONFIG_INSMOD=y
# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set

@ -327,7 +327,7 @@ CONFIG_FINDFS=y
# #
# Linux Module Utilities # Linux Module Utilities
# #
# CONFIG_INSMOD is not set CONFIG_INSMOD=y
# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set

@ -327,7 +327,7 @@ CONFIG_FINDFS=y
# #
# Linux Module Utilities # Linux Module Utilities
# #
# CONFIG_INSMOD is not set CONFIG_INSMOD=y
# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set

Loading…
Cancel
Save