Fixed makefiles to reflect the new file locations.
svn path=/branches/kernel-image-2.6.11/; revision=3239
This commit is contained in:
parent
30edb4652d
commit
2466382945
|
@ -7,6 +7,8 @@
|
||||||
# It is possible to override the flavours by setting the flavours
|
# It is possible to override the flavours by setting the flavours
|
||||||
# variable.
|
# variable.
|
||||||
#
|
#
|
||||||
|
# This Makefile is run from the debian subdir
|
||||||
|
#
|
||||||
SHELL := sh -e
|
SHELL := sh -e
|
||||||
debver := $(version)-$(abiname)
|
debver := $(version)-$(abiname)
|
||||||
uver := $(subst .,_,$(version))
|
uver := $(subst .,_,$(version))
|
||||||
|
@ -106,13 +108,13 @@ build-stamp-$(subarch): unpack-stamp-$(subarch) $(bstamps)
|
||||||
|
|
||||||
binary-indep: build
|
binary-indep: build
|
||||||
binary-arch: build headers-stamp $(istamps)
|
binary-arch: build headers-stamp $(istamps)
|
||||||
mv *.deb ..
|
mv *.deb ../..
|
||||||
|
|
||||||
install-stamp-$(subarch)-%: build-$(subarch)-% build-stamp-$(subarch)-%
|
install-stamp-$(subarch)-%: build-$(subarch)-% build-stamp-$(subarch)-%
|
||||||
cp -al $< install-$*;
|
cp -al $< install-$*;
|
||||||
cd install-$*; \
|
cd install-$*; \
|
||||||
$(strip $(kpkg_image_pre) $(subst @flavour@,$*,$(kpkg_image_cmd)))
|
$(strip $(kpkg_image_pre) $(subst @flavour@,$*,$(kpkg_image_cmd)))
|
||||||
cat install-$*/debian/files >> debian/files;
|
cat install-$*/debian/files >> files;
|
||||||
rm -rf install-$*;
|
rm -rf install-$*;
|
||||||
touch install-stamp-$(subarch)-$*
|
touch install-stamp-$(subarch)-$*
|
||||||
|
|
||||||
|
@ -122,7 +124,7 @@ headers-stamp: $(kdir)
|
||||||
dh_installdirs
|
dh_installdirs
|
||||||
cp $(default) $(kdir)/.config
|
cp $(default) $(kdir)/.config
|
||||||
cd $(kdir); $(kpkg_headers_cmd)
|
cd $(kdir); $(kpkg_headers_cmd)
|
||||||
cat $(kdir)/debian/files >> debian/files
|
cat $(kdir)/debian/files >> files
|
||||||
touch headers-stamp
|
touch headers-stamp
|
||||||
|
|
||||||
binary: binary-indep binary-arch
|
binary: binary-indep binary-arch
|
||||||
|
|
|
@ -10,7 +10,7 @@ ktver := 5
|
||||||
#
|
#
|
||||||
SHELL := sh -e
|
SHELL := sh -e
|
||||||
kbpkg := kernel-kbuild-$(version)-$(abiname)
|
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)
|
karch := $(shell dpkg-architecture -qDEB_HOST_ARCH)
|
||||||
#
|
#
|
||||||
# If we are not passed a subarchs variable, we obtain the complete
|
# If we are not passed a subarchs variable, we obtain the complete
|
||||||
|
@ -19,7 +19,7 @@ karch := $(shell dpkg-architecture -qDEB_HOST_ARCH)
|
||||||
# flavours are built.
|
# flavours are built.
|
||||||
#
|
#
|
||||||
ifndef subarchs
|
ifndef subarchs
|
||||||
subarchs := $(shell find arch/$(karch) \
|
subarchs := $(shell find debian/arch/$(karch) \
|
||||||
-type d -mindepth 1 -maxdepth 1 \
|
-type d -mindepth 1 -maxdepth 1 \
|
||||||
! -name '.svn' ! -name 'patches' \
|
! -name '.svn' ! -name 'patches' \
|
||||||
-printf '%f\n')
|
-printf '%f\n')
|
||||||
|
@ -34,31 +34,32 @@ unpack: unpack-stamp
|
||||||
unpack-stamp:
|
unpack-stamp:
|
||||||
dh_testdir
|
dh_testdir
|
||||||
for i in $(subarchs); do \
|
for i in $(subarchs); do \
|
||||||
$(MAKE) subarch=$${i} unpack; \
|
cd debian && $(MAKE) subarch=$${i} unpack; \
|
||||||
done
|
done
|
||||||
ln -s $$(command -v touch) bin/touch.orig
|
ln -s $$(command -v touch) debian/bin/touch.orig
|
||||||
touch unpack-stamp
|
touch unpack-stamp
|
||||||
|
|
||||||
build: build-stamp
|
build: build-stamp
|
||||||
build-stamp: unpack-stamp
|
build-stamp: unpack-stamp
|
||||||
dh_testdir
|
dh_testdir
|
||||||
for i in $(subarchs); do \
|
for i in $(subarchs); do \
|
||||||
$(MAKE) subarch=$${i} build; \
|
cd debian && $(MAKE) subarch=$${i} build; \
|
||||||
done
|
done
|
||||||
touch build-stamp
|
touch build-stamp
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
dh_testdir
|
dh_testdir
|
||||||
rm -f *-stamp-* *-stamp config.*
|
cd debian; \
|
||||||
rm -f header-install-* post-install-* bin/touch.orig
|
rm -f *-stamp-* *-stamp config.*; \
|
||||||
rm -rf kernel-source-* build-* install-*
|
rm -f header-install-* post-install-* bin/touch.orig; \
|
||||||
|
rm -rf kernel-source-* build-* install-*
|
||||||
dh_clean
|
dh_clean
|
||||||
|
|
||||||
binary-indep: build
|
binary-indep: build
|
||||||
binary-arch: build
|
binary-arch: build
|
||||||
dh_testdir
|
dh_testdir
|
||||||
for i in $(subarchs); do \
|
for i in $(subarchs); do \
|
||||||
$(MAKE) subarch=$${i} binary; \
|
cd debian && $(MAKE) subarch=$${i} binary; \
|
||||||
done
|
done
|
||||||
|
|
||||||
binary: binary-indep binary-arch
|
binary: binary-indep binary-arch
|
||||||
|
|
Loading…
Reference in New Issue