From 769f7bf1fe82f438074a3d60bee059606cd87e78 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Sun, 13 Nov 2011 21:29:35 +0100 Subject: [PATCH] linux26: renamed to linux --- ...kg_linux26_post.conf => pkg_linux_post.conf} | 0 ...kg_linux26_post.conf => pkg_linux_post.conf} | 2 +- attic/linux24-psionw/linux24-psionw.desc | 2 +- attic/linux24/linux24.conf | 2 +- ...kg_linux26_post.conf => pkg_linux_post.conf} | 2 +- base/linux-rt/linux-rt.conf | 2 +- base/{linux26 => linux}/12-conf-hacks.patch | 2 +- .../2.6.10-sparc64.patch.disabled | 2 +- base/{linux26 => linux}/20-kernel-cc.patch | 2 +- base/{linux26 => linux}/95-adb-mapping.patch | 2 +- .../96-usb-hid-apple-kbd-mapping.patch.disabled | 2 +- .../adaptec-usbxchange.patch.disabled | 2 +- .../arch-ppc-horizon-name-clash.patch | 2 +- base/{linux26 => linux}/arch/config-common.sh | 2 +- base/{linux26 => linux}/arch/config.x86-64.sh | 2 +- base/{linux26 => linux}/arch/config.x86.sh | 2 +- base/{linux26 => linux}/arch/shared.in | 2 +- base/{linux26 => linux}/config-700.hlp | 2 +- base/{linux26 => linux}/config-700.in | 2 +- base/{linux26 => linux}/disable-broken.lst | 2 +- base/{linux26 => linux}/eth-naming.patch | 2 +- base/{linux26 => linux}/linux-conf.in | 4 ++-- .../linux26.cache => linux/linux.cache} | 0 base/{linux26/linux26.conf => linux/linux.conf} | 6 +++--- base/{linux26/linux26.desc => linux/linux.desc} | 2 +- base/{linux26 => linux}/parse-config | 2 +- .../sparc64-video.patch.disabled | 2 +- ...kg_linux26_post.conf => pkg_linux_post.conf} | 2 +- base/uclibc/parse-config-9 | 4 ++-- base/uml_utilities/pkg_linux26_pre.conf | 15 --------------- ...kg_linux26_post.conf => pkg_linux_post.conf} | 2 +- filesystem/aufs/pkg_linux26_post.conf | 15 --------------- ...kg_linux26_post.conf => pkg_linux_post.conf} | 2 +- ...kg_linux26_post.conf => pkg_linux_post.conf} | 2 +- ...kg_linux26_post.conf => pkg_linux_post.conf} | 2 +- ...kg_linux26_post.conf => pkg_linux_post.conf} | 2 +- network/misdn/misdn.cache | 2 +- ...kg_linux26_post.conf => pkg_linux_post.conf} | 2 +- ...kg_linux26_post.conf => pkg_linux_post.conf} | 2 +- ...kg_linux26_post.conf => pkg_linux_post.conf} | 2 +- ...kg_linux26_post.conf => pkg_linux_post.conf} | 2 +- ...kg_linux26_post.conf => pkg_linux_post.conf} | 2 +- security/grsecurity/pkg_linux26_post.conf | 16 ---------------- ...kg_linux26_post.conf => pkg_linux_post.conf} | 2 +- security/rsbac/pkg_linux26_post.conf | 16 ---------------- security/vserver/pkg_linux26_post.conf | 17 ----------------- security/vserver22/pkg_linux26_pre.conf | 16 ---------------- ...{pkg_linux26_pre.conf => pkg_linux_pre.conf} | 2 +- ...kg_linux26_post.conf => pkg_linux_post.conf} | 2 +- ...kg_linux26_post.conf => pkg_linux_post.conf} | 2 +- ...kg_linux26_post.conf => pkg_linux_post.conf} | 2 +- 51 files changed, 47 insertions(+), 142 deletions(-) rename attic/l7-filter/{pkg_linux26_post.conf => pkg_linux_post.conf} (100%) rename attic/lazyfs/{pkg_linux26_post.conf => pkg_linux_post.conf} (91%) rename attic/mkinitrd/{pkg_linux26_post.conf => pkg_linux_post.conf} (92%) rename base/{linux26 => linux}/12-conf-hacks.patch (98%) rename base/{linux26 => linux}/2.6.10-sparc64.patch.disabled (96%) rename base/{linux26 => linux}/20-kernel-cc.patch (95%) rename base/{linux26 => linux}/95-adb-mapping.patch (96%) rename base/{linux26 => linux}/96-usb-hid-apple-kbd-mapping.patch.disabled (96%) rename base/{linux26 => linux}/adaptec-usbxchange.patch.disabled (99%) rename base/{linux26 => linux}/arch-ppc-horizon-name-clash.patch (94%) rename base/{linux26 => linux}/arch/config-common.sh (96%) rename base/{linux26 => linux}/arch/config.x86-64.sh (95%) rename base/{linux26 => linux}/arch/config.x86.sh (96%) rename base/{linux26 => linux}/arch/shared.in (93%) rename base/{linux26 => linux}/config-700.hlp (97%) rename base/{linux26 => linux}/config-700.in (96%) rename base/{linux26 => linux}/disable-broken.lst (95%) rename base/{linux26 => linux}/eth-naming.patch (97%) rename base/{linux26 => linux}/linux-conf.in (99%) rename base/{linux26/linux26.cache => linux/linux.cache} (100%) rename base/{linux26/linux26.conf => linux/linux.conf} (97%) rename base/{linux26/linux26.desc => linux/linux.desc} (96%) rename base/{linux26 => linux}/parse-config (94%) rename base/{linux26 => linux}/sparc64-video.patch.disabled (95%) rename base/mkinitramfs/{pkg_linux26_post.conf => pkg_linux_post.conf} (93%) delete mode 100644 base/uml_utilities/pkg_linux26_pre.conf rename emulators/vmware/{pkg_linux26_post.conf => pkg_linux_post.conf} (91%) delete mode 100644 filesystem/aufs/pkg_linux26_post.conf rename filesystem/unionfs/{pkg_linux26_post.conf => pkg_linux_post.conf} (91%) rename multimedia/lirc/{pkg_linux26_post.conf => pkg_linux_post.conf} (91%) rename network/acx100/{pkg_linux26_post.conf => pkg_linux_post.conf} (91%) rename network/at76c503a/{pkg_linux26_post.conf => pkg_linux_post.conf} (91%) rename network/ndiswrapper/{pkg_linux26_post.conf => pkg_linux_post.conf} (90%) rename network/slmodem/{pkg_linux26_post.conf => pkg_linux_post.conf} (91%) rename powerpc/mol/{pkg_linux26_post.conf => pkg_linux_post.conf} (92%) rename powerpc/snd-aoa/{pkg_linux26_post.conf => pkg_linux_post.conf} (91%) rename scientific/comedi-driver/{pkg_linux26_post.conf => pkg_linux_post.conf} (90%) delete mode 100644 security/grsecurity/pkg_linux26_post.conf rename security/loop-aes/{pkg_linux26_post.conf => pkg_linux_post.conf} (94%) delete mode 100644 security/rsbac/pkg_linux26_post.conf delete mode 100644 security/vserver/pkg_linux26_post.conf delete mode 100644 security/vserver22/pkg_linux26_pre.conf rename wip/ipw3945/{pkg_linux26_pre.conf => pkg_linux_pre.conf} (91%) rename x11/nvidia-legacy/{pkg_linux26_post.conf => pkg_linux_post.conf} (90%) rename x11/nvidia/{pkg_linux26_post.conf => pkg_linux_post.conf} (91%) rename x11/rivatv/{pkg_linux26_post.conf => pkg_linux_post.conf} (91%) diff --git a/attic/l7-filter/pkg_linux26_post.conf b/attic/l7-filter/pkg_linux_post.conf similarity index 100% rename from attic/l7-filter/pkg_linux26_post.conf rename to attic/l7-filter/pkg_linux_post.conf diff --git a/attic/lazyfs/pkg_linux26_post.conf b/attic/lazyfs/pkg_linux_post.conf similarity index 91% rename from attic/lazyfs/pkg_linux26_post.conf rename to attic/lazyfs/pkg_linux_post.conf index 2404d02e1..5c19f01df 100644 --- a/attic/lazyfs/pkg_linux26_post.conf +++ b/attic/lazyfs/pkg_linux_post.conf @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../lazyfs/pkg_linux26_post.conf +# Filename: package/.../lazyfs/pkg_linux_post.conf # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. diff --git a/attic/linux24-psionw/linux24-psionw.desc b/attic/linux24-psionw/linux24-psionw.desc index 0a5a83300..b42f7299b 100644 --- a/attic/linux24-psionw/linux24-psionw.desc +++ b/attic/linux24-psionw/linux24-psionw.desc @@ -35,7 +35,7 @@ [V] 2.4.27-vrs1-5mx2-ska-2 [P] O -1---5---9 102.060 -[O] . $base/package/*/linux26/linux26.conf +[O] . $base/package/*/linux/linux.conf #[D] 3224398821 linux-2.4.27.tar.bz2 http://ftp.kernel.org/pub/linux/kernel/v2.4/ #[D] 134254896 patch-2.4.27-vrs1.bz2 http://ftp.linux.org.uk/pub/linux/arm/kernel/v2.4/ diff --git a/attic/linux24/linux24.conf b/attic/linux24/linux24.conf index 6aed51fc2..a11019aba 100644 --- a/attic/linux24/linux24.conf +++ b/attic/linux24/linux24.conf @@ -15,5 +15,5 @@ #FIXME make option in Linux kernel settings menu # to apply swsusp2 # FIXME supporte software-suspend-2 -. $base/package/*/linux26/linux26.conf +. $base/package/*/linux/linux.conf diff --git a/attic/mkinitrd/pkg_linux26_post.conf b/attic/mkinitrd/pkg_linux_post.conf similarity index 92% rename from attic/mkinitrd/pkg_linux26_post.conf rename to attic/mkinitrd/pkg_linux_post.conf index dba50b9db..0b0a765a1 100644 --- a/attic/mkinitrd/pkg_linux26_post.conf +++ b/attic/mkinitrd/pkg_linux_post.conf @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../mkinitrd/pkg_linux26_post.conf +# Filename: package/.../mkinitrd/pkg_linux_post.conf # Copyright (C) 2007 The OpenSDE Project # # More information can be found in the files COPYING and README. diff --git a/base/linux-rt/linux-rt.conf b/base/linux-rt/linux-rt.conf index a7e7c0ebf..8e1e80653 100644 --- a/base/linux-rt/linux-rt.conf +++ b/base/linux-rt/linux-rt.conf @@ -14,4 +14,4 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- -. $base/package/*/linux/linux26.conf +. $base/package/*/linux/linux.conf diff --git a/base/linux26/12-conf-hacks.patch b/base/linux/12-conf-hacks.patch similarity index 98% rename from base/linux26/12-conf-hacks.patch rename to base/linux/12-conf-hacks.patch index 277c3734e..f5d6e8489 100644 --- a/base/linux26/12-conf-hacks.patch +++ b/base/linux/12-conf-hacks.patch @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../linux26/12-conf-hacks.patch +# Filename: package/.../linux/12-conf-hacks.patch # Copyright (C) 2008 - 2011 The OpenSDE Project # Copyright (C) 2004 - 2008 The T2 SDE Project # Copyright (C) 1998 - 2003 ROCK Linux Project diff --git a/base/linux26/2.6.10-sparc64.patch.disabled b/base/linux/2.6.10-sparc64.patch.disabled similarity index 96% rename from base/linux26/2.6.10-sparc64.patch.disabled rename to base/linux/2.6.10-sparc64.patch.disabled index 70ec0da98..47b23b846 100644 --- a/base/linux26/2.6.10-sparc64.patch.disabled +++ b/base/linux/2.6.10-sparc64.patch.disabled @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../linux26/2.6.10-sparc64.patch.disabled +# Filename: package/.../linux/2.6.10-sparc64.patch.disabled # Copyright (C) 2010 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # diff --git a/base/linux26/20-kernel-cc.patch b/base/linux/20-kernel-cc.patch similarity index 95% rename from base/linux26/20-kernel-cc.patch rename to base/linux/20-kernel-cc.patch index 1fd5af013..7f6f976ab 100644 --- a/base/linux26/20-kernel-cc.patch +++ b/base/linux/20-kernel-cc.patch @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../linux26/20-kernel-cc.patch +# Filename: package/.../linux/20-kernel-cc.patch # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # diff --git a/base/linux26/95-adb-mapping.patch b/base/linux/95-adb-mapping.patch similarity index 96% rename from base/linux26/95-adb-mapping.patch rename to base/linux/95-adb-mapping.patch index d6f4002a5..c7bda9d54 100644 --- a/base/linux26/95-adb-mapping.patch +++ b/base/linux/95-adb-mapping.patch @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../linux26/95-adb-mapping.patch +# Filename: package/.../linux/95-adb-mapping.patch # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. diff --git a/base/linux26/96-usb-hid-apple-kbd-mapping.patch.disabled b/base/linux/96-usb-hid-apple-kbd-mapping.patch.disabled similarity index 96% rename from base/linux26/96-usb-hid-apple-kbd-mapping.patch.disabled rename to base/linux/96-usb-hid-apple-kbd-mapping.patch.disabled index 405039332..ae2dbbce3 100644 --- a/base/linux26/96-usb-hid-apple-kbd-mapping.patch.disabled +++ b/base/linux/96-usb-hid-apple-kbd-mapping.patch.disabled @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../linux26/96-usb-hid-apple-kbd-mapping.patch.disabled +# Filename: package/.../linux/96-usb-hid-apple-kbd-mapping.patch.disabled # Copyright (C) 2008 - 2010 The OpenSDE Project # Copyright (C) 2004 - 2008 The T2 SDE Project # diff --git a/base/linux26/adaptec-usbxchange.patch.disabled b/base/linux/adaptec-usbxchange.patch.disabled similarity index 99% rename from base/linux26/adaptec-usbxchange.patch.disabled rename to base/linux/adaptec-usbxchange.patch.disabled index 98cc292b6..13cd88669 100644 --- a/base/linux26/adaptec-usbxchange.patch.disabled +++ b/base/linux/adaptec-usbxchange.patch.disabled @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../linux26/adaptec-usbxchange.patch.disabled +# Filename: package/.../linux/adaptec-usbxchange.patch.disabled # Copyright (C) 2008 - 2010 The OpenSDE Project # Copyright (C) 2006 - 2008 The T2 SDE Project # diff --git a/base/linux26/arch-ppc-horizon-name-clash.patch b/base/linux/arch-ppc-horizon-name-clash.patch similarity index 94% rename from base/linux26/arch-ppc-horizon-name-clash.patch rename to base/linux/arch-ppc-horizon-name-clash.patch index a06a0bc0b..69edf6ad4 100644 --- a/base/linux26/arch-ppc-horizon-name-clash.patch +++ b/base/linux/arch-ppc-horizon-name-clash.patch @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../linux26/arch-ppc-horizon-name-clash.patch +# Filename: package/.../linux/arch-ppc-horizon-name-clash.patch # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # diff --git a/base/linux26/arch/config-common.sh b/base/linux/arch/config-common.sh similarity index 96% rename from base/linux26/arch/config-common.sh rename to base/linux/arch/config-common.sh index 2fde28b94..dc9962261 100644 --- a/base/linux26/arch/config-common.sh +++ b/base/linux/arch/config-common.sh @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../linux26/arch/config-common.sh +# Filename: package/.../linux/arch/config-common.sh # Copyright (C) 2008 - 2011 The OpenSDE Project # # More information can be found in the files COPYING and README. diff --git a/base/linux26/arch/config.x86-64.sh b/base/linux/arch/config.x86-64.sh similarity index 95% rename from base/linux26/arch/config.x86-64.sh rename to base/linux/arch/config.x86-64.sh index cebcc4136..c229c84d3 100644 --- a/base/linux26/arch/config.x86-64.sh +++ b/base/linux/arch/config.x86-64.sh @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../linux26/arch/config.x86-64.sh +# Filename: package/.../linux/arch/config.x86-64.sh # Copyright (C) 2008 The OpenSDE Project # # More information can be found in the files COPYING and README. diff --git a/base/linux26/arch/config.x86.sh b/base/linux/arch/config.x86.sh similarity index 96% rename from base/linux26/arch/config.x86.sh rename to base/linux/arch/config.x86.sh index aeedf374e..93f18af3c 100644 --- a/base/linux26/arch/config.x86.sh +++ b/base/linux/arch/config.x86.sh @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../linux26/arch/config.x86.sh +# Filename: package/.../linux/arch/config.x86.sh # Copyright (C) 2008 The OpenSDE Project # # More information can be found in the files COPYING and README. diff --git a/base/linux26/arch/shared.in b/base/linux/arch/shared.in similarity index 93% rename from base/linux26/arch/shared.in rename to base/linux/arch/shared.in index cac37100a..fae795fc9 100644 --- a/base/linux26/arch/shared.in +++ b/base/linux/arch/shared.in @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../linux26/arch/shared.in +# Filename: package/.../linux/arch/shared.in # Copyright (C) 2008 The OpenSDE Project # # More information can be found in the files COPYING and README. diff --git a/base/linux26/config-700.hlp b/base/linux/config-700.hlp similarity index 97% rename from base/linux26/config-700.hlp rename to base/linux/config-700.hlp index 9f4f6459b..3cae6e16d 100644 --- a/base/linux26/config-700.hlp +++ b/base/linux/config-700.hlp @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../linux26/config-700.hlp +# Filename: package/.../linux/config-700.hlp # Copyright (C) 2007 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf diff --git a/base/linux26/config-700.in b/base/linux/config-700.in similarity index 96% rename from base/linux26/config-700.in rename to base/linux/config-700.in index 6726dc661..d9abbb51c 100644 --- a/base/linux26/config-700.in +++ b/base/linux/config-700.in @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../linux26/config-700.in +# Filename: package/.../linux/config-700.in # Copyright (C) 2006 - 2010 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf diff --git a/base/linux26/disable-broken.lst b/base/linux/disable-broken.lst similarity index 95% rename from base/linux26/disable-broken.lst rename to base/linux/disable-broken.lst index a522541f4..f244591bb 100644 --- a/base/linux26/disable-broken.lst +++ b/base/linux/disable-broken.lst @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../linux26/disable-broken.lst +# Filename: package/.../linux/disable-broken.lst # Copyright (C) 2007 The OpenSDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # diff --git a/base/linux26/eth-naming.patch b/base/linux/eth-naming.patch similarity index 97% rename from base/linux26/eth-naming.patch rename to base/linux/eth-naming.patch index 1b6d61e78..81cb37a81 100644 --- a/base/linux26/eth-naming.patch +++ b/base/linux/eth-naming.patch @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../linux26/eth-naming.patch +# Filename: package/.../linux/eth-naming.patch # Copyright (C) 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. diff --git a/base/linux26/linux-conf.in b/base/linux/linux-conf.in similarity index 99% rename from base/linux26/linux-conf.in rename to base/linux/linux-conf.in index fe638d5e5..6193104ab 100644 --- a/base/linux26/linux-conf.in +++ b/base/linux/linux-conf.in @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../linux26/linux-conf.in +# Filename: package/.../linux/linux-conf.in # Copyright (C) 2006 - 2011 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf @@ -16,7 +16,7 @@ treever=$(echo $ver | cut -d. -f1-2 | tr -d .) -lx_confdir=$(pkgdesc confdir linux26) +lx_confdir=$(pkgdesc confdir linux) lx_ver=0 for x in $(echo "$ver" | cut -d. -f1-3 | tr '.' ' '); do lx_ver=$( expr $lx_ver \* 1000 + $x ) diff --git a/base/linux26/linux26.cache b/base/linux/linux.cache similarity index 100% rename from base/linux26/linux26.cache rename to base/linux/linux.cache diff --git a/base/linux26/linux26.conf b/base/linux/linux.conf similarity index 97% rename from base/linux26/linux26.conf rename to base/linux/linux.conf index 181c6e4b5..767f58313 100644 --- a/base/linux26/linux26.conf +++ b/base/linux/linux.conf @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../linux26/linux26.conf +# Filename: package/.../linux/linux.conf # Copyright (C) 2007 - 2010 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf @@ -141,8 +141,8 @@ main_lx() { # if module versions is enabled we need to copy 'Module.symvers' # to be able to build external 3rd party kernel modules without - # rebuilding the whole kernel using the linux26-src package - if grep -q "CONFIG_MODVERSIONS=y" .config && pkginstalled linux26-src ; then + # rebuilding the whole kernel using the linux-src package + if grep -q "CONFIG_MODVERSIONS=y" .config && pkginstalled linux-src ; then echo "Copying Module.symvers -> /lib/modules/${lx_kernelrelease}/build/" cp -v Module.symvers $root/lib/modules/${lx_kernelrelease}/build/ fi diff --git a/base/linux26/linux26.desc b/base/linux/linux.desc similarity index 96% rename from base/linux26/linux26.desc rename to base/linux/linux.desc index 791269e5a..c63684b1c 100644 --- a/base/linux26/linux26.desc +++ b/base/linux/linux.desc @@ -2,7 +2,7 @@ [COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] -[COPY] Filename: package/.../linux26/linux26.desc +[COPY] Filename: package/.../linux/linux.desc [COPY] Copyright (C) 2006 - 2011 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf diff --git a/base/linux26/parse-config b/base/linux/parse-config similarity index 94% rename from base/linux26/parse-config rename to base/linux/parse-config index 4690217fc..015d6841e 100644 --- a/base/linux26/parse-config +++ b/base/linux/parse-config @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../linux26/parse-config +# Filename: package/.../linux/parse-config # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. diff --git a/base/linux26/sparc64-video.patch.disabled b/base/linux/sparc64-video.patch.disabled similarity index 95% rename from base/linux26/sparc64-video.patch.disabled rename to base/linux/sparc64-video.patch.disabled index 0570abf9e..04a3a88fe 100644 --- a/base/linux26/sparc64-video.patch.disabled +++ b/base/linux/sparc64-video.patch.disabled @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../linux26/sparc64-video.patch.disabled +# Filename: package/.../linux/sparc64-video.patch.disabled # Copyright (C) 2010 The OpenSDE Project # Copyright (C) 2006 The T2 SDE Project # diff --git a/base/mkinitramfs/pkg_linux26_post.conf b/base/mkinitramfs/pkg_linux_post.conf similarity index 93% rename from base/mkinitramfs/pkg_linux26_post.conf rename to base/mkinitramfs/pkg_linux_post.conf index 64798b9ae..51b74c83a 100644 --- a/base/mkinitramfs/pkg_linux26_post.conf +++ b/base/mkinitramfs/pkg_linux_post.conf @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../mkinitramfs/pkg_linux26_post.conf +# Filename: package/.../mkinitramfs/pkg_linux_post.conf # Copyright (C) 2007 - 2008 The OpenSDE Project # # More information can be found in the files COPYING and README. diff --git a/base/uclibc/parse-config-9 b/base/uclibc/parse-config-9 index 26e1ffbaf..c5d842a14 100644 --- a/base/uclibc/parse-config-9 +++ b/base/uclibc/parse-config-9 @@ -178,8 +178,8 @@ if [ "$SDECFG_LIBC" == "uclibc" ]; then case "$pkg" in linux24*) pkg_uclibc_pkg=linux24 ;; - linux26*|linux-header) - pkg_uclibc_pkg=linux26 ;; + linux*|linux-header) + pkg_uclibc_pkg=linux ;; *) pkg_uclibc_pkg=${pkg//-/_} ;; esac diff --git a/base/uml_utilities/pkg_linux26_pre.conf b/base/uml_utilities/pkg_linux26_pre.conf deleted file mode 100644 index 131c7686e..000000000 --- a/base/uml_utilities/pkg_linux26_pre.conf +++ /dev/null @@ -1,15 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../uml_utilities/pkg_linux26_pre.conf -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# 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 --- - -. $base/package/*/uml_utilities/pkg_linux_pre.conf diff --git a/emulators/vmware/pkg_linux26_post.conf b/emulators/vmware/pkg_linux_post.conf similarity index 91% rename from emulators/vmware/pkg_linux26_post.conf rename to emulators/vmware/pkg_linux_post.conf index 877f3d217..9dbc774fd 100644 --- a/emulators/vmware/pkg_linux26_post.conf +++ b/emulators/vmware/pkg_linux_post.conf @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../vmware/pkg_linux26_post.conf +# Filename: package/.../vmware/pkg_linux_post.conf # Copyright (C) 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. diff --git a/filesystem/aufs/pkg_linux26_post.conf b/filesystem/aufs/pkg_linux26_post.conf deleted file mode 100644 index 441cf4feb..000000000 --- a/filesystem/aufs/pkg_linux26_post.conf +++ /dev/null @@ -1,15 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../aufs/pkg_linux26_post.conf -# Copyright (C) 2010 The OpenSDE Project -# -# 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 --- - -. $base/package/*/aufs/pkg_linux_post.conf diff --git a/filesystem/unionfs/pkg_linux26_post.conf b/filesystem/unionfs/pkg_linux_post.conf similarity index 91% rename from filesystem/unionfs/pkg_linux26_post.conf rename to filesystem/unionfs/pkg_linux_post.conf index 992c64e98..0ada01a58 100644 --- a/filesystem/unionfs/pkg_linux26_post.conf +++ b/filesystem/unionfs/pkg_linux_post.conf @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../unionfs/pkg_linux26_post.conf +# Filename: package/.../unionfs/pkg_linux_post.conf # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. diff --git a/multimedia/lirc/pkg_linux26_post.conf b/multimedia/lirc/pkg_linux_post.conf similarity index 91% rename from multimedia/lirc/pkg_linux26_post.conf rename to multimedia/lirc/pkg_linux_post.conf index a920751c6..3b7a7a575 100644 --- a/multimedia/lirc/pkg_linux26_post.conf +++ b/multimedia/lirc/pkg_linux_post.conf @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../lirc/pkg_linux26_post.conf +# Filename: package/.../lirc/pkg_linux_post.conf # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. diff --git a/network/acx100/pkg_linux26_post.conf b/network/acx100/pkg_linux_post.conf similarity index 91% rename from network/acx100/pkg_linux26_post.conf rename to network/acx100/pkg_linux_post.conf index 0417ec7ca..fff6b3f64 100644 --- a/network/acx100/pkg_linux26_post.conf +++ b/network/acx100/pkg_linux_post.conf @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../acx100/pkg_linux26_post.conf +# Filename: package/.../acx100/pkg_linux_post.conf # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. diff --git a/network/at76c503a/pkg_linux26_post.conf b/network/at76c503a/pkg_linux_post.conf similarity index 91% rename from network/at76c503a/pkg_linux26_post.conf rename to network/at76c503a/pkg_linux_post.conf index 8f7ddbedd..e9f5a318f 100644 --- a/network/at76c503a/pkg_linux26_post.conf +++ b/network/at76c503a/pkg_linux_post.conf @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../at76c503a/pkg_linux26_post.conf +# Filename: package/.../at76c503a/pkg_linux_post.conf # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. diff --git a/network/misdn/misdn.cache b/network/misdn/misdn.cache index 912d8a9a8..2ab77be5f 100644 --- a/network/misdn/misdn.cache +++ b/network/misdn/misdn.cache @@ -15,7 +15,7 @@ [DEP] glibc [DEP] grep [DEP] linux-header -[DEP] linux26 +[DEP] linux [DEP] m4 [DEP] make [DEP] ncurses diff --git a/network/ndiswrapper/pkg_linux26_post.conf b/network/ndiswrapper/pkg_linux_post.conf similarity index 90% rename from network/ndiswrapper/pkg_linux26_post.conf rename to network/ndiswrapper/pkg_linux_post.conf index a84ca9db2..daad73dbc 100644 --- a/network/ndiswrapper/pkg_linux26_post.conf +++ b/network/ndiswrapper/pkg_linux_post.conf @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../ndiswrapper/pkg_linux26_post.conf +# Filename: package/.../ndiswrapper/pkg_linux_post.conf # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. diff --git a/network/slmodem/pkg_linux26_post.conf b/network/slmodem/pkg_linux_post.conf similarity index 91% rename from network/slmodem/pkg_linux26_post.conf rename to network/slmodem/pkg_linux_post.conf index 0c6918ab8..535abb928 100644 --- a/network/slmodem/pkg_linux26_post.conf +++ b/network/slmodem/pkg_linux_post.conf @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../slmodem/pkg_linux26_post.conf +# Filename: package/.../slmodem/pkg_linux_post.conf # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. diff --git a/powerpc/mol/pkg_linux26_post.conf b/powerpc/mol/pkg_linux_post.conf similarity index 92% rename from powerpc/mol/pkg_linux26_post.conf rename to powerpc/mol/pkg_linux_post.conf index ff9c62929..3176ecaa8 100644 --- a/powerpc/mol/pkg_linux26_post.conf +++ b/powerpc/mol/pkg_linux_post.conf @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../mol/pkg_linux26_post.conf +# Filename: package/.../mol/pkg_linux_post.conf # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. diff --git a/powerpc/snd-aoa/pkg_linux26_post.conf b/powerpc/snd-aoa/pkg_linux_post.conf similarity index 91% rename from powerpc/snd-aoa/pkg_linux26_post.conf rename to powerpc/snd-aoa/pkg_linux_post.conf index ff939f147..f139f7044 100644 --- a/powerpc/snd-aoa/pkg_linux26_post.conf +++ b/powerpc/snd-aoa/pkg_linux_post.conf @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../snd-aoa/pkg_linux26_post.conf +# Filename: package/.../snd-aoa/pkg_linux_post.conf # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. diff --git a/scientific/comedi-driver/pkg_linux26_post.conf b/scientific/comedi-driver/pkg_linux_post.conf similarity index 90% rename from scientific/comedi-driver/pkg_linux26_post.conf rename to scientific/comedi-driver/pkg_linux_post.conf index 447abc5e0..eb97b955a 100644 --- a/scientific/comedi-driver/pkg_linux26_post.conf +++ b/scientific/comedi-driver/pkg_linux_post.conf @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../comedi-driver/pkg_linux26_post.conf +# Filename: package/.../comedi-driver/pkg_linux_post.conf # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. diff --git a/security/grsecurity/pkg_linux26_post.conf b/security/grsecurity/pkg_linux26_post.conf deleted file mode 100644 index e94d1974b..000000000 --- a/security/grsecurity/pkg_linux26_post.conf +++ /dev/null @@ -1,16 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../grsecurity/pkg_linux26_post.conf -# Copyright (C) 2008 The OpenSDE Project -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# 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 --- - -. $base/package/*/grsecurity/pkg_linux_post.conf diff --git a/security/loop-aes/pkg_linux26_post.conf b/security/loop-aes/pkg_linux_post.conf similarity index 94% rename from security/loop-aes/pkg_linux26_post.conf rename to security/loop-aes/pkg_linux_post.conf index 2881cf443..36d776d0a 100644 --- a/security/loop-aes/pkg_linux26_post.conf +++ b/security/loop-aes/pkg_linux_post.conf @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../loop-aes/pkg_linux26_post.conf +# Filename: package/.../loop-aes/pkg_linux_post.conf # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2006 The T2 SDE Project # diff --git a/security/rsbac/pkg_linux26_post.conf b/security/rsbac/pkg_linux26_post.conf deleted file mode 100644 index 63b4a0a30..000000000 --- a/security/rsbac/pkg_linux26_post.conf +++ /dev/null @@ -1,16 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../rsbac/pkg_linux26_post.conf -# Copyright (C) 2008 The OpenSDE Project -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# 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 --- - -. $base/package/*/rsbac/pkg_linux_post.conf diff --git a/security/vserver/pkg_linux26_post.conf b/security/vserver/pkg_linux26_post.conf deleted file mode 100644 index 8fe092bb0..000000000 --- a/security/vserver/pkg_linux26_post.conf +++ /dev/null @@ -1,17 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../vserver/pkg_linux26_post.conf -# Copyright (C) 2008 The OpenSDE Project -# 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. -# --- SDE-COPYRIGHT-NOTE-END --- - -. $base/package/*/vserver/pkg_linux_post.conf diff --git a/security/vserver22/pkg_linux26_pre.conf b/security/vserver22/pkg_linux26_pre.conf deleted file mode 100644 index 074ec06f1..000000000 --- a/security/vserver22/pkg_linux26_pre.conf +++ /dev/null @@ -1,16 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../vserver22/pkg_linux26_pre.conf -# Copyright (C) 2004 - 2006 The T2 SDE Project -# Copyright (C) 1998 - 2003 ROCK Linux Project -# -# 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 --- - -. $base/package/*/vserver22/pkg_linux_pre.conf diff --git a/wip/ipw3945/pkg_linux26_pre.conf b/wip/ipw3945/pkg_linux_pre.conf similarity index 91% rename from wip/ipw3945/pkg_linux26_pre.conf rename to wip/ipw3945/pkg_linux_pre.conf index 76b992b37..faf1b2e82 100644 --- a/wip/ipw3945/pkg_linux26_pre.conf +++ b/wip/ipw3945/pkg_linux_pre.conf @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../ipw3945/pkg_linux26_pre.conf +# Filename: package/.../ipw3945/pkg_linux_pre.conf # Copyright (C) 2006 The OpenSDE Project # # More information can be found in the files COPYING and README. diff --git a/x11/nvidia-legacy/pkg_linux26_post.conf b/x11/nvidia-legacy/pkg_linux_post.conf similarity index 90% rename from x11/nvidia-legacy/pkg_linux26_post.conf rename to x11/nvidia-legacy/pkg_linux_post.conf index 3f1b8bfe9..71540d5e2 100644 --- a/x11/nvidia-legacy/pkg_linux26_post.conf +++ b/x11/nvidia-legacy/pkg_linux_post.conf @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../nvidia-legacy/pkg_linux26_post.conf +# Filename: package/.../nvidia-legacy/pkg_linux_post.conf # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. diff --git a/x11/nvidia/pkg_linux26_post.conf b/x11/nvidia/pkg_linux_post.conf similarity index 91% rename from x11/nvidia/pkg_linux26_post.conf rename to x11/nvidia/pkg_linux_post.conf index 4a2169d9b..d328cc874 100644 --- a/x11/nvidia/pkg_linux26_post.conf +++ b/x11/nvidia/pkg_linux_post.conf @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../nvidia/pkg_linux26_post.conf +# Filename: package/.../nvidia/pkg_linux_post.conf # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. diff --git a/x11/rivatv/pkg_linux26_post.conf b/x11/rivatv/pkg_linux_post.conf similarity index 91% rename from x11/rivatv/pkg_linux26_post.conf rename to x11/rivatv/pkg_linux_post.conf index af7d0ea3f..c563c131a 100644 --- a/x11/rivatv/pkg_linux26_post.conf +++ b/x11/rivatv/pkg_linux_post.conf @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../rivatv/pkg_linux26_post.conf +# Filename: package/.../rivatv/pkg_linux_post.conf # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README.