r4606 - in dists/trunk/linux-2.6/debian: . arch/powerpc bin
templates
Bastian Blank
waldi at costa.debian.org
Sun Oct 23 11:09:01 UTC 2005
Author: waldi
Date: 2005-10-23 11:09:00 +0000 (Sun, 23 Oct 2005)
New Revision: 4606
Added:
dists/trunk/linux-2.6/debian/bin/install-header
Removed:
dists/trunk/linux-2.6/debian/templates/header-install.in
Modified:
dists/trunk/linux-2.6/debian/arch/powerpc/defines
dists/trunk/linux-2.6/debian/bin/gencontrol.py
dists/trunk/linux-2.6/debian/rules.real
Log:
* debian/arch/powerpc/defines: Set kernel-header-dirs.
* debian/bin/gencontrol.py: Export kernel-header-dirs as KERNEL_HEADER_DIRS.
* debian/bin/install-header:
- Move from debian/templates/header-install.in.
- Use KERNEL_HEADER_DIRS.
* debian/rules.real: Use debian/bin/install-header.
Modified: dists/trunk/linux-2.6/debian/arch/powerpc/defines
===================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/defines 2005-10-23 11:06:24 UTC (rev 4605)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/defines 2005-10-23 11:09:00 UTC (rev 4606)
@@ -5,6 +5,7 @@
powerpc-miboot
powerpc64
kernel-arch: ppc
+kernel-header-dirs: powerpc ppc ppc64 m68k
kpkg-subarch: powerpc
[apus]
Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
===================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py 2005-10-23 11:06:24 UTC (rev 4605)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py 2005-10-23 11:09:00 UTC (rev 4606)
@@ -331,7 +331,7 @@
makefile.append(("%s-%s-%s-%s:: %s-%s-%s-%s-real" % (i, arch, subarch, flavour, i, arch, subarch, flavour), None))
makeflags['FLAVOUR'] = flavour
- for i in (('compiler', 'COMPILER'), ('kpkg-subarch', 'KPKG_SUBARCH')):
+ for i in (('compiler', 'COMPILER'), ('kernel-header-dirs', 'KERNEL_HEADER_DIRS'), ('kpkg-subarch', 'KPKG_SUBARCH')):
if config_entry.has_key(i[0]):
makeflags[i[1]] = config_entry[i[0]]
makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
Copied: dists/trunk/linux-2.6/debian/bin/install-header (from rev 4597, dists/trunk/linux-2.6/debian/templates/header-install.in)
===================================================================
--- dists/trunk/linux-2.6/debian/templates/header-install.in 2005-10-22 21:25:08 UTC (rev 4597)
+++ dists/trunk/linux-2.6/debian/bin/install-header 2005-10-23 11:09:00 UTC (rev 4606)
@@ -0,0 +1,29 @@
+#!/bin/bash
+#
+# This is the make-kpkg hook file, which runs when make-kpkg is invoked
+# (from debian/rules) to create the flavour-independent kernel-headers
+# package. The major tasks it performs is removing unneeded
+# include/asm-* directories.
+#
+set -e
+set -x
+
+# The scripts/ directory should be supplied for each flavour, since some
+# archs do some *very* strange things...
+rm -rf scripts
+
+# XXX: once we're using a linux-headers-$(version)-$(debnum) that's Arch: all,
+# we'll want to drop this bit of code. The asm-* directories should remain.
+DIRS="generic $KERNEL_HEADER_DIRS"
+DIRS=($DIRS)
+
+for i in include/asm-*; do
+ case ${i#include/asm-} in
+ $DIRS)
+ ;;
+ *)
+ rm -rf "$i"
+ ;;
+ esac
+done
+
Property changes on: dists/trunk/linux-2.6/debian/bin/install-header
___________________________________________________________________
Name: svn:executable
+ *
Modified: dists/trunk/linux-2.6/debian/rules.real
===================================================================
--- dists/trunk/linux-2.6/debian/rules.real 2005-10-23 11:06:24 UTC (rev 4605)
+++ dists/trunk/linux-2.6/debian/rules.real 2005-10-23 11:09:00 UTC (rev 4606)
@@ -37,7 +37,7 @@
# in Makefile.inc. @flavour@ in the expressions is going to be
# replaced by the flavour for which the command is run.
#
-kpkg_header := HEADER_CLEAN_HOOK='$(CURDIR)/$(BUILD_DIR)/header-install-$(ARCH)-$(SUBARCH)'
+kpkg_header := HEADER_CLEAN_HOOK='$(CURDIR)/debian/bin/install-header'
kpkg_header += make-kpkg --append-to-version '$(KPKG_ABINAME)'
kpkg_header += --arch '$(ARCH)'
kpkg_header += --stem linux
@@ -79,9 +79,6 @@
setup-subarch: $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)
setup-flavour: $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
-$(BUILD_DIR)/header-install-$(ARCH)-$(SUBARCH): $(TEMPLATES_DIR)/header-install.in
- sed -e 's, at headers_dirs@,$(headers_dirs),g' '$<' > '$@'
- chmod u+x '$@'
#
# The way to make the correct package names is to make a
# subarch-specific post-install script...
@@ -248,7 +245,7 @@
install-header-$(ARCH)-$(SUBARCH): SOURCE_DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)
install-header-$(ARCH)-$(SUBARCH): DIR=$(BUILD_DIR)/$@
-install-header-$(ARCH)-$(SUBARCH): $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH) $(BUILD_DIR)/header-install-$(ARCH)-$(SUBARCH)
+install-header-$(ARCH)-$(SUBARCH): $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)
rm -rf '$(DIR)'
cp -al '$(SOURCE_DIR)' '$(DIR)'
cd '$(DIR)'; $(setup_env) $(kpkg_header) kernel-headers
Deleted: dists/trunk/linux-2.6/debian/templates/header-install.in
===================================================================
--- dists/trunk/linux-2.6/debian/templates/header-install.in 2005-10-23 11:06:24 UTC (rev 4605)
+++ dists/trunk/linux-2.6/debian/templates/header-install.in 2005-10-23 11:09:00 UTC (rev 4606)
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# This is the make-kpkg hook file, which runs when make-kpkg is invoked
-# (from debian/rules) to create the flavour-independent kernel-headers
-# package. The major tasks it performs is removing unneeded
-# include/asm-* directories.
-#
-set -e
-
-# The scripts/ directory should be supplied for each flavour, since some
-# archs do some *very* strange things...
-rm -rf scripts
-
-# XXX: once we're using a linux-headers-$(version)-$(debnum) that's Arch: all,
-# we'll want to drop this bit of code. The asm-* directories should remain.
-
-remove=
-cd include
-for i in asm-*; do
- case ${i#asm-} in
- generic | @headers_dirs@)
- ;;
- *)
- remove="$remove $i"
- ;;
- esac
-done
-${remove:+rm -r $remove}
-
More information about the Kernel-svn-changes
mailing list