From 88c5a811f00e59cc1b6a2c9eb47f0958e52acba9 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Sat, 13 Sep 2003 14:21:33 +0000 Subject: [PATCH] Alejandro Mery : updates/fix lvs-1.0.10 for 2.4.22. tested - includes patch to cache because it's an 'O' package. - use pkg_*_pre.conf instead of parseconfig updates keepalived-1.1.2 tested git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1391 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 1 + package/mnemoc/keepalived/keepalived.desc | 4 +- package/mnemoc/lvs/lvs.cache | 10 ++-- package/mnemoc/lvs/parse-config | 56 ------------------- .../mnemoc/lvs/pkg_linux24-header_pre.conf | 23 ++++++++ package/mnemoc/lvs/pkg_linux24-src_pre.conf | 23 ++++++++ package/mnemoc/lvs/pkg_linux24_pre.conf | 52 +++++++++++++++++ 7 files changed, 106 insertions(+), 63 deletions(-) delete mode 100644 package/mnemoc/lvs/parse-config create mode 100644 package/mnemoc/lvs/pkg_linux24-header_pre.conf create mode 100644 package/mnemoc/lvs/pkg_linux24-src_pre.conf create mode 100644 package/mnemoc/lvs/pkg_linux24_pre.conf diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index c9632fedf..696169d76 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -8,6 +8,7 @@ xfree86 to not install config .bak files, zgv clarification, fixed some pkgcheck mis-use - fixed a typo in xjdic - which never could have been build! + - Alejandro Mery: updated lvs and keepalived *) 2003-09-12 (2.0.0-rc1 - 2.0.0-rc2) diff --git a/package/mnemoc/keepalived/keepalived.desc b/package/mnemoc/keepalived/keepalived.desc index 630d3f4d4..497a627f5 100644 --- a/package/mnemoc/keepalived/keepalived.desc +++ b/package/mnemoc/keepalived/keepalived.desc @@ -43,8 +43,8 @@ [L] GPL [S] Stable -[V] 1.1.1 +[V] 1.1.2 [P] X -----5---9 790.000 -[D] 3726062920 keepalived-1.1.1.tar.gz http://keepalived.sourceforge.net/software/ +[D] 3583696146 keepalived-1.1.2.tar.gz http://keepalived.sourceforge.net/software/ diff --git a/package/mnemoc/lvs/lvs.cache b/package/mnemoc/lvs/lvs.cache index 9ae2dccf1..1070b4c50 100644 --- a/package/mnemoc/lvs/lvs.cache +++ b/package/mnemoc/lvs/lvs.cache @@ -20,14 +20,14 @@ [COPY] [COPY] --- ROCK-COPYRIGHT-NOTE-END --- -[TIMESTAMP] 1057640291 Tue Jul 8 00:58:11 2003 -[CONFIG-ID] 2.0.0-rc1-x86-pentium-mmx-mnemosyne-expert -[ROCKVER] 2.0.0-rc1 +[TIMESTAMP] 1063206561 Wed Sep 10 11:09:21 2003 +[CONFIG-ID] 2.0.0-rc2-x86-pentium2-32-mnemosyne-expert +[ROCKVER] 2.0.0-rc2 [LOGS] 5-lvs.log 9-lvs.log -[BUILDTIME] 2749 (9) -[SIZE] 0.10 MB, 17 files +[BUILDTIME] 2742 (9) +[SIZE] 0.08 MB, 16 files [DEP] bash binutils bzip2 coreutils findutils gcc33 glibc23 grep [DEP] linux24-src lvs make popt sed sysfiles tar diff --git a/package/mnemoc/lvs/parse-config b/package/mnemoc/lvs/parse-config deleted file mode 100644 index 98b78f74a..000000000 --- a/package/mnemoc/lvs/parse-config +++ /dev/null @@ -1,56 +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/mnemoc/lvs/parse-config -# 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 --- - -if pkgcheck lvs X; then - if [ ${pkg:0:7} == linux24 ]; then - echo_status "Including IP Virtual Server (lvs) patch..." - - pkg_lvs_confdir=$base/package/mnemoc/lvs - pkg_lvs_archdir=$base/download/mnemoc/lvs - - pkg_lvs_ver=`sed -n 's,^\[V\] \(.*\),\1,p' ${pkg_lvs_confdir}/lvs.desc` - pkg_lvs_srctar="ipvs-$pkg_lvs_ver.tar.bz2" - - pkg_lvs_tempdir=`mktemp -d` - pushd $pkg_lvs_tempdir > /dev/null - tar $taropt $pkg_lvs_archdir/$pkg_lvs_srctar - cd * ; for x in *.diff; do - mv "$x" "lvs-$pkg_lvs_ver-${x%.diff}.patch" - done - rm -rf ipvs/ipvsadm - mv ipvs/linux_net_ipv4_ipvs_Makefile ipvs/Makefile - popd > /dev/null - - pkg_lvs_patchdir=$pkg_lvs_tempdir/ipvs-$pkg_lvs_ver - - # pre/postpatch actions.... add ipvs source - hook_add prepatch 4 "cp -vrp $pkg_lvs_patchdir/ipvs net/ipv4" - hook_add postpatch 4 "rm -rf $pkg_lvs_tempdir" - - # configure kernel - var_append conffiles ' ' "$pkg_lvs_confdir/kernel.conf.sh" - - # patch kernel - patchfiles="$patchfiles `echo $pkg_lvs_patchdir/*.patch`" - fi -fi - diff --git a/package/mnemoc/lvs/pkg_linux24-header_pre.conf b/package/mnemoc/lvs/pkg_linux24-header_pre.conf new file mode 100644 index 000000000..9df1af2ba --- /dev/null +++ b/package/mnemoc/lvs/pkg_linux24-header_pre.conf @@ -0,0 +1,23 @@ +# --- 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/mnemoc/lvs/pkg_linux24-header_pre.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 --- + +. $base/package/mnemoc/lvs/pkg_linux24_pre.conf diff --git a/package/mnemoc/lvs/pkg_linux24-src_pre.conf b/package/mnemoc/lvs/pkg_linux24-src_pre.conf new file mode 100644 index 000000000..e2ef162d4 --- /dev/null +++ b/package/mnemoc/lvs/pkg_linux24-src_pre.conf @@ -0,0 +1,23 @@ +# --- 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/mnemoc/lvs/pkg_linux24-src_pre.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 --- + +. $base/package/mnemoc/lvs/pkg_linux24_pre.conf diff --git a/package/mnemoc/lvs/pkg_linux24_pre.conf b/package/mnemoc/lvs/pkg_linux24_pre.conf new file mode 100644 index 000000000..23b8713b0 --- /dev/null +++ b/package/mnemoc/lvs/pkg_linux24_pre.conf @@ -0,0 +1,52 @@ +# --- 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/mnemoc/lvs/pkg_linux24_pre.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 --- + +echo_status "Including IP Virtual Server (lvs) patch..." + +pkg_lvs_confdir=$base/package/mnemoc/lvs +pkg_lvs_archdir=$base/download/mnemoc/lvs + +pkg_lvs_ver=`sed -n 's,^\[V\] \(.*\),\1,p' ${pkg_lvs_confdir}/lvs.desc` +pkg_lvs_srctar="ipvs-$pkg_lvs_ver.tar.bz2" + +pkg_lvs_tempdir=`mktemp -d` +pushd $pkg_lvs_tempdir > /dev/null +tar $taropt $pkg_lvs_archdir/$pkg_lvs_srctar +cd * ; for x in *.diff; do + mv "$x" "lvs-$pkg_lvs_ver-${x%.diff}.patch" +done +rm -rf ipvs/ipvsadm +mv ipvs/linux_net_ipv4_ipvs_Makefile ipvs/Makefile +popd > /dev/null + +pkg_lvs_patchdir=$pkg_lvs_tempdir/ipvs-$pkg_lvs_ver + +# pre/postpatch actions.... add ipvs source +hook_add prepatch 4 "cp -vrp $pkg_lvs_patchdir/ipvs net/ipv4" +hook_add postpatch 4 "rm -rf $pkg_lvs_tempdir" + +# configure kernel +var_append confscripts ' ' "$pkg_lvs_confdir/kernel.conf.sh" + +# patch kernel +patchfiles="$patchfiles `echo $pkg_lvs_patchdir/*.patch`" +