debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

* 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.

svn path=/dists/trunk/linux-2.6/; revision=4606
This commit is contained in:
Bastian Blank 2005-10-23 11:09:00 +00:00
parent d529edbcfc
commit 4d89e2fa76
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/arch/powerpc/defines vendored
View File

@ -5,6 +5,7 @@ flavours:
powerpc-miboot
powerpc64
kernel-arch: ppc
kernel-header-dirs: powerpc ppc ppc64 m68k
kpkg-subarch: powerpc
[apus]

2
debian/bin/gencontrol.py vendored
View File

@ -331,7 +331,7 @@ def process_real_flavour(packages, makefile, config, arch, subarch, flavour, var
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()])

16
debian/templates/header-install.in → debian/bin/install-header vendored Normal file → Executable file
View File

@ -1,4 +1,4 @@
#!/bin/sh
#!/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
@ -6,6 +6,7 @@
# include/asm-* directories.
#
set -e
set -x
# The scripts/ directory should be supplied for each flavour, since some
# archs do some *very* strange things...
@ -13,17 +14,16 @@ 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)
remove=
cd include
for i in asm-*; do
case ${i#asm-} in
generic | @headers_dirs@)
for i in include/asm-*; do
case ${i#include/asm-} in
$DIRS)
;;
*)
remove="$remove $i"
rm -rf "$i"
;;
esac
done
${remove:+rm -r $remove}

7
debian/rules.real vendored
View File

@ -37,7 +37,7 @@ include debian/rules.defs
# 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-arch: $(STAMPS_DIR)/source
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,@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-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/build-$(ARCH)-$(SUBAR
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