From 38107b5be08984e3cd98b2f1f19b73edd88329a7 Mon Sep 17 00:00:00 2001 From: "Andreas V. 'netrunner' Meier" Date: Sat, 24 Jul 2004 20:19:34 +0000 Subject: [PATCH] Andreas V. Meier: modutils: cleaned up, changing STRIP to DOSTRIP in Makefiles [2004071618593805752] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3610 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/modutils/modutils.conf | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/package/base/modutils/modutils.conf b/package/base/modutils/modutils.conf index 142c0dbd1..e8db527b7 100644 --- a/package/base/modutils/modutils.conf +++ b/package/base/modutils/modutils.conf @@ -20,7 +20,7 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -modutils_pm() { +modutils_postm() { cp -vf $confdir/modules.conf.data $root/etc/modules.conf mv -fv $root/sbin/lsmod$postfix $root/bin/ if [ -h $root/bin/lsmod$postfix ] ; then @@ -30,8 +30,14 @@ modutils_pm() { fi } -postmake="modutils_pm" -confopt="$confopt --sbindir=\$root/sbin --enable-insmod-static" +modutils_prem() { + find . -type f -exec sed -i -e 's,STRIP,DOSTRIP,' '{}' \; +} + +hook_add postmake 3 "modutils_postm" +hook_add premake 3 "modutils_prem" + +var_append confopt " " "--sbindir=\$root/sbin --enable-insmod-static" var_remove GCC_WRAPPER_APPEND " " "-s" postfix="" @@ -45,7 +51,7 @@ if [ -f $root/var/adm/flists/module-init-tools ] ; then postfix=".old" fi -export CFLAGS="$CFLAGS -I$root/usr/src/linux/include" +var_append CFLAGS "-I$root/usr/src/linux/include" # modutils is using $(STRIP) for install -s option var_remove makeopt " " 'STRIP="$STRIP"'