Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (0d79d51ddff06c5ed3caf6ff2aa755bf751500e9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (0d79d51ddff06c5ed3caf6ff2aa755bf751500e9)
  • Date: Mon, 12 Apr 2010 01:39:02 -0500

GIT changes to master grimoire by Ismael Luceno <ismael.luceno AT gmail.com>:

ChangeLog | 3
FUNCTIONS | 179
++++++++++++++------------------------
audio-libs/libifp/CONFIGURE | 2
audio-libs/libifp/HISTORY | 3
audio-libs/libifp/INSTALL | 2
kde-apps/kdsl/FINAL | 2
kde-apps/kdsl/HISTORY | 3
kernels/ath5k/BUILD | 4
kernels/ath5k/HISTORY | 3
kernels/ath5k/INSTALL | 6 -
kernels/bluez-kernel/BUILD | 2
kernels/bluez-kernel/HISTORY | 3
kernels/cloop/BUILD | 2
kernels/cloop/HISTORY | 3
kernels/dazuko/BUILD | 4
kernels/dazuko/HISTORY | 3
kernels/madwifi/BUILD | 4
kernels/madwifi/HISTORY | 3
kernels/madwifi/INSTALL | 6 -
kernels/ndiswrapper/BUILD | 2
kernels/ndiswrapper/HISTORY | 3
kernels/ndiswrapper/INSTALL | 2
kernels/splashutils/HISTORY | 3
kernels/splashutils/PRE_BUILD | 2
kernels/virtualbox-module/BUILD | 2
kernels/virtualbox-module/HISTORY | 3
libs/klibc/HISTORY | 3
libs/klibc/PRE_BUILD | 2
net/bridge-utils/BUILD | 2
net/bridge-utils/HISTORY | 3
30 files changed, 131 insertions(+), 133 deletions(-)

New commits:
commit 0d79d51ddff06c5ed3caf6ff2aa755bf751500e9
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

FUNCTIONS: Fixed indentation

commit b9d6afb245d518181b602aa262057ba079e38c3a
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

FUNCTIONS: make the i var used by get_kernel_config_ver local

commit 29584f4d1abcefe1ee6c21edef1e4a8533747424
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

ChangeLog: fix

commit 194768ee664269e507c1918ab93fc65674caa86c
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

libifp: Fix kernel path

commit 38a24fbb5512e477bd9cf6b27364c79118d14fc7
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

kdsl: Fix kernel path

commit 5d5073b2a2a354b506b1b51ed0ed28764988eeae
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

ath5k: Fix kernel headers path

commit 7218d6709d2511a9a31b4fbd589c949eb2cd40f2
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

bluez-kernel: Fix kernel headers path

commit 183d03424f99d0a4cec4c5a15ac4cf3f7196e853
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

dazuko: Fix kernel headers path

commit 5e870aa0a5179a2eded36df5ca84be5bd8eb7f44
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

cloop: Fix kernel headers path

commit 32aa784ffeb82f06c0cb2c16a3180f3784e4d3ee
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

madwifi: Fix kernel headers path

commit f99a0a8fc4e18d8c4af7393c6fa548166d64a022
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

ndiswrapper: Fix kernel headers path

commit 7509dba11d8ee611de29f9c681ec9939c390459a
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

splashutils: Fix kernel headers path

commit 3ef4012efa551bafa4d7e2c00cb91c5493dfc695
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

virtualbox-module: Fix kernel headers path

commit 04b8a6961cc144b4f90e7441bd89852caf02e2bd
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

klibc: Fix kernel headers path

commit 075c67dff5461ba1852757f2d80997c222c98231
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

bridge-utils: Fix kernel headers path

commit 697e4792a617828824239b08614064ce0c6f2687
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

FUNCTIONS: Improve code reuse for get_*_kernel_config()

commit ad86ae3b98bda7a536fde9f33d9d9ca57a49a845
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

FUNCTIONS: make get_running_kernel_config() get kernel version from
get_running_kernel_version()

commit 26280553276ecc25e80e7140915e1b704de83115
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

FUNCTIONS: Remove duplicated code

commit 94e8948fa4a578af25f5c8cfa4b1369cf5b5631e
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

FUNCTIONS: Improved get_running_kernel_config()

And make it use the more standard /lib/modules path to get the kernel
config.

diff --git a/ChangeLog b/ChangeLog
index dc95ce7..5473802 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-04-11 Ismael Luceno <ismael AT sourcemage.org>
+ * FUNCTIONS: Removed duplicated code and improved
get_*_kernel_config()
+
2010-04-10 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libs/libmpc: arithmetic of complex numbers; needed for gcc 4.5

diff --git a/FUNCTIONS b/FUNCTIONS
index adbf3cf..b745deb 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -308,23 +308,23 @@ function mozilla_remove_nspr_nss() {
#-------------------------------------------------------------------------
function get_kernel_version()
{
- local KVER=$(installed_version linux)
- if [[ $KVER ]] ; then
- echo $KVER
- else
- KVER=$(installed_version linux-new)
- if [[ $KVER ]] ; then
- echo $KVER
- else
- KVER=$(grep version /usr/src/linux/.config | cut -d:
-f2 | cut -d ' ' -f2)
- if [ $KVER ] && [ -d "/lib/modules/${KVER}/build" ] ;
then
- echo $KVER
- else
- KVER=$(uname -r)
- echo $KVER
- fi
- fi
- fi
+ local KVER=$(installed_version linux)
+ if [[ $KVER ]] ; then
+ echo $KVER
+ else
+ KVER=$(installed_version linux-new)
+ if [[ $KVER ]] ; then
+ echo $KVER
+ else
+ KVER=$(grep version /usr/src/linux/.config | cut -d: -f2 | cut -d ' '
-f2)
+ if [ $KVER ] && [ -d "/lib/modules/${KVER}/build" ] ; then
+ echo $KVER
+ else
+ KVER=$(uname -r)
+ echo $KVER
+ fi
+ fi
+ fi
}

#---------------------------------------------------------------------------
@@ -335,16 +335,16 @@ function get_kernel_version()
#--------------------------------------------------------------------------
function invoke_uname_change()
{
- if [[ $(installed_version unamechange) ]] ; then
- export UNAME_CHANGE_SYSNAME=$(uname -s)
- export UNAME_CHANGE_NODENAME=$(uname -n)
- export UNAME_CHANGE_RELEASE=$(uname -r)
- export UNAME_CHANGE_VERSION=$(uname -v)
- export UNAME_CHANGE_MACHINE=$(uname -m)
- export UNAME_CHANGE_DOMAINNAME=$(uname -o)
-
- export LD_PRELOAD="${LD_PRELOAD} /usr/lib/unamechange.so"
- fi
+ if [[ $(installed_version unamechange) ]] ; then
+ export UNAME_CHANGE_SYSNAME=$(uname -s)
+ export UNAME_CHANGE_NODENAME=$(uname -n)
+ export UNAME_CHANGE_RELEASE=$(uname -r)
+ export UNAME_CHANGE_VERSION=$(uname -v)
+ export UNAME_CHANGE_MACHINE=$(uname -m)
+ export UNAME_CHANGE_DOMAINNAME=$(uname -o)
+
+ export LD_PRELOAD="${LD_PRELOAD} /usr/lib/unamechange.so"
+ fi
}

#-------------------------------------------------------------------------
@@ -354,44 +354,53 @@ function invoke_uname_change()
#-------------------------------------------------------------------------
function devoke_uname_change()
{
- if [[ $(installed_version unamechange) ]] ; then
- unset UNAME_CHANGE_SYSNAME
- unset UNAME_CHANGE_NODENAME
- unset UNAME_CHANGE_RELEASE
- unset UNAME_CHANGE_VERSION
- unset UNAME_CHANGE_MACHINE
- unset UNAME_CHANGE_DOMAINNAME
-
- export LD_PRELOAD="${LD_PRELOAD/\/usr\/lib\/unamechange.so/}"
- fi
+ if [[ $(installed_version unamechange) ]] ; then
+ unset UNAME_CHANGE_SYSNAME
+ unset UNAME_CHANGE_NODENAME
+ unset UNAME_CHANGE_RELEASE
+ unset UNAME_CHANGE_VERSION
+ unset UNAME_CHANGE_MACHINE
+ unset UNAME_CHANGE_DOMAINNAME
+
+ export LD_PRELOAD="${LD_PRELOAD/\/usr\/lib\/unamechange.so/}"
+ fi
}

#-----------------------------------------------------------------------
-## Get the running kernel config status of a some part of the kernel
-## given by $1. Used for spells that don't have linux triggers
+## Get the kernel config status of the kernel option specified by $2.
+## Kernel version is given by $1.
+##
+## If a configure file is found print the requested config status (if
+## any) and return 0, otherwise return 1.
+##-----------------------------------------------------------------------
+function get_kernel_config_ver()
+{
+ local i
+ for i in /proc/config /boot/config-"$1" /lib/modules/"$1"/build/.config
+ do
+ if [ -f "$i" ]; then
+ cat "$i" && break
+ elif [ -f "$i.gz" ]; then
+ zcat "$i.gz" && break
+ elif [ -f "$i.bz2" ]; then
+ bzcat "$i.bz2" && break
+ elif [ -f "$i.xz" ]; then
+ xzcat "$i.xz" && break
+ elif [ -f "$i.lzma" ]; then
+ xzcat "$i.lzma" && break
+ fi
+ done | grep "^$2=" | awk -F= '{ if ($2) { print $2 }; exit (!$2) }'
+}
+
+#-----------------------------------------------------------------------
+## Get the running kernel config status of the running kernel option
+## given by $1.
##
-## $1 string Config variable to look for
+## See also: get_specified_kernel_config
#-----------------------------------------------------------------------
function get_running_kernel_config()
{
- local KVER
- # use proc interface because even inside a uname change invoke this
- # still returns the version of the running kernel
- if [ -f /proc/sys/kernel/osrelease ] ; then
- KVER=$(cat /proc/sys/kernel/osrelease)
- else
- # apparently you don't have proc mount
- KVER=$(uname -r)
- fi
- if [ -f /proc/config.gz ] ; then
- echo $(zgrep "^$1=" /proc/config.gz | awk -F= '{ print $2 }')
- elif [ -f /boot/config-$KVER ] ; then
- echo $(grep "^$1=" /boot/config-$KVER | awk -F= '{ print $2
}')
- elif [ -f /usr/src/linux-$KVER/.config ] ; then
- echo $(grep "^$1=" /usr/src/linux-$KVER/.config | awk -F= '{
print $2 }')
- else
- echo "-1"
- fi
+ get_kernel_config_ver $(get_running_kernel_version) "$1"
}

#-------------------------------------------------------------------------
@@ -402,14 +411,7 @@ function get_running_kernel_config()
#-------------------------------------------------------------------------
function get_sorcery_kernel_config()
{
- local KVER=$(get_kernel_version)
- if [ -f /boot/config-$KVER ] ; then
- echo $(grep "^$1=" /boot/config-$KVER | awk -F= '{ print $2
}')
- elif [ -f /usr/src/linux-$KVER/.config ] ; then
- echo $(grep "^$1=" /usr/src/linux-$KVER/.config | awk -F= '{
print $2 }')
- else
- echo "-1"
- fi
+ get_kernel_config_ver $(get_kernel_version) || echo "-1"
}


@@ -590,31 +592,6 @@ function get_sorcery_kernel_version()
}

#-----------------------------------------------------------------------
-## Print the kernel config status of the running kernel for the option
-## defined in $1.
-## If a configure file is found print the requested config status (if
-## any) and return 0, otherwise return 1.
-#-----------------------------------------------------------------------
-function get_running_kernel_config()
-{
- if [[ -f /proc/config.gz ]]
- then
- zgrep "^$1=" /proc/config.gz | cut -d= -f2
- else
- local KVER="$(get_running_kernel_version)"
- if [[ -f "/boot/config-$KVER" ]]
- then
- grep "^$1=" "/boot/config-$KVER" | cut -d= -f2
- elif [[ -f "/usr/src/linux-$KVER/.config" ]]
- then
- grep "^$1=" "/usr/src/linux-$KVER/.config" | cut -d= -f2
- else
- return 1
- fi
- fi
-}
-
-#-----------------------------------------------------------------------
## Print the kernel config status of the installed linux spell for the
## option defined in $1.
## If the linux spell is installed and a configure file is found print
@@ -626,15 +603,7 @@ function get_sorcery_kernel_config()
local KVER="$(installed_version linux)"
if [[ $KVER ]]
then
- if [[ -f "/boot/config-$KVER" ]]
- then
- grep "^$1=" "/boot/config-$KVER" | cut -d= -f2
- elif [[ -f "/usr/src/linux-$KVER/.config" ]]
- then
- grep "^$1=" "/usr/src/linux-$KVER/.config" | cut -d= -f2
- else
- return 1
- fi
+ get_kernel_config_ver "$KVER" "$1"
else
return 1
fi
@@ -651,15 +620,7 @@ function get_kernel_config()
{
if [[ $USE_KERNEL_VERSION ]]
then
- if [[ -f "/boot/config-$USE_KERNEL_VERSION" ]]
- then
- grep "^$1=" "/boot/config-$USE_KERNEL_VERSION" | cut -d= -f2
- elif [[ -f "/usr/src/linux-$USE_KERNEL_VERSION/.config" ]]
- then
- grep "^$1=" "/usr/src/linux-$USE_KERNEL_VERSION/.config" | cut -d= -f2
- else
- return 1
- fi
+ get_kernel_config_ver "$USE_KERNEL_VERSION" "$1"
else
get_sorcery_kernel_config "$1" || get_running_kernel_config "$1"
fi
diff --git a/audio-libs/libifp/CONFIGURE b/audio-libs/libifp/CONFIGURE
index 23de165..1c286d4 100755
--- a/audio-libs/libifp/CONFIGURE
+++ b/audio-libs/libifp/CONFIGURE
@@ -2,5 +2,5 @@
if spell_ok linux; then
config_query_option KERMOD_OPTS \
"Build the kernel module ?" n \
- "--with-kmodule=${INSTALL_ROOT}/usr/src/linux-$(get_kernel_version)"
"--without-kmodule"
+
"--with-kmodule=${INSTALL_ROOT}/lib/modules/$(get_kernel_version)/build"
"--without-kmodule"
fi
diff --git a/audio-libs/libifp/HISTORY b/audio-libs/libifp/HISTORY
index 06a3001..3e823ca 100644
--- a/audio-libs/libifp/HISTORY
+++ b/audio-libs/libifp/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ismael Luceno <ismael AT sourcemage.org>
+ * CONFIGURE, INSTALL: Fix kernel path
+
2008-08-04 Julien "_kaze_" ROZO <julien AT rozo.org>
* BUILD, CONFIGURE, DEPENDS, DETAILS, HISTORY, INSTALL: spell created

diff --git a/audio-libs/libifp/INSTALL b/audio-libs/libifp/INSTALL
index d8312de..e6848ba 100755
--- a/audio-libs/libifp/INSTALL
+++ b/audio-libs/libifp/INSTALL
@@ -3,5 +3,5 @@ make install &&

# install the kernel module
if [[ $KERMOD_OPTS == --with-kmodule* ]]; then
- make -C ${INSTALL_ROOT}/usr/src/linux-$(get_kernel_version)
M=${SOURCE_DIRECTORY}/kbuild modules_install
+ make -C ${INSTALL_ROOT}/lib/modules/$(get_kernel_version)/build
M=${SOURCE_DIRECTORY}/kbuild modules_install
fi
diff --git a/kde-apps/kdsl/FINAL b/kde-apps/kdsl/FINAL
index 24688b4..4db8b5c 100755
--- a/kde-apps/kdsl/FINAL
+++ b/kde-apps/kdsl/FINAL
@@ -3,7 +3,7 @@ cat <<EOF
you need to add users to the 'ppp' group in order to use this program

EOF
-if grep -e "CONFIG_PPP is not set" -q /usr/src/linux/.config ;then
+if grep -e "CONFIG_PPP is not set" -q
/lib/modules/$(get_kernel_version)/build/.config ;then
cat <<EOF
you will need to rebuild your kernel with PPP support

diff --git a/kde-apps/kdsl/HISTORY b/kde-apps/kdsl/HISTORY
index 08f4c52..fff603c 100644
--- a/kde-apps/kdsl/HISTORY
+++ b/kde-apps/kdsl/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ismael Luceno <ismael AT sourcemage.org>
+ * FINAL: Fix kernel path
+
2006-06-29 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Removed BUILD_API=2, set grimoire-wide

diff --git a/kernels/ath5k/BUILD b/kernels/ath5k/BUILD
index 53f6a79..ce2620c 100755
--- a/kernels/ath5k/BUILD
+++ b/kernels/ath5k/BUILD
@@ -1,3 +1,3 @@
-make_single &&
-make KERNELPATH=/usr/src/linux-$(get_kernel_version) &&
+make_single &&
+make KERNELPATH=/lib/modules/$(get_kernel_version)/build &&
make_normal
diff --git a/kernels/ath5k/HISTORY b/kernels/ath5k/HISTORY
index be80731..70e41a0 100644
--- a/kernels/ath5k/HISTORY
+++ b/kernels/ath5k/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, INSTALL: Fix kernel headers path
+
2007-10-14 Eric Sandall <sandalle AT sourcemage.org>
* PREPARE, DETAILS, DEPENDS, BUILD, INSTALL, TRIGGERS: Created

diff --git a/kernels/ath5k/INSTALL b/kernels/ath5k/INSTALL
index df1c58e..55e3cd6 100755
--- a/kernels/ath5k/INSTALL
+++ b/kernels/ath5k/INSTALL
@@ -1,4 +1,4 @@
-make BINDIR=$INSTALL_ROOT/usr/sbin \
- MANDIR=$INSTALL_ROOT/usr/share/man \
- KERNELPATH=/usr/src/linux-$(get_kernel_version) \
+make BINDIR=$INSTALL_ROOT/usr/sbin \
+ MANDIR=$INSTALL_ROOT/usr/share/man \
+ KERNELPATH=/lib/modules/$(get_kernel_version)/build \
install
diff --git a/kernels/bluez-kernel/BUILD b/kernels/bluez-kernel/BUILD
index 33dba19..eb11e29 100755
--- a/kernels/bluez-kernel/BUILD
+++ b/kernels/bluez-kernel/BUILD
@@ -11,7 +11,7 @@ C=`expr $C + 1`
done
}
(
-./configure --with-kernel=/usr/src/linux \
+./configure --with-kernel=/lib/modules/$(get_kernel_version)/build \
--prefix=/usr \
$OPTS &&
cd $SOURCE_DIRECTORY/drivers &&
diff --git a/kernels/bluez-kernel/HISTORY b/kernels/bluez-kernel/HISTORY
index 71ed4df..84512c1 100644
--- a/kernels/bluez-kernel/HISTORY
+++ b/kernels/bluez-kernel/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: Fix kernel headers path
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/kernels/cloop/BUILD b/kernels/cloop/BUILD
index 2578a87..f8172ab 100755
--- a/kernels/cloop/BUILD
+++ b/kernels/cloop/BUILD
@@ -1 +1 @@
-make KERNEL_DIR=/usr/src/linux-$(get_kernel_version)
+make KERNEL_DIR=/lib/modules/$(get_kernel_version)/build
diff --git a/kernels/cloop/HISTORY b/kernels/cloop/HISTORY
index 46ec22a..73337cc 100644
--- a/kernels/cloop/HISTORY
+++ b/kernels/cloop/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: Fix kernel headers path
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/kernels/dazuko/BUILD b/kernels/dazuko/BUILD
index 665ce94..9fc5ee6 100755
--- a/kernels/dazuko/BUILD
+++ b/kernels/dazuko/BUILD
@@ -1,4 +1,2 @@
-local KVERS &&
-KVERS=$(get_kernel_version) &&
-./configure --kernelsrcdir=/usr/src/linux-$KVERS $OPTS &&
+./configure --kernelsrcdir=/lib/modules/$(get_kernel_version)/build $OPTS &&
make
diff --git a/kernels/dazuko/HISTORY b/kernels/dazuko/HISTORY
index 6e7099c..300791f 100644
--- a/kernels/dazuko/HISTORY
+++ b/kernels/dazuko/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: Fix kernel headers path
+
2008-09-05 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 2.3.5, fixed urls
* PREPARE: added warning and fail for recent kernels
diff --git a/kernels/madwifi/BUILD b/kernels/madwifi/BUILD
index 53f6a79..ce2620c 100755
--- a/kernels/madwifi/BUILD
+++ b/kernels/madwifi/BUILD
@@ -1,3 +1,3 @@
-make_single &&
-make KERNELPATH=/usr/src/linux-$(get_kernel_version) &&
+make_single &&
+make KERNELPATH=/lib/modules/$(get_kernel_version)/build &&
make_normal
diff --git a/kernels/madwifi/HISTORY b/kernels/madwifi/HISTORY
index cf1c076..772ce12 100644
--- a/kernels/madwifi/HISTORY
+++ b/kernels/madwifi/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, INSTALL: Fix kernel headers path
+
2008-11-22 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated subversion SOURCE_URL. Bug 14890

diff --git a/kernels/madwifi/INSTALL b/kernels/madwifi/INSTALL
index df1c58e..7d18d2b 100755
--- a/kernels/madwifi/INSTALL
+++ b/kernels/madwifi/INSTALL
@@ -1,4 +1,4 @@
-make BINDIR=$INSTALL_ROOT/usr/sbin \
- MANDIR=$INSTALL_ROOT/usr/share/man \
- KERNELPATH=/usr/src/linux-$(get_kernel_version) \
+make BINDIR=$INSTALL_ROOT/usr/sbin \
+ MANDIR=$INSTALL_ROOT/usr/share/man \
+ KERNELPATH=/lib/modules$(get_kernel_version)/build \
install
diff --git a/kernels/ndiswrapper/BUILD b/kernels/ndiswrapper/BUILD
index 4627280..40ca1ba 100755
--- a/kernels/ndiswrapper/BUILD
+++ b/kernels/ndiswrapper/BUILD
@@ -1 +1 @@
-make KVERS=$(get_kernel_version)
KBUILD=$INSTALL_ROOT/usr/src/linux-$(get_kernel_version)
+make KVERS=$(get_kernel_version)
KBUILD=$INSTALL_ROOT/lib/modules/$(get_kernel_version)/build
diff --git a/kernels/ndiswrapper/HISTORY b/kernels/ndiswrapper/HISTORY
index 43dd37d..dcb89d3 100644
--- a/kernels/ndiswrapper/HISTORY
+++ b/kernels/ndiswrapper/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, INSTALL: Fix kernel headers path
+
2010-02-01 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Only create ndiswrapper-svn if NDIS_SVN = y
* BUILD,INSTALL: Needs KBUILD to find the kernel
diff --git a/kernels/ndiswrapper/INSTALL b/kernels/ndiswrapper/INSTALL
index f84615e..8d5d5ca 100755
--- a/kernels/ndiswrapper/INSTALL
+++ b/kernels/ndiswrapper/INSTALL
@@ -1,2 +1,2 @@
-make KVERS=$(get_kernel_version)
KBUILD=$INSTALL_ROOT/usr/src/linux-$(get_kernel_version)
mandir=${INSTALL_ROOT}/usr/share/man install &&
+make KVERS=$(get_kernel_version)
KBUILD=$INSTALL_ROOT/lib/modules/$(get_kernel_version)/build
mandir=${INSTALL_ROOT}/usr/share/man install &&
mkdir -p /etc/ndiswrapper
diff --git a/kernels/splashutils/HISTORY b/kernels/splashutils/HISTORY
index 7e7cc82..cf9d4db 100644
--- a/kernels/splashutils/HISTORY
+++ b/kernels/splashutils/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ismael Luceno <ismael AT sourecmage.org>
+ * PRE_BUILD: Fix kernel headers path
+
2009-06-14 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: removed dep on klibc

diff --git a/kernels/splashutils/PRE_BUILD b/kernels/splashutils/PRE_BUILD
index ec3cbc1..db3bf37 100755
--- a/kernels/splashutils/PRE_BUILD
+++ b/kernels/splashutils/PRE_BUILD
@@ -37,4 +37,4 @@ sedit "s:/lib:$TRACK_ROOT/lib:" config.h &&
# Needs the linux source to build against.
# Uses get_kernel_version from $GRIMOIRE/FUNCTIONS
#
-ln -s $TRACK_ROOT/usr/src/linux-$(get_kernel_version) linux
+ln -s $TRACK_ROOT/lib/modules/$(get_kernel_version)/build linux
diff --git a/kernels/virtualbox-module/BUILD b/kernels/virtualbox-module/BUILD
index 390be20..a34d649 100755
--- a/kernels/virtualbox-module/BUILD
+++ b/kernels/virtualbox-module/BUILD
@@ -1 +1 @@
-make KERN_DIR=${INSTALL_ROOT}/usr/src/linux-$(get_kernel_version)
+make KERN_DIR=${INSTALL_ROOT}/lib/modules/$(get_kernel_version)/build
diff --git a/kernels/virtualbox-module/HISTORY
b/kernels/virtualbox-module/HISTORY
index 9f0e003..996942b 100644
--- a/kernels/virtualbox-module/HISTORY
+++ b/kernels/virtualbox-module/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ismael Luceno <ismael AT souremage.org>
+ * BUILD: Fix kernel headers path
+
2010-03-26 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.1.6

diff --git a/libs/klibc/HISTORY b/libs/klibc/HISTORY
index e7ad7db..82bc0c0 100644
--- a/libs/klibc/HISTORY
+++ b/libs/klibc/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ismael Luceno <ismael.luceno AT gmail.com>
+ * PRE_BUILD: Fix kernel headers path
+
2007-10-10 Martin Spitzbarth <m.spitzbarth AT gmx.de>
* PRE_BUILD: fixed the install path of the manpages

diff --git a/libs/klibc/PRE_BUILD b/libs/klibc/PRE_BUILD
index 6b8d00c..ae7d70e 100755
--- a/libs/klibc/PRE_BUILD
+++ b/libs/klibc/PRE_BUILD
@@ -15,4 +15,4 @@ sedit 's:$(prefix)/man:$(prefix)/share/man:' Makefile &&
# Needs the linux source to build against.
# Uses get_kernel_version from $GRIMOIRE/FUNCTIONS
#
-ln -s $TRACK_ROOT/usr/src/linux-$(get_kernel_version) linux
+ln -s $TRACK_ROOT/lib/modules/$(get_kernel_version)/build linux
diff --git a/net/bridge-utils/BUILD b/net/bridge-utils/BUILD
index 6003e35..bebc18f 100755
--- a/net/bridge-utils/BUILD
+++ b/net/bridge-utils/BUILD
@@ -1,4 +1,4 @@
-OPTS="$OPTS --with-linux-headers=${INSTALL_ROOT}/usr/src/linux" &&
+OPTS="$OPTS
--with-linux-headers=${INSTALL_ROOT}/lib/modules/$(get_kernel_version)/build"
&&
cd ${SOURCE_DIRECTORY} &&
aclocal &&
autoconf &&
diff --git a/net/bridge-utils/HISTORY b/net/bridge-utils/HISTORY
index 44137f8..0b71ba7 100644
--- a/net/bridge-utils/HISTORY
+++ b/net/bridge-utils/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: Fix kernel headers path
+
2009-09-24 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 1.4
* BUILD: added



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (0d79d51ddff06c5ed3caf6ff2aa755bf751500e9), Ismael Luceno, 04/12/2010

Archive powered by MHonArc 2.6.24.

Top of Page