Browse Source

* merged r21177 and r21180 from kernel-cleanup2:

* moved remaining files on base/linux24{,-src} to base/linux26{,-src}



git-svn-id: svn://svn.opensde.net/opensde/package/trunk@21642 10447126-35f2-4685-b0cf-6dd780d3921f
early
Alejandro Mery 18 years ago
parent
commit
d8e4d96869
  1. 72
      base/linux24-src/linux24-src.conf
  2. 170
      base/linux24/linux24.conf
  3. 0
      base/linux26/config-700.hlp
  4. 0
      base/linux26/config-700.in
  5. 2
      base/linux26/linux-conf.in
  6. 0
      base/linux26/parse-config

72
base/linux24-src/linux24-src.conf

@ -1,72 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/base/linux24-src/linux24-src.conf
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
# include the function to patch and configure the kernel
. $base/package/base/linux24/lx_config.sh
main_lx_src() {
cd $root/usr/src
echo "Extracting the Linux Kernel Sources [$vanilla_ver] ... "
lx_tempdir=`mktemp -d tmp.XXXXXXXXXX`
# hack to extract the files into our usr/src dir ...
# this part is continued inside lx_injectextraversion
ln -sf $PWD/${lx_tempdir} $builddir/linux-${vanilla_ver}
tar -k $taropt $archdir/$srctar -C $builddir/
chown -R 0:0 ${lx_tempdir} ; chmod go=u,go-w ${lx_tempdir}
echo "Copying kernel patches ... "
rm -rf linux$treever-patches ; mkdir -p linux$treever-patches
cp -v $base/package/$repository/linux$treever/README linux$treever-patches/
cp -v $patchfiles linux$treever-patches/
cd ${lx_tempdir}
lx_config
# remove debug configs
rm -f .config.[1-9]
if [ "$ROCKCFG_PKG_LINUX_CONFIG_STYLE" = none ] ; then
# create a valid .config (new settings may be available etc.)
yes '' | eval $MAKE oldconfig > /dev/null
else
cp -v .config_nomods ../linux$treever-patches/config_nomods.txt
cp -v .config_modules ../linux$treever-patches/config_modules.txt
fi
# can fail in stage 0-1 ...
if [ $stagelevel -gt 1 ] && [[ $treever = 24* ]] ; then
echo "Creating dependencies (e.g. for versioned symbols) ..."
eval $MAKE dep-files
fi
echo "Clean up the *.orig and *~ files ... "
find -name '*.orig' -o -name '*~' | xargs rm -f
rm -f .config.old
}
autoextract=0 ; createdocs=0
custmain="main_lx_src"
patchfiles="`echo $base/package/$repository/linux$treever/*.patch` $patchfiles"

170
base/linux24/linux24.conf

@ -1,170 +0,0 @@
#!/bin/sh
# --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# T2 SDE: package/.../linux24/linux24.conf
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
# More information can be found in the files COPYING and README.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING.
# --- T2-COPYRIGHT-NOTE-END ---
. $base/package/*/linux*/linux-conf.in
main_lx() {
lx_patch
lx_config
hook_eval premake
# we need to rerun the oldconfig since the used .config
# might not match the one used in the last oldconfig run
# (e.g. the nomods is run last - and normally the module
# one is used)
yes '' | eval $MAKE $makeopt oldconfig > /dev/null
if [[ $treever = 24* ]] ; then
echo "Creating dependencies ..."
eval $MAKE $makeopt dep
fi
kerneldir="$PWD"
moduledir="$root/lib/modules/${lx_kernelrelease}"
echo "Cleanup kernel ..."
eval $MAKE $makeopt clean > /dev/null
cp -vf .config $root/boot/kconfig_${lx_kernelrelease}
if [ -z "$SDEDEBUG_LINUX_SUBMODULES_ONLY" ] ; then
var_append makeopt ' ' vmlinux
if grep -q "CONFIG_MODULES=y" .config ; then
var_append makeopt ' ' modules
var_append makeinstopt ' ' "INSTALL_MOD_PATH=$root DEPMOD=/bin/true modules_install"
else
makeinstopt=
fi
case "$lx_cpu" in
i386|x86_64)
var_append makeopt ' ' bzImage ;;
mips)
var_append makeopt ' ' vmlinux.ecoff ;;
ppc|sh)
var_append makeopt ' ' zImage ;;
sparc*)
var_append makeopt ' ' image ;;
esac
echo "Building the kernel ..."
eval $MAKE $makeopt
cp -vf System.map $root/boot/System.map_${lx_kernelrelease}
hook_eval inmake
[ "$makeinstopt" ] && eval $MAKE $makeinstopt
echo "Installing the kernel ..."
# for debugging with oprofile, also used to boot on some arches
cp -vf vmlinux $root/boot/vmlinux_${lx_kernelrelease}
case "$lx_cpu" in
i386|x86_64)
cp -vf arch/${lx_cpu}/boot/bzImage $root/boot/vmlinuz_${lx_kernelrelease}
;;
alpha)
gzip < vmlinux > $root/boot/vmlinux_${lx_kernelrelease}.gz
;;
mips)
cp -vf vmlinux.ecoff $root/boot/vmlinux_${lx_kernelrelease}.ecoff
;;
ppc)
for x in arch/ppc/boot/images/zImage.* ; do
cp -v $x $root/boot/${x/*\//}-${lx_kernelrelease}
done
;;
sh)
cp -vf arch/sh/boot/zImage $root/boot/vmlinux_${lx_kernelrelease}
;;
sparc*)
cp -vf arch/$lx_cpu/boot/image $root/boot/vmlinux_${lx_kernelrelease}
;;
esac
else
eval $MAKE $makeopt scripts
touch $root/boot/System.map_${lx_kernelrelease}
mkdir -p $moduledir
ln -sf $PWD $moduledir/build
fi
hook_eval postmake
# iterate over the packages that provide 3rd party linux kernel modules
if grep -q "CONFIG_MODULES=y" .config ; then
module_error=0
echo_status "Registered 3rd party kernel modules:"
for x in $lx_3rd_party_modules ; do
echo "Sub-building 3rd party module package $x ..."
pushd $builddir
# ugly, bash does not abort properly when we have this in a if
# and without it the return 1 aborts immediatly ... :-(
set +e
build_package $x postlinux.conf
error=$?
set -e
if [ $error -ne 0 ]; then
echo_warning "Failed building $x."
module_error=1
fi
echo "Done building $x"
popd
done
# maybe fail hard
if ! atstage rebuild && [ $module_error = 1 ]; then
abort "At least one of the 3rd party kernel modules failed!"
fi
if atstage native; then
echo "Running 'depmod -a -q -F /boot/System.map ${lx_kernelrelease}' ..."
depmod -a -q -F $root/boot/System.map_${lx_kernelrelease} ${lx_kernelrelease}
# due static depmod :-(
for x in $moduledir/modules.*
do [ -f $x ] && add_flist $x; done
[ -z "`type -p mkinitrd`" ] || mkinitrd ${lx_kernelrelease}
else
# In theory depmod here as well ...
[ ! -e $root/sbin/mkinitrd ] || sh $root/sbin/mkinitrd -R $root ${lx_kernelrelease}
fi
echo "Fixing /lib/modules/${ver}/build symlink ..."
rm -f $root/lib/modules/${lx_kernelrelease}/build
ln -sf ../../../usr/src/linux-${lx_kernelrelease} \
$root/lib/modules/${lx_kernelrelease}/build
fi
echo "Copying kernel patches ..."
(
cd $root/usr/src/
rm -rf linux$treever-patches ; mkdir -p linux$treever-patches
echo -e "This directory contains all the applied patches, used\n\
to build the kernel (in addition to the official kernel sources)." > \
linux$treever-patches/README
for x in $patchfiles ; do
# if the patch does not exist it was downloaded or so
# and we just do not copy it ...
[ -f $x ] && cp -v $x linux$treever-patches/ || true
done
)
}
custmain="main_lx"
autopatch=0

0
base/linux24/config-700.hlp → base/linux26/config-700.hlp

0
base/linux24/config-700.in → base/linux26/config-700.in

2
base/linux24/linux-conf.in → base/linux26/linux-conf.in

@ -216,7 +216,7 @@ lx_patch ()
if [[ $treever = 24* ]] ; then
echo "Create symlinks and a few headers for <$lx_cpu> ... "
eval $MAKE $makeopt symlinks
cp $base/package/base/linux24/autoconf.h include/linux/
cp $base/package/*/linux24/autoconf.h include/linux/
touch include/linux/modversions.h
elif [ "$lx_kernelrelease" != "UTS_RELEASE" ]; then
echo "Create symlinks and a few headers for <$lx_cpu> ... "

0
base/linux24/parse-config → base/linux26/parse-config

Loading…
Cancel
Save