From 45682f38ded0d37cdfdde124e4af7ca6f677e275 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Wed, 11 Jul 2007 02:19:43 +0000 Subject: [PATCH] * merged r21176, r21178 and r21179 from kernel-cleanup2 branch: * moved linux24-src to attic - WIP * moved dummy linux26{,-src}.conf to linux24{,-src}/ git-svn-id: svn://svn.opensde.net/opensde/package/trunk@21641 10447126-35f2-4685-b0cf-6dd780d3921f --- attic/linux24-src/linux24-src.cache | 27 +++++++++++ attic/linux24-src/linux24-src.conf | 18 +++++++ attic/linux24-src/linux24-src.desc | 39 +++++++++++++++ .../linux24/linux24.conf | 9 ++-- base/linux24-src/linux24-src.cache | 34 -------------- base/linux24-src/linux24-src.desc | 47 ------------------- base/linux26-src/linux26-src.conf | 25 ---------- 7 files changed, 89 insertions(+), 110 deletions(-) create mode 100644 attic/linux24-src/linux24-src.cache create mode 100644 attic/linux24-src/linux24-src.conf create mode 100644 attic/linux24-src/linux24-src.desc rename base/linux26/linux26.conf => attic/linux24/linux24.conf (75%) delete mode 100644 base/linux24-src/linux24-src.cache delete mode 100644 base/linux24-src/linux24-src.desc delete mode 100644 base/linux26-src/linux26-src.conf diff --git a/attic/linux24-src/linux24-src.cache b/attic/linux24-src/linux24-src.cache new file mode 100644 index 000000000..3f2502bc3 --- /dev/null +++ b/attic/linux24-src/linux24-src.cache @@ -0,0 +1,27 @@ +[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] +[COPY] Filename: package/.../linux24-src/linux24-src.cache +[COPY] Copyright (C) 2007 The OpenSDE Project +[COPY] Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] +[COPY] More information can be found in the files COPYING and README. +[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; version 2 of the License. A copy of the +[COPY] GNU General Public License can be found in the file COPYING. +[COPY] --- SDE-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/attic/linux24-src/linux24-src.conf b/attic/linux24-src/linux24-src.conf new file mode 100644 index 000000000..1c2b8c9a6 --- /dev/null +++ b/attic/linux24-src/linux24-src.conf @@ -0,0 +1,18 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../linux24-src/linux24-src.conf +# Copyright (C) 2007 The OpenSDE 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. +# --- SDE-COPYRIGHT-NOTE-END --- + +# simply do the same as the linux24-src package +. $base/package/*/linux26-src/linux26-src.conf + diff --git a/attic/linux24-src/linux24-src.desc b/attic/linux24-src/linux24-src.desc new file mode 100644 index 000000000..5d96c5f48 --- /dev/null +++ b/attic/linux24-src/linux24-src.desc @@ -0,0 +1,39 @@ + +[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] +[COPY] Filename: package/.../linux24-src/linux24-src.desc +[COPY] Copyright (C) 2007 The OpenSDE Project +[COPY] Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] +[COPY] More information can be found in the files COPYING and README. +[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; version 2 of the License. A copy of the +[COPY] GNU General Public License can be found in the file COPYING. +[COPY] --- SDE-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] Alejandro Mery + +[C] base/kernel +[F] DIETLIBC + +[E] group kernel-src + +[L] GPL +[S] Stable +[V] 2.4.26 +[P] O -1---5---9 100.600 + +[O] var_append patchfiles " " "gcc340-fixes-v2.4.26-r6.patch" + diff --git a/base/linux26/linux26.conf b/attic/linux24/linux24.conf similarity index 75% rename from base/linux26/linux26.conf rename to attic/linux24/linux24.conf index 0ab4837da..040222a96 100644 --- a/base/linux26/linux26.conf +++ b/attic/linux24/linux24.conf @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../linux26/linux26.conf +# Filename: package/.../linux24/linux24.conf +# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -10,9 +11,9 @@ # 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 --- +# --- SDE-COPYRIGHT-NOTE-END --- #FIXME make option in Linux kernel settings menu # to apply swsusp2 # FIXME supporte software-suspend-2 -. $base/package/*/linux24/linux24.conf +. $base/package/*/linux26/linux26.conf diff --git a/base/linux24-src/linux24-src.cache b/base/linux24-src/linux24-src.cache deleted file mode 100644 index 0dedc76dc..000000000 --- a/base/linux24-src/linux24-src.cache +++ /dev/null @@ -1,34 +0,0 @@ -[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.desc b/base/linux24-src/linux24-src.desc deleted file mode 100644 index 6d1cf9b0c..000000000 --- a/base/linux24-src/linux24-src.desc +++ /dev/null @@ -1,47 +0,0 @@ - -[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.conf b/base/linux26-src/linux26-src.conf deleted file mode 100644 index 9d0323b5a..000000000 --- a/base/linux26-src/linux26-src.conf +++ /dev/null @@ -1,25 +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/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 -