sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (b7b01eada1078efe382558986bb1de22cef023f5)

From: Ladislav Hagara <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (b7b01eada1078efe382558986bb1de22cef023f5)
Date: Mon, 13 Apr 2015 15:22:51 -0500

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

kernels/linux/BUILD | 14
++++++++-----
kernels/linux/CONFIGURE | 2 -
kernels/linux/HISTORY | 6 +++++
kernels/linux/INSTALL | 2 -
kernels/linux/PREPARE | 4 +--
kernels/linux/PRE_BUILD | 2 -
kernels/linux/info/kernels/4.0 | 5 ++++
kernels/linux/info/patches/maintenance_patches_4/.info | 2 +
kernels/linux/info/patches/maintenance_patches_4/patch-4.0 | 5 ++++
kernels/linux/latest.defaults | 2 +
kernels/linux/liblinux | 2 -
11 files changed, 35 insertions(+), 11 deletions(-)

New commits:
commit b7b01eada1078efe382558986bb1de22cef023f5
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

linux 4.0.0; cast -r linux if you want it

diff --git a/kernels/linux/BUILD b/kernels/linux/BUILD
index cd9fafe..391d4d6 100755
--- a/kernels/linux/BUILD
+++ b/kernels/linux/BUILD
@@ -29,11 +29,15 @@ if [[ -z "$INTERNAL_ISO_VAR" ]] ; then
eval make $EXTRA_MAKE_OPTIONS $IMAGE_TARGET &&
eval make $EXTRA_MAKE_OPTIONS modules &&
LINUX_BRANCH=$(echo ${VERSION} | cut -d. -f1,2)
- if [[ ${LINUX_BRANCH//./} -le 310 ]] && ( grep -q CONFIG_BONDING=m
./.config || grep -q CONFIG_BONDING=y ./.config )
- then
- echo 'Building ifenslave for network bonding...' &&
- gcc -Wall -O ./Documentation/networking/ifenslave.c -o ifenslave
- fi
+ case "$VERSION" in
+ 3*|2*)
+ if [[ ${LINUX_BRANCH//./} -le 310 ]] && ( grep -q CONFIG_BONDING=m
./.config || grep -q CONFIG_BONDING=y ./.config )
+ then
+ echo 'Building ifenslave for network bonding...' &&
+ gcc -Wall -O ./Documentation/networking/ifenslave.c -o ifenslave
+ fi
+ ;;
+ esac
else
# This is for the iso team don't touch
make scripts/ &&
diff --git a/kernels/linux/CONFIGURE b/kernels/linux/CONFIGURE
index 364f38c..2228d0c 100755
--- a/kernels/linux/CONFIGURE
+++ b/kernels/linux/CONFIGURE
@@ -1,5 +1,5 @@
case ${KERNEL_VERSION} in
- 3*|2.6*)
+ 4*|3*|2.6*)
config_query_list MAKEMODE "What make configuration tool
would you like to use?" \
"menuconfig" \
"oldconfig" \
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 4e74b71..2343a2e 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,9 @@
+2015-04-13 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_4 and LATEST_maintenance_patches_4 added
+ * PREPARE, CONFIGURE, liblinux, INSTALL: linux 4 support added
+ * info/kernels/4.0: added
+ * info/patches/maintenance_patches_4/patch-4.0: added
+
2015-04-03 Vlad Glagolev <stealth AT sourcemage.org>
* info/patches/maintenance_patches_3/patch-3.0.{33..84}: removed
* info/patches/maintenance_patches_3/patch-3.0.101: added
diff --git a/kernels/linux/INSTALL b/kernels/linux/INSTALL
index 3aa5978..bbe6591 100755
--- a/kernels/linux/INSTALL
+++ b/kernels/linux/INSTALL
@@ -5,7 +5,7 @@ mkdir -p ${INSTALL_ROOT}/boot &&
if [[ -z "$INTERNAL_ISO_VAR" ]] ; then
if grep 'CONFIG_MODULES=y' ./.config ; then
case "$VERSION" in
- 3*|2.[0246]*)
+ 4*|3*|2.[0246]*)
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 26552bc..7568ff2 100755
--- a/kernels/linux/PREPARE
+++ b/kernels/linux/PREPARE
@@ -299,7 +299,7 @@ function new_tree_menu()
do
menu="${menu}${version} Linux_Kernel Select_one "
done
- menu="$( awk -F= '$1 ~ /LATEST_2|LATEST_3/ {print $1 " Linux_Kernel "
$2 }' $LATEST_KDEFAULTS ) ${menu}"
+ menu="$( awk -F= '$1 ~ /LATEST_2|LATEST_3|LATEST_4/ {print $1 "
Linux_Kernel " $2 }' $LATEST_KDEFAULTS ) ${menu}"
command=$( "${dialog[@]}" --title "Select Kernel Version" \
--item-help --cancel-label "Exit" --default-item "$BASE_KVER" --menu \
"Select a kernel version to use" 0 0 0 \
@@ -308,7 +308,7 @@ function new_tree_menu()
if [ "$retval" == "0" ]
then
case "$command" in
- 3*|2.[0-9].[0-9]*)
+ 4*|3*|2.[0-9].[0-9]*)
BASE_KVER=$command
;;
LATEST*)
diff --git a/kernels/linux/PRE_BUILD b/kernels/linux/PRE_BUILD
index 1d7f1b8..2e31200 100755
--- a/kernels/linux/PRE_BUILD
+++ b/kernels/linux/PRE_BUILD
@@ -64,7 +64,7 @@ case "${KMODE}" in
mk_source_dir $LINUX_SOURCE_DIRECTORY &&
cd $LINUX_SOURCE_DIRECTORY &&
case $VERSION in
- 3.[0-9]*)
+ 4*|3.[0-9]*)
case $SOURCE in
*.bz2)
message "${MESSAGE_COLOR}bunzip2
$SOURCE_CACHE/$SOURCE${DEFAULT_COLOR}"
diff --git a/kernels/linux/info/kernels/4.0 b/kernels/linux/info/kernels/4.0
new file mode 100755
index 0000000..cace934
--- /dev/null
+++ b/kernels/linux/info/kernels/4.0
@@ -0,0 +1,5 @@
+version="4.0"
+source="linux-${version}.tar.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v4.x/${source}"
+source2="linux-${version}.tar.sign"
+source2_url="${KERNEL_URL}/pub/linux/kernel/v4.x/${source2}"
diff --git a/kernels/linux/info/patches/maintenance_patches_4/.info
b/kernels/linux/info/patches/maintenance_patches_4/.info
new file mode 100755
index 0000000..4e9015e
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_4/.info
@@ -0,0 +1,2 @@
+short=""
+help="Maintenance patches for the stable 4 kernel mostly security updates"
diff --git a/kernels/linux/info/patches/maintenance_patches_4/patch-4.0
b/kernels/linux/info/patches/maintenance_patches_4/patch-4.0
new file mode 100755
index 0000000..aeae014
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_4/patch-4.0
@@ -0,0 +1,5 @@
+patchversion="4.0.0"
+source=""
+source_url=""
+appliedkernels="4.0"
+md5sum=""
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 70a367c..460d969 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,8 +1,10 @@
+LATEST_4=4.0
LATEST_3=3.19
LATEST_2_6=2.6.39
LATEST_PRE_2_6=patch-2.6.39
LATEST_maintenance_patches=patch-2.6.39.4
LATEST_maintenance_patches_3=patch-3.19.3
+LATEST_maintenance_patches_4=patch-4.0
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.37.9
LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/kernels/linux/liblinux b/kernels/linux/liblinux
index f5f60f2..451e69d 100755
--- a/kernels/linux/liblinux
+++ b/kernels/linux/liblinux
@@ -362,7 +362,7 @@ function create_details()
BASE_KVER="$basekver"
fi
case "$BASE_KVER" in
- 3.[0-9]*)
+ 4*|3.[0-9]*)
. $KERNELS_DIRECTORY/${BASE_KVER}
echo ".
\${SPELL_DIRECTORY}/info/kernels/${BASE_KVER}"
echo "SOURCE=\$source"

[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (b7b01eada1078efe382558986bb1de22cef023f5), Ladislav Hagara, 04/13/2015