New commits:
commit 0b5500a0f776070e46ccf68ac92a0b639a5af475
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
linux more old stuff
commit a340f7fc668cb4754fdb19ff056d159a84b1e524
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
linux - remove ancient old_var_compat cod
commit 9790440ee14d483f9d0ab3ceac703686fc95ca59
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
liux - remove more 2.x stuff
commit cd8914dc52e354e137e0e1515be508ebc606e4ce
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
linux - cleanup latest.defaults
commit 9a47b6ad92e5b4ad0d7d2429338ad3355f6db779
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
linux - remove 2.6.x support
commit 084a41354b389409daa1d69885caf89861224d84
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
linux - remove 2.4.x support
commit 41880a7875c641003bda75a63c9a51c4a4db4143
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
linux - delete ancinet patches
diff --git a/kernels/linux/BUILD b/kernels/linux/BUILD
index 391d4d6..98357f7 100755
--- a/kernels/linux/BUILD
+++ b/kernels/linux/BUILD
@@ -20,17 +20,11 @@ case "${KERNEL_ARCH}" in
esac &&
if [[ -z "$INTERNAL_ISO_VAR" ]] ; then
- case "$VERSION" in
- 2.[024]*)
- echo "making deps for a 2.4 kernel" &&
- make dep
- ;;
- esac &&
eval make $EXTRA_MAKE_OPTIONS $IMAGE_TARGET &&
eval make $EXTRA_MAKE_OPTIONS modules &&
LINUX_BRANCH=$(echo ${VERSION} | cut -d. -f1,2)
case "$VERSION" in
- 3*|2*)
+ 3*)
if [[ ${LINUX_BRANCH//./} -le 310 ]] && ( grep -q CONFIG_BONDING=m
./.config || grep -q CONFIG_BONDING=y ./.config )
then
echo 'Building ifenslave for network bonding...' &&
diff --git a/kernels/linux/CONFLICTS b/kernels/linux/CONFLICTS
deleted file mode 100755
index a478f47..0000000
--- a/kernels/linux/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts linux-new y
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index cea9b88..801d2f9 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -23,6 +23,17 @@
* info/patches/maintenance_patches_4/patch-4.20.1: added
* info/patches/maintenance_patches_4/patch-4.19.14: added
+2019-01-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * patches*/*: delete all non-maintenance or smgl patches
+ * kernels/*: delete all 2.4.x stuff
+ * kernels/* patches/_maintenance_patches/*: delete all 2.6.x stuff
+ * BUILD PREPARE liblinux
+ info/patches/smgl_patches/smgl-logo-0.2-for-2.6.31.patch:
+ remove more 2.x stuff
+ * PREPARE: remove ancient old_var_compat code
+ * FINAL: 2.x --
+ * UP_TRIGGERS CONFLICTS: deleted ancient stuff
+
2018-12-31 Pavel Vinogradov <public AT sourcemage.org>
* info/patches/maintenance_patches_4/patch-4.19.13: added
diff --git a/kernels/linux/INSTALL b/kernels/linux/INSTALL
index bbe6591..4e1b386 100755
--- a/kernels/linux/INSTALL
+++ b/kernels/linux/INSTALL
@@ -1,11 +1,10 @@
-make_single &&
cd ${LINUX_SOURCE_DIRECTORY} &&
# make the append
mkdir -p ${INSTALL_ROOT}/boot &&
if [[ -z "$INTERNAL_ISO_VAR" ]] ; then
if grep 'CONFIG_MODULES=y' ./.config ; then
case "$VERSION" in
- 4*|3*|2.[0246]*)
+ 4*|3*)
message "${MESSAGE_COLOR}installing for a
$VERSION kernel${DEFAULT_COLOR}" &&
local strip_modules
if list_find "$OPTIMIZATIONS" strip; then
diff --git a/kernels/linux/PREPARE b/kernels/linux/PREPARE
index 7568ff2..961c85a 100755
--- a/kernels/linux/PREPARE
+++ b/kernels/linux/PREPARE
@@ -30,24 +30,6 @@ function arch_default()
fi
}
-# convert the old variable names to new variable names
-# $1 pass a file name
-function old_var_compat()
-{
- local old_var
- old_var=( kernel_arch mode reconf kver patches selected_patches )
- local new_var
- new_var=( KERNEL_ARCH KMODE KLINUX_RECONFIGURE BASE_KVER
CANONICAL_PATCHES SELECTED_PATCHES )
- if [[ -f $1 ]]
- then
- for(( i=0 ; $i < ${#old_var[*]} ; i++))
- do
- sedit "s/^${old_var[$i]}/${new_var[$i]}/g" $1 &&
- persistent_remove ${old_var[$i]}
- done
- fi
-}
-
# create the defaults file from scratch
# do this with every command
function create_defaults()
@@ -97,7 +79,6 @@ function create_defaults()
VERSION="`gaze version $SPELL | awk 'NR == 3 {print $4}'`"
if [ -f ${BUILD_DIRECTORY}/linux-${VERSION}/.spell-config.p ]
then
- old_var_compat
${BUILD_DIRECTORY}/linux-$VERSION/.spell-config.p &&
cp ${BUILD_DIRECTORY}/linux-$VERSION/.spell-config.p \
${SPELL_CONFIG}.p
persistent_load
@@ -111,7 +92,6 @@ function create_defaults()
# so the update can be performed.
elif [ -f ${BUILD_DIRECTORY}/linux-$(installed_version
$SPELL)/.spell-config.p ]
then
- old_var_compat ${BUILD_DIRECTORY}/linux-$(installed_version
$SPELL)/.spell-config.p &&
cp ${BUILD_DIRECTORY}/linux-$(installed_version
$SPELL)/.spell-config.p ${SPELL_CONFIG}.p
persistent_load
KMODE="newktree"
@@ -122,8 +102,8 @@ function create_defaults()
# patches
else
[ -z "$KMODE" ] && KMODE="newktree"
- [ -z "$BASE_KVER" ] && BASE_KVER="LATEST_2_6"
- [ -z "$SELECTED_PATCHES" ] &&
SELECTED_PATCHES="LATEST_maintenance_patches"
+ [ -z "$BASE_KVER" ] && BASE_KVER="LATEST_4"
+ [ -z "$SELECTED_PATCHES" ] &&
SELECTED_PATCHES="LATEST_maintenance_patches_4"
fi
# check RECONFIGURE for cast -r linux and set KLINUX_RECONFIGURE
appropriately
@@ -272,7 +252,8 @@ function options_menu()
b/kernels/linux/info/patches/gensplash_patches/fbsplash-0.9.2-r5-2.6.15-rc1.patch
deleted file mode 100755
index bef6c23..0000000
---
a/kernels/linux/info/patches/gensplash_patches/fbsplash-0.9.2-r5-2.6.15-rc1.patch
+++ /dev/null
@@ -1,4 +0,0 @@
-appliedkernels="2.6.15"
-source="fbsplash-0.9.2-r5-2.6.15-rc1.patch"
-source_url=http://dev.gentoo.org/~spock/projects/gensplash/archive/$source
-source_gpg="gurus.gpg:info/patches-sigs/gensplash/${source}.sig"
diff --git
a/kernels/linux/info/patches/gensplash_patches/fbsplash-0.9.2-r5-2.6.16.patch
b/kernels/linux/info/patches/gensplash_patches/fbsplash-0.9.2-r5-2.6.16.patch
deleted file mode 100755
index 468e10c..0000000
---
a/kernels/linux/info/patches/gensplash_patches/fbsplash-0.9.2-r5-2.6.16.patch
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="2.6.16"
-source="fbsplash-0.9.2-r5-2.6.16.patch"
-source_url="http://dev.gentoo.org/~spock/projects/gensplash/archive/$source"
-source_gpg="gurus.gpg:${source}.sig"
-gpg_source_url="http://download.sourcemage.org/distro/kernel/${source}.sig"
diff --git a/kernels/linux/info/patches/git_patches/.info
b/kernels/linux/info/patches/git_patches/.info
deleted file mode 100755
index 3741b1a..0000000
--- a/kernels/linux/info/patches/git_patches/.info
+++ /dev/null
@@ -1,2 +0,0 @@
-short=" git"
-help="These are the nightly releases of the stable kernel"
diff --git a/kernels/linux/info/patches/git_patches/patch-2.6.12-rc5-git8
b/kernels/linux/info/patches/git_patches/patch-2.6.12-rc5-git8
deleted file mode 100755
index 9875a63..0000000
--- a/kernels/linux/info/patches/git_patches/patch-2.6.12-rc5-git8
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="2.6.11"
-depends="patch-2.6.12-rc5"
-patchversion="${depends/patch-/}-git8"
-source="patch-${patchversion}.bz2"
-source_url="$KERNEL_URL/pub/linux/kernel/v2.6/snapshots/${source}"
diff --git a/kernels/linux/info/patches/git_patches/patch-2.6.25-rc6-git7
b/kernels/linux/info/patches/git_patches/patch-2.6.25-rc6-git7
deleted file mode 100755
index cb7362a..0000000
--- a/kernels/linux/info/patches/git_patches/patch-2.6.25-rc6-git7
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="2.6.24"
-depends="patch-2.6.25-rc6"
-patchversion="${depends/patch-/}-git7"
-source="patch-${patchversion}.bz2"
-source_url="$KERNEL_URL/pub/linux/kernel/v2.6/snapshots/${source}"
diff --git a/kernels/linux/info/patches/grsec_secfix_2_4/.info
b/kernels/linux/info/patches/grsec_secfix_2_4/.info
deleted file mode 100755
index 78a7b40..0000000
--- a/kernels/linux/info/patches/grsec_secfix_2_4/.info
+++ /dev/null
@@ -1,2 +0,0 @@
-short=""
-help="Grsecurity put out a small generalized security fix patchset they
merged there grsecurity and this patch into one.\nThis patch is not used or
updated anymore."
diff --git
a/kernels/linux/info/patches/grsec_secfix_2_4/linux-2.4.28-secfix-200501071141.patch
b/kernels/linux/info/patches/grsec_secfix_2_4/linux-2.4.28-secfix-200501071141.patch
deleted file mode 100644
index 4aa6099..0000000
---
a/kernels/linux/info/patches/grsec_secfix_2_4/linux-2.4.28-secfix-200501071141.patch
+++ /dev/null
@@ -1,5 +0,0 @@
-patchversion=
-source=linux-2.4.28-secfix-200501071141.patch
-source_url=http://www.grsecurity.com/$source
-appliedkernels="2.4.28"
-depends="grsecurity-2.1.0-2.4.28-200501051112.patch"
diff --git a/kernels/linux/info/patches/grsec_secfix_2_6/.info
b/kernels/linux/info/patches/grsec_secfix_2_6/.info
deleted file mode 100755
index 78a7b40..0000000
--- a/kernels/linux/info/patches/grsec_secfix_2_6/.info
+++ /dev/null
@@ -1,2 +0,0 @@
-short=""
-help="Grsecurity put out a small generalized security fix patchset they
merged there grsecurity and this patch into one.\nThis patch is not used or
updated anymore."
diff --git
a/kernels/linux/info/patches/grsec_secfix_2_6/linux-2.6.10-secfix-200501071130.patch
b/kernels/linux/info/patches/grsec_secfix_2_6/linux-2.6.10-secfix-200501071130.patch
deleted file mode 100644
index 44488d3..0000000
---
a/kernels/linux/info/patches/grsec_secfix_2_6/linux-2.6.10-secfix-200501071130.patch
+++ /dev/null
@@ -1,5 +0,0 @@
-source=linux-2.6.10-secfix-200501071130.patch
-source_url=http://www.grsecurity.com/$source
-appliedkernels="2.6.10"
-depends="grsecurity-2.1.0-2.6.10-200501081640.patch"
-patchversion="2.6.10-grsec"
diff --git a/kernels/linux/info/patches/grsecurity_2_4/.info
b/kernels/linux/info/patches/grsecurity_2_4/.info
deleted file mode 100644
index 5ba970c..0000000
--- a/kernels/linux/info/patches/grsecurity_2_4/.info
+++ /dev/null
@@ -1,2 +0,0 @@
-short=""
-help="Grsecurity patchset includes major kernel modification.\nAlso see
spell gradm for userland control."
diff --git
a/kernels/linux/info/patches/grsecurity_2_4/grsecurity-2.1.0-2.4.28-200501051112.patch