Browse Source

more inteligent apply_patchfiles, converted linux packages to use

patchfiles and so copy all patches (#105)


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1124 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
rocklinux
Rene Rebe 21 years ago
parent
commit
5e13a4ed63
10 changed files with 25 additions and 24 deletions
  1. +2
    -0
      Documentation/Developers/CHANGELOG-RENE
  2. +1
    -1
      package/base/linux24-header-cross/linux24-header-cross.desc
  3. +1
    -1
      package/base/linux24-header/linux24-header.desc
  4. +1
    -1
      package/base/linux24-src/linux24-src.desc
  5. +1
    -1
      package/base/linux24/linux24.desc
  6. +10
    -15
      package/base/linux24/lx_config.sh
  7. +1
    -1
      package/powerpc/linux24benh-header/linux24benh-header.desc
  8. +1
    -1
      package/powerpc/linux24benh-src/linux24benh-src.desc
  9. +1
    -1
      package/powerpc/linux24benh/linux24benh.desc
  10. +6
    -2
      scripts/functions

+ 2
- 0
Documentation/Developers/CHANGELOG-RENE

@ -10,6 +10,8 @@
- removed /tmp mounting from system.init - fails with real filesystem
- relaced some $( cd foo/bar ; ls ) with a direct $( ls foo/bar/ )
- rmoved sanity check for libart since it does not need glib ...
- more inteligent apply_patchfiles, converted linux packages to use
patchfiles and so copy all patches (#105)
*) 2003-08-18 (2.0.0-camp - 2.0.0-rc1)

+ 1
- 1
package/base/linux24-header-cross/linux24-header-cross.desc

@ -39,7 +39,7 @@
[E] group kernel-header
[O] vanilla_ver="2.4.21"
[O] lx_patches="i2c-2.7.0-2.4.21-rc6.patch.bz2 acpi-20030619-2.4.21.diff.bz2"
[O] var_append patchfiles " " "i2c-2.7.0-2.4.21-rc6.patch.bz2 acpi-20030619-2.4.21.diff.bz2"
[L] GPL
[S] Stable

+ 1
- 1
package/base/linux24-header/linux24-header.desc

@ -39,7 +39,7 @@
[E] group kernel-header
[O] vanilla_ver="2.4.21"
[O] var_append lx_patches " " "i2c-2.8.0-2.4.21.patch acpi-20030619-2.4.21.diff.bz2"
[O] var_append patchfiles " " "i2c-2.8.0-2.4.21.patch acpi-20030619-2.4.21.diff.bz2"
[L] GPL
[S] Stable

+ 1
- 1
package/base/linux24-src/linux24-src.desc

@ -39,7 +39,7 @@
[E] group kernel-src
[O] vanilla_ver="2.4.21"
[O] var_append lx_patches " " "i2c-2.8.0-2.4.21.patch acpi-20030619-2.4.21.diff.bz2"
[O] var_append patchfiles " " "i2c-2.8.0-2.4.21.patch acpi-20030619-2.4.21.diff.bz2"
[L] GPL
[S] Stable

+ 1
- 1
package/base/linux24/linux24.desc

@ -42,7 +42,7 @@
[P] X -1---5---9 109.000
[O] vanilla_ver="2.4.21"
[O] var_append lx_patches " " "i2c-2.8.0-2.4.21.patch acpi-20030619-2.4.21.diff.bz2"
[O] var_append patchfiles " " "i2c-2.8.0-2.4.21.patch acpi-20030619-2.4.21.diff.bz2"
[D] 4044266806 linux-2.4.21.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.4/
[D] 2504740549 i2c-2.8.0-2.4.21.patch !http://www.ensicaen.ismra.fr/~delvare/devel/i2c/linux-2.4.21-i2c-2.8.0.patch

+ 10
- 15
package/base/linux24/lx_config.sh

@ -32,26 +32,21 @@ lx_cpu=`echo "$arch_machine" | sed -e s/x86/i386/ \
MAKE="$MAKE ARCH=$lx_cpu CROSS_COMPILE=$archprefix KCC=$KCC"
# correct the abolute path for patchfiles supplied in the .conf file
for x in $patchfiles ; do
if [ ! -e $x ] ; then
var_remove patchfiles " " $x
x=$archdir/$x
var_append parchfiles " " $x
fi
done
lx_config ()
{
echo "Generic linux source patching and configuration ..."
for x in $lx_patches ; do
echo "Applying $x ..."
[ -e $x ] || x=$archdir/$x
if [[ $x = *.bz2 ]] ; then
bzcat $x | patch -p1 -s
else
cat $x | patch -p1 -s
fi
done
hook_eval prepatch
echo "Patching ..."
for x in $patchfiles ; do
echo "Applying '$x' ..."
patch -p1 -s < $x
done
apply_patchfiles
hook_eval postpatch
echo "Redefining some VERSION flags ..."

+ 1
- 1
package/powerpc/linux24benh-header/linux24benh-header.desc

@ -39,7 +39,7 @@
[E] group kernel-src
[O] vanilla_ver="2.4.21"
[O] lx_patches="patch-2.4.21-ben2.bz2"
[O] var_append patchfiles " " "patch-2.4.21-ben2.bz2"
[L] GPL
[S] Stable

+ 1
- 1
package/powerpc/linux24benh-src/linux24benh-src.desc

@ -39,7 +39,7 @@
[E] group kernel-src
[O] vanilla_ver="2.4.21"
[O] lx_patches="patch-2.4.21-ben2.bz2"
[O] var_append patchfiles " " "patch-2.4.21-ben2.bz2"
[L] GPL
[S] Stable

+ 1
- 1
package/powerpc/linux24benh/linux24benh.desc

@ -42,7 +42,7 @@
[R] + powerpc
[O] vanilla_ver="2.4.21"
[O] lx_patches="patch-2.4.21-ben2.bz2"
[O] var_append patchfiles " " "patch-2.4.21-ben2.bz2"
[D] 4044266806 linux-2.4.21.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.4/
[D] 2875783741 patch-2.4.21-ben2.bz2 ftp://ftp.kernel.org/pub/linux/kernel/people/benh/

+ 6
- 2
scripts/functions

@ -411,8 +411,12 @@ register_badfiles() {
apply_patchfiles() {
for x in $patchfiles; do
echo "Apply patch $x ..."
eval "patch $patchopt < $x"
done
if [[ $x = *.bz2 ]] ; then
bzcat $x | patch $patchopt
else
eval patch $patchopt < $x
fi
done
}
# Main program for building a package

Loading…
Cancel
Save