Author: gotom
Date: 2005-07-10 17:41:19 +0000 (Sun, 10 Jul 2005)
New Revision: 937
Modified:
linux-kernel-headers/trunk/debian/changelog
linux-kernel-headers/trunk/debian/generate-asm.sh
linux-kernel-headers/trunk/debian/rules
Log:
- debian/rules: Move autoconf.h installation to generate-asm.sh when
biarch is used.
- debian/generate-asm.sh: Install autoconf.h to asm* instead of linux
when biarch is used.
Modified: linux-kernel-headers/trunk/debian/changelog
===================================================================
--- linux-kernel-headers/trunk/debian/changelog 2005-07-06 08:59:58 UTC (rev
936)
+++ linux-kernel-headers/trunk/debian/changelog 2005-07-10 17:41:19 UTC (rev
937)
@@ -1,3 +1,14 @@
+linux-kernel-headers (2.6.12.0-2) unstable; urgency=low
+
+ * GOTO Masanori <[EMAIL PROTECTED]>
+
+ - debian/rules: Move autoconf.h installation to generate-asm.sh when
+ biarch is used.
+ - debian/generate-asm.sh: Install autoconf.h to asm* instead of linux
+ when biarch is used.
+
+ -- GOTO Masanori <[EMAIL PROTECTED]> Sat, 2 Jul 2005 18:37:43 +0900
+
linux-kernel-headers (2.6.12.0-1) unstable; urgency=low
* GOTO Masanori <[EMAIL PROTECTED]>
Modified: linux-kernel-headers/trunk/debian/generate-asm.sh
===================================================================
--- linux-kernel-headers/trunk/debian/generate-asm.sh 2005-07-06 08:59:58 UTC
(rev 936)
+++ linux-kernel-headers/trunk/debian/generate-asm.sh 2005-07-10 17:41:19 UTC
(rev 937)
@@ -5,9 +5,10 @@
arch="$1"
dir_in="$2"
dir_out="$3"
+autoconf_in="$4"
-if [ ! -d "$dir_in" ]; then
- echo "$dir_in" does not exist, or is not a directory
+if [ ! -d "$dir_in" ] || [ ! -d "$autoconf_in" ]; then
+ echo "$dir_in" or "$autoconf_in" does not exist, or is not a directory
exit 1
fi
@@ -86,3 +87,26 @@
fi
done
+
+
+if [ -f $dir_out/$asm_dir/autoconf.h ] || [ -f
$dir_out/$asm_dir_biarch/autoconf.h ]; then
+ echo E: $asm_dir or $asm_dir_biarch already have autoconf.h.
+ exit 1
+fi
+
+cp "$autoconf_in"/autoconf-"$arch".h $dir_out/$asm_dir/autoconf.h
+cp "$autoconf_in"/autoconf-"$kernel_arch_biarch".h
$dir_out/$asm_dir_biarch/autoconf.h
+
+file_out="$dir_out/linux/autoconf.h"
+h=autoconf.h
+cat > $file_out <<EOF
+/* linux/autoconf.h is generated and point to the corresponding
+ * file in $asm_dir or $asm_dir_biarch.
+ */
+
+#ifdef $define_biarch
+# include <$asm_dir_biarch/$h>
+#else
+# include <$asm_dir/$h>
+#endif
+EOF
Modified: linux-kernel-headers/trunk/debian/rules
===================================================================
--- linux-kernel-headers/trunk/debian/rules 2005-07-06 08:59:58 UTC (rev
936)
+++ linux-kernel-headers/trunk/debian/rules 2005-07-10 17:41:19 UTC (rev
937)
@@ -32,13 +32,12 @@
install -d $(includedir)/linux
ifneq (,$(findstring $(DEB_HOST_ARCH), powerpc sparc))
- sh debian/generate-asm.sh $(DEB_HOST_ARCH) include $(includedir)
+ sh debian/generate-asm.sh $(DEB_HOST_ARCH) include $(includedir)
autoconfs
else
cp -a include/asm-$(kernel_arch) $(includedir)/asm
+ cp autoconfs/autoconf-$(DEB_HOST_ARCH).h $(includedir)/linux/autoconf.h
endif
- cp autoconfs/autoconf-$(DEB_HOST_ARCH).h $(includedir)/linux/autoconf.h
-
ifeq ($(kernel_arch),x86_64)
# install the i386 kernel headers in /usr/include/i386-linux
mkdir -p $(includedir)/i386-linux
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
