From 2fa8612ab69e1359a9eebaf5f9caa798fac0056d Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Wed, 16 Mar 2005 13:44:49 +0000
Subject: [PATCH] Clifford Wolf: 	Always install linux24 and linux26
 headers 	Fixed lvm and joystick

[2005030409513811781] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5732 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/base/linux/config-500.in     |  7 ++++++
 package/base/linux/linux.conf        |  8 ++++++-
 package/base/lvm/lvm.conf            |  2 ++
 package/misc/joystick/hotfixes.patch | 32 ++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 package/misc/joystick/hotfixes.patch

diff --git a/package/base/linux/config-500.in b/package/base/linux/config-500.in
index 1be01df0a..28b9e0abf 100644
--- a/package/base/linux/config-500.in
+++ b/package/base/linux/config-500.in
@@ -30,6 +30,13 @@ then
 
 	pkgfork linux ${ROCKCFG_PKG_LINUX_HEADERS}-header stages 01-------9
 
+	if [ "$ROCKCFG_PKG_LINUX_HEADERS" = linux24 ]; then
+		pkgfork linux linux26-header stages ---3-----9
+	fi
+	if [ "$ROCKCFG_PKG_LINUX_HEADERS" = linux26 ]; then
+		pkgfork linux linux24-header stages ---3-----9
+	fi
+
 	bool 'Place linux24 sources in /usr/src' \
 		ROCKCFG_PKG_LINUX_SRC24 0
 
diff --git a/package/base/linux/linux.conf b/package/base/linux/linux.conf
index 1e31a0c3a..aa62915cd 100644
--- a/package/base/linux/linux.conf
+++ b/package/base/linux/linux.conf
@@ -347,7 +347,7 @@ main_lx_header() {
 	lx_config
 
 	if [ -z "$pkg_linux_cross" ]; then
-		incdir="$root/$prefix/include/"
+		incdir="$root/$prefix/include/linux$treever"
 	else
 		incdir="$root/$prefix/$pkg_linux_cross-unknown-linux-gnu/include"
 	fi
@@ -376,6 +376,12 @@ main_lx_header() {
 		cp -v $confdir/generate-asm . ; chmod +x ./generate-asm
 		./generate-asm $incdir
 	fi
+	if [ -z "$pkg_linux_cross" -a "linux$treever" = "$ROCKCFG_PKG_LINUX_HEADERS" ]; then
+		for x in $incdir/*; do
+			rm -rf $root/$prefix/include/${x##*/}
+			ln -sf linux$treever/${x##*/} $root/$prefix/include/${x##*/}
+		done
+	fi
 }
 
 main_lx() {
diff --git a/package/base/lvm/lvm.conf b/package/base/lvm/lvm.conf
index 8828bbde2..fa46130ea 100644
--- a/package/base/lvm/lvm.conf
+++ b/package/base/lvm/lvm.conf
@@ -25,6 +25,8 @@ var_append confopt " " "--sbindir=$root/lib/lvm"
 var_append confopt " " "--bindir=$root/lib/lvm"
 var_append confopt " " "--libdir=$root/lib"
 
+var_append CC_WRAPPER_APPEND " " "-I/usr/include/linux24"
+
 if [ "$ROCKCFG_LVM_MANPAGES" != "lvm" ] ; then
 	var_append confopt " " "--mandir=$builddir/trash/man"
 	var_append confopt " " "--infodir=$builddir/trash/info"
diff --git a/package/misc/joystick/hotfixes.patch b/package/misc/joystick/hotfixes.patch
new file mode 100644
index 000000000..00a73fa05
--- /dev/null
+++ b/package/misc/joystick/hotfixes.patch
@@ -0,0 +1,32 @@
+--- joystick-1.2.14/Makefile	1999-03-05 20:37:56.000000000 +0100
++++ joystick-1.2.14/Makefile	2005-03-04 10:10:03.510668744 +0100
+@@ -28,6 +28,7 @@
+ CC		= gcc
+ 
+ CPPFLAGS	= -I.#						# for joystick.h
++CPPFLAGS	+= -I /usr/include/linux24
+ 
+ CFLAGS		= -O2 -Wall -pipe -m486 -fomit-frame-pointer#	# i386
+ # CFLAGS	= -O2 -Wall -pipe -m68020 -ffixed-a2#		# m68k
+@@ -60,16 +61,13 @@
+ JOYOPRE		:= $(shell if [ -f .prerelease ]; then cat .prerelease; else echo 0; fi)
+ JOYPRE		:= $(shell expr $(JOYOPRE) + 1)
+ 
+-compile: joystick.o $(DRIVERS) $(PROGRAMS)
++compile: $(PROGRAMS)
+ 
+ install: compile
+-	mkdir -p $(MODDIR)
+-	rm -f $(MODDIR)/joy*.o
+-	cp joy*.o $(MODDIR)
+-	/sbin/depmod -a
+-	install -m 644 joystick.h /usr/include/linux
+-	install -m 755 jscal /usr/local/bin
+-	install -m 755 jstest /usr/local/bin
++	install -m 755 jscal /usr/bin
++	install -m 755 jstest /usr/bin
++	install -m 755 jsattach /usr/bin
++	cp *.txt /usr/share/doc/joystick/
+ 
+ joystick.o: joystick.c joystick.h
+ 	$(CC) $(CFLAGS) $(CPPFLAGS) $(MODFLAGS) -c joystick.c -o joystick.o