From c487a998ccf4a458ab5daf2ca3bdff504d9bb443 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Wed, 11 Jul 2007 02:02:38 +0000 Subject: [PATCH] * merged r21174, r21185 from kernel-cleanup2: * reverted r2555 - restored linux{24,26}-src packages (WIP) git-svn-id: svn://svn.opensde.net/opensde/package/trunk@21639 10447126-35f2-4685-b0cf-6dd780d3921f --- base/linux24-src/linux24-src.cache | 34 ++++++++++++++ base/linux24-src/linux24-src.conf | 72 ++++++++++++++++++++++++++++++ base/linux24-src/linux24-src.desc | 47 +++++++++++++++++++ base/linux26-src/linux26-src.cache | 34 ++++++++++++++ base/linux26-src/linux26-src.conf | 25 +++++++++++ base/linux26-src/linux26-src.desc | 44 ++++++++++++++++++ 6 files changed, 256 insertions(+) create mode 100644 base/linux24-src/linux24-src.cache create mode 100644 base/linux24-src/linux24-src.conf create mode 100644 base/linux24-src/linux24-src.desc create mode 100644 base/linux26-src/linux26-src.cache create mode 100644 base/linux26-src/linux26-src.conf create mode 100644 base/linux26-src/linux26-src.desc diff --git a/base/linux24-src/linux24-src.cache b/base/linux24-src/linux24-src.cache new file mode 100644 index 000000000..0dedc76dc --- /dev/null +++ b/base/linux24-src/linux24-src.cache @@ -0,0 +1,34 @@ +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/base/linux24-src/linux24-src.cache +[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[TIMESTAMP] 1087203423 Mon Jun 14 10:57:03 2004 +[CONFIG-ID] 2.1.0-DEV-x86-reference-expert +[ROCKVER] 2.1.0-DEV + +[LOGS] 1-linux24-src.log 5-linux24-src.log 9-linux24-src.log + +[BUILDTIME] 9683 (9) +[SIZE] 166.58 MB, 13497 files + +[DEP] 00-dirtree bash binutils bzip2 ccache coreutils findutils gawk gcc3 +[DEP] glibc23 grep linux24-header m4 make mktemp patch sed sysfiles tar + diff --git a/base/linux24-src/linux24-src.conf b/base/linux24-src/linux24-src.conf new file mode 100644 index 000000000..c0fccf869 --- /dev/null +++ b/base/linux24-src/linux24-src.conf @@ -0,0 +1,72 @@ +# --- 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" + diff --git a/base/linux24-src/linux24-src.desc b/base/linux24-src/linux24-src.desc new file mode 100644 index 000000000..6d1cf9b0c --- /dev/null +++ b/base/linux24-src/linux24-src.desc @@ -0,0 +1,47 @@ + +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/base/linux24-src/linux24-src.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] The Linux kernel sources + +[T] The upatched tar file and the patches used in ROCK Linux can be found +[T] at '/usr/src/kernel/' - the extraced and patched kernel can be found +[T] at '/usr/src/linux/'. + +[U] http://www.kernel.org/ + +[A] Linus Torvalds +[M] Clifford Wolf +[M] Rene Rebe + +[C] base/kernel +[F] DIETLIBC + +[E] group kernel-src + +[L] GPL +[S] Stable +[V] 2.4.26 +[P] X -1---5---9 100.600 + +[O] var_append patchfiles " " "gcc340-fixes-v2.4.26-r6.patch" + diff --git a/base/linux26-src/linux26-src.cache b/base/linux26-src/linux26-src.cache new file mode 100644 index 000000000..bc341e477 --- /dev/null +++ b/base/linux26-src/linux26-src.cache @@ -0,0 +1,34 @@ +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/base/linux26-src/linux26-src.cache +[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[TIMESTAMP] 1087203670 Mon Jun 14 11:01:10 2004 +[CONFIG-ID] 2.1.0-DEV-x86-reference-expert +[ROCKVER] 2.1.0-DEV + +[LOGS] 1-linux26-src.log 9-linux26-src.log + +[BUILDTIME] 8492 (9) +[SIZE] 188.40 MB, 16691 files + +[DEP] 00-dirtree bash binutils bzip2 ccache coreutils findutils gawk gcc3 +[DEP] glibc23 grep linux24-header m4 make mktemp patch sed sysfiles tar + diff --git a/base/linux26-src/linux26-src.conf b/base/linux26-src/linux26-src.conf new file mode 100644 index 000000000..9d0323b5a --- /dev/null +++ b/base/linux26-src/linux26-src.conf @@ -0,0 +1,25 @@ +# --- 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/linux26-src/linux26-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 --- + +# simply do the same as the linux24-src package +. $base/package/base/linux24-src/linux24-src.conf + diff --git a/base/linux26-src/linux26-src.desc b/base/linux26-src/linux26-src.desc new file mode 100644 index 000000000..deab35daa --- /dev/null +++ b/base/linux26-src/linux26-src.desc @@ -0,0 +1,44 @@ + +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/base/linux26-src/linux26-src.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] The Linux 2.6 kernel sources + +[T] The upatched tar file and the patches used in ROCK Linux can be found +[T] at '/usr/src/kernel/' - the extraced and patched kernel can be found +[T] at '/usr/src/linux/'. + +[U] http://www.kernel.org/ + +[A] Linus Torvalds +[M] Clifford Wolf +[M] Rene Rebe + +[C] base/kernel + +[E] group kernel-src + +[L] GPL +[S] Stable +[V] 2.6.7 +[P] X -1-------9 100.900 +