r3239 - branches/kernel-image-2.6.11/debian
Jurij Smakov
jurij-guest@costa.debian.org
Thu, 26 May 2005 01:53:38 +0000
Author: jurij-guest
Date: 2005-05-26 01:53:38 +0000 (Thu, 26 May 2005)
New Revision: 3239
Modified:
branches/kernel-image-2.6.11/debian/Makefile
branches/kernel-image-2.6.11/debian/rules
Log:
Fixed makefiles to reflect the new file locations.
Modified: branches/kernel-image-2.6.11/debian/Makefile
===================================================================
--- branches/kernel-image-2.6.11/debian/Makefile 2005-05-26 01:42:15 UTC (rev 3238)
+++ branches/kernel-image-2.6.11/debian/Makefile 2005-05-26 01:53:38 UTC (rev 3239)
@@ -7,6 +7,8 @@
# It is possible to override the flavours by setting the flavours
# variable.
#
+# This Makefile is run from the debian subdir
+#
SHELL := sh -e
debver := $(version)-$(abiname)
uver := $(subst .,_,$(version))
@@ -106,13 +108,13 @@
binary-indep: build
binary-arch: build headers-stamp $(istamps)
- mv *.deb ..
+ mv *.deb ../..
install-stamp-$(subarch)-%: build-$(subarch)-% build-stamp-$(subarch)-%
cp -al $< install-$*;
cd install-$*; \
$(strip $(kpkg_image_pre) $(subst @flavour@,$*,$(kpkg_image_cmd)))
- cat install-$*/debian/files >> debian/files;
+ cat install-$*/debian/files >> files;
rm -rf install-$*;
touch install-stamp-$(subarch)-$*
@@ -122,7 +124,7 @@
dh_installdirs
cp $(default) $(kdir)/.config
cd $(kdir); $(kpkg_headers_cmd)
- cat $(kdir)/debian/files >> debian/files
+ cat $(kdir)/debian/files >> files
touch headers-stamp
binary: binary-indep binary-arch
Modified: branches/kernel-image-2.6.11/debian/rules
===================================================================
--- branches/kernel-image-2.6.11/debian/rules 2005-05-26 01:42:15 UTC (rev 3238)
+++ branches/kernel-image-2.6.11/debian/rules 2005-05-26 01:53:38 UTC (rev 3239)
@@ -10,7 +10,7 @@
#
SHELL := sh -e
kbpkg := kernel-kbuild-$(version)-$(abiname)
-controls := $(wildcard arch/*/control.in arch/*/*/control.in)
+controls := $(wildcard debian/arch/*/control.in debian/arch/*/*/control.in)
karch := $(shell dpkg-architecture -qDEB_HOST_ARCH)
#
# If we are not passed a subarchs variable, we obtain the complete
@@ -19,7 +19,7 @@
# flavours are built.
#
ifndef subarchs
- subarchs := $(shell find arch/$(karch) \
+ subarchs := $(shell find debian/arch/$(karch) \
-type d -mindepth 1 -maxdepth 1 \
! -name '.svn' ! -name 'patches' \
-printf '%f\n')
@@ -34,31 +34,32 @@
unpack-stamp:
dh_testdir
for i in $(subarchs); do \
- $(MAKE) subarch=$${i} unpack; \
+ cd debian && $(MAKE) subarch=$${i} unpack; \
done
- ln -s $$(command -v touch) bin/touch.orig
+ ln -s $$(command -v touch) debian/bin/touch.orig
touch unpack-stamp
build: build-stamp
build-stamp: unpack-stamp
dh_testdir
for i in $(subarchs); do \
- $(MAKE) subarch=$${i} build; \
+ cd debian && $(MAKE) subarch=$${i} build; \
done
touch build-stamp
clean:
dh_testdir
- rm -f *-stamp-* *-stamp config.*
- rm -f header-install-* post-install-* bin/touch.orig
- rm -rf kernel-source-* build-* install-*
+ cd debian; \
+ rm -f *-stamp-* *-stamp config.*; \
+ rm -f header-install-* post-install-* bin/touch.orig; \
+ rm -rf kernel-source-* build-* install-*
dh_clean
binary-indep: build
binary-arch: build
dh_testdir
for i in $(subarchs); do \
- $(MAKE) subarch=$${i} binary; \
+ cd debian && $(MAKE) subarch=$${i} binary; \
done
binary: binary-indep binary-arch