Author: waldi
Date: Mon Sep 10 12:11:02 2007
New Revision: 9490
Log:
debian/rules.real: Cleanup CURDIR usage.
Modified:
dists/trunk/linux-2.6/debian/rules.real
Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real (original)
+++ dists/trunk/linux-2.6/debian/rules.real Mon Sep 10 12:11:02 2007
@@ -227,7 +227,7 @@
install-headers_$(ARCH)_$(FEATURESET): DH_OPTIONS = -p$(PACKAGE_NAME)
install-headers_$(ARCH)_$(FEATURESET): BASE_DIR = /usr/src/$(PACKAGE_NAME)
install-headers_$(ARCH)_$(FEATURESET): SOURCE_DIR =
$(BUILD_DIR)/source_$(ARCH)_$(FEATURESET)
-install-headers_$(ARCH)_$(FEATURESET): DIR =
$(CURDIR)/debian/$(PACKAGE_NAME)/$(BASE_DIR)
+install-headers_$(ARCH)_$(FEATURESET): DIR = debian/$(PACKAGE_NAME)/$(BASE_DIR)
install-headers_$(ARCH)_$(FEATURESET):
$(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET)
dh_testdir
dh_testroot
@@ -249,7 +249,7 @@
done; \
) \
| \
- cpio -pd --preserve-modification-time $(DIR)
+ cpio -pd --preserve-modification-time '$(CURDIR)/$(DIR)'
$(MAKE_SELF) install-base
install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): REAL_VERSION =
$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
@@ -260,84 +260,84 @@
install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): BASE_DIR =
/usr/src/$(PACKAGE_NAME)
install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): SOURCE_DIR =
$(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): REF_DIR =
$(BUILD_DIR)/source_$(ARCH)_$(FEATURESET)
-install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_DIR =
$(CURDIR)/debian/$(PACKAGE_NAME)
+install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_DIR =
debian/$(PACKAGE_NAME)
install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DIR =
$(PACKAGE_DIR)/$(BASE_DIR)
install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR):
$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
dh_testdir
dh_testroot
dh_clean -k -d
- mkdir -p "${DIR}/arch/${KERNEL_ARCH}/kernel"
- mkdir -p "${DIR}/include"
- cp -a ${SOURCE_DIR}/{.config,.kernel*,Module.symvers} "${DIR}"
+ mkdir -p $(DIR)/arch/$(KERNEL_ARCH)/kernel
+ mkdir -p $(DIR)/include
+ cp -a $(SOURCE_DIR)/{.config,.kernel*,Module.symvers} $(DIR)
- cd ${SOURCE_DIR}; \
+ cd $(SOURCE_DIR); \
find . -mindepth 1 -maxdepth 1 \
! -name debian -a ! -name Documentation -a ! -name include -a \
! -name DEBIAN -a ! -name scripts -a ! -name arch -a ! -name
'.*' -a \( \
-name Makefile -o -type d \) \
- -printf "../${PACKAGE_NAME_HEADERS}/%f\n" | \
- xargs ln -s --target-directory="${DIR}"
+ -printf "../$(PACKAGE_NAME_HEADERS)/%f\n" | \
+ xargs ln -s --target-directory='$(CURDIR)'/$(DIR)
- cd ${SOURCE_DIR}; \
- find "arch/${KERNEL_ARCH}" -mindepth 1 -maxdepth 1 \( \
+ cd $(SOURCE_DIR); \
+ find arch/$(KERNEL_ARCH) -mindepth 1 -maxdepth 1 \( \
-type d -a ! -name include -a ! -name kernel -o \
-type f -a \( -name 'Makefile*' -o -name 'Kconfig*' \) \) \
- -printf "../../../${PACKAGE_NAME_HEADERS}/%p\n" | \
- xargs ln -s --target-directory="${DIR}/arch/${KERNEL_ARCH}"
+ -printf "../../../$(PACKAGE_NAME_HEADERS)/%p\n" | \
+ xargs ln -s
--target-directory='$(CURDIR)'/$(DIR)/arch/$(KERNEL_ARCH)
- [ -d "${SOURCE_DIR}/arch/${KERNEL_ARCH}/include" ] && \
- cp -a "${SOURCE_DIR}/arch/${KERNEL_ARCH}/include"
"${DIR}/arch/${KERNEL_ARCH}/include" || :
- [ -f "${SOURCE_DIR}/arch/${KERNEL_ARCH}/kernel/asm-offsets.s" ] && \
- ln -f "${SOURCE_DIR}/arch/${KERNEL_ARCH}/kernel/asm-offsets.s"
"${DIR}/arch/${KERNEL_ARCH}/kernel" || :
- [ -f "${SOURCE_DIR}/arch/${KERNEL_ARCH}/module.lds" ] && \
- ln -f "${SOURCE_DIR}/arch/${KERNEL_ARCH}/module.lds"
"${DIR}/arch/${KERNEL_ARCH}" || :
- [ -f "${SOURCE_DIR}/arch/${KERNEL_ARCH}/kernel/module.lds" ] && \
- ln -f "${SOURCE_DIR}/arch/${KERNEL_ARCH}/kernel/module.lds"
"${DIR}/arch/${KERNEL_ARCH}" || :
- ln -s
"../../../../${PACKAGE_NAME_HEADERS}/arch/${KERNEL_ARCH}/kernel/Makefile"
"${DIR}/arch/${KERNEL_ARCH}/kernel"
+ [ -d $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/include ] && \
+ cp -a $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/include
$(DIR)/arch/$(KERNEL_ARCH)/include || :
+ [ -f $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/kernel/asm-offsets.s ] && \
+ ln -f $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/kernel/asm-offsets.s
$(DIR)/arch/$(KERNEL_ARCH)/kernel || :
+ [ -f $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/module.lds ] && \
+ ln -f $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/module.lds
$(DIR)/arch/$(KERNEL_ARCH) || :
+ [ -f $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/kernel/module.lds ] && \
+ ln -f $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/kernel/module.lds
$(DIR)/arch/$(KERNEL_ARCH) || :
+ ln -s
../../../../$(PACKAGE_NAME_HEADERS)/arch/$(KERNEL_ARCH)/kernel/Makefile
$(DIR)/arch/$(KERNEL_ARCH)/kernel
- cd ${SOURCE_DIR}; \
+ cd $(SOURCE_DIR); \
find include -mindepth 1 -maxdepth 1 \
! -name config -a ! -name linux -a ! -name 'asm*' \
- -printf "../../${PACKAGE_NAME_HEADERS}/%p\n" | \
- xargs ln -s --target-directory="${DIR}/include"
- cp -a ${SOURCE_DIR}/include/config "${DIR}/include"
+ -printf "../../$(PACKAGE_NAME_HEADERS)/%p\n" | \
+ xargs ln -s --target-directory='$(CURDIR)'/$(DIR)/include
+ cp -a $(SOURCE_DIR)/include/config $(DIR)/include
- ln -sf "asm-${KERNEL_ARCH}" "${DIR}/include/asm"
+ ln -sf asm-$(KERNEL_ARCH) $(DIR)/include/asm
- cd ${SOURCE_DIR}; \
- for dir in linux asm-generic $(foreach t, $(KERNEL_HEADER_DIRS),
asm-$(t)); do \
- mkdir "${DIR}/include/$$dir"; \
- for file in $$(find "include/$$dir" -mindepth 1 -maxdepth 1);
do \
- if [ -e ${CURDIR}/${REF_DIR}/$$file ]; then \
- ln -s --target-directory="${DIR}/include/$$dir"
"../../../${PACKAGE_NAME_HEADERS}/$$file"; \
- elif [ -d ${CURDIR}/${SOURCE_DIR}/$$file ]; then \
- cp -a "${CURDIR}/${SOURCE_DIR}/$$file"
"${DIR}/include/$$dir"; \
+ cd $(SOURCE_DIR); \
+ for dir in linux asm-generic $(foreach
t,$(KERNEL_HEADER_DIRS),asm-$(t)); do \
+ mkdir '$(CURDIR)'/$(DIR)/include/$$dir; \
+ for file in $$(find include/$$dir -mindepth 1 -maxdepth 1); do \
+ if [ -e '$(CURDIR)'/$(REF_DIR)/$$file ]; then \
+ ln -s
--target-directory='$(CURDIR)'/$(DIR)/include/$$dir
../../../$(PACKAGE_NAME_HEADERS)/$$file; \
+ elif [ -d '$(CURDIR)'/${SOURCE_DIR}/$$file ]; then \
+ cp -a '$(CURDIR)'/$(SOURCE_DIR)/$$file
'$(CURDIR)'/$(DIR)/include/$$dir; \
else \
- ln -f --target-directory="${DIR}/include/$$dir"
"${CURDIR}/${SOURCE_DIR}/$$file"; \
+ ln -f
--target-directory='$(CURDIR)'/$(DIR)/include/$$dir
'$(CURDIR)'/$(SOURCE_DIR)/$$file; \
fi \
done \
done
- mkdir -p "${PACKAGE_DIR}/lib/modules/${REAL_VERSION}"
- ln -s "/usr/src/${PACKAGE_NAME}"
"${PACKAGE_DIR}/lib/modules/${REAL_VERSION}/build"
+ mkdir -p $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)
+ ln -s /usr/src/$(PACKAGE_NAME)
$(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/build
- ln -s "../${PACKAGE_NAME_KBUILD}/scripts" "${DIR}"
+ ln -s ../$(PACKAGE_NAME_KBUILD)/scripts $(DIR)
$(MAKE_SELF) install-base
install-libc-dev_$(ARCH): PACKAGE_NAME = linux-libc-dev
install-libc-dev_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
install-libc-dev_$(ARCH): SOURCE_DIR = $(BUILD_DIR)/build-libc-dev
-install-libc-dev_$(ARCH): DIR = $(CURDIR)/debian/$(PACKAGE_NAME)/usr
+install-libc-dev_$(ARCH): DIR = debian/$(PACKAGE_NAME)/usr
install-libc-dev_$(ARCH): $(STAMPS_DIR)/build-libc-dev
dh_testdir
dh_testroot
dh_clean -d -k
- $(MAKE_CLEAN) -C '$(SOURCE_DIR)' headers_check ARCH=$(HEADERS_ARCH)
- $(MAKE_CLEAN) -C '$(SOURCE_DIR)' headers_install ARCH=$(HEADERS_ARCH)
INSTALL_HDR_PATH='$(DIR)'
+ $(MAKE_CLEAN) -C $(SOURCE_DIR) headers_check ARCH=$(HEADERS_ARCH)
+ $(MAKE_CLEAN) -C $(SOURCE_DIR) headers_install ARCH=$(HEADERS_ARCH)
INSTALL_HDR_PATH='$(DIR)'
# XXX: Needs to be removed from libc6-dev
- rm -rf '$(DIR)'/include/scsi
+ rm -rf $(DIR)/include/scsi
$(MAKE_SELF) install-base
# XXX: This needs to be moved into the config
@@ -351,7 +351,7 @@
install-support: PACKAGE_NAME = linux-support-$(UPSTREAMVERSION)$(ABINAME)
install-support: DH_OPTIONS = -p$(PACKAGE_NAME)
-install-support: PACKAGE_DIR = $(CURDIR)/debian/$(PACKAGE_NAME)
+install-support: PACKAGE_DIR = debian/$(PACKAGE_NAME)
install-support:
dh_testdir
dh_testroot
@@ -364,7 +364,7 @@
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): REAL_VERSION =
$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): PACKAGE_NAME =
linux-image-$(REAL_VERSION)
-install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): PACKAGE_DIR =
$(CURDIR)/debian/$(PACKAGE_NAME)
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): PACKAGE_DIR =
debian/$(PACKAGE_NAME)
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): INSTALL_DIR =
$(PACKAGE_DIR)/boot
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): DIR =
$(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): DH_OPTIONS =
-p$(PACKAGE_NAME)
@@ -431,7 +431,7 @@
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates:
install -d $(PACKAGE_DIR)/DEBIAN
- for i in $(notdir $(wildcard debian/templates/temp.image.plain/*)); do \
+ for i in $(wildcard debian/templates/temp.image.plain/*); do \
sed \
-e 's,=D,/boot,g' \
-e 's/=OF/YES/g' \
@@ -448,16 +448,16 @@
-e 's/=MD//g' \
-e 's/=R//g' \
-e 's/=S//g' \
- '$(CURDIR)'/debian/templates/temp.image.plain/$$i >
'$(PACKAGE_DIR)'/DEBIAN/$$i; \
+ $$i > $(PACKAGE_DIR)/DEBIAN/$$i; \
done
- chmod 755 '$(PACKAGE_DIR)'/DEBIAN/{config,{pre,post}*}
- chmod 644 '$(PACKAGE_DIR)'/DEBIAN/templates
+ chmod 755 $(PACKAGE_DIR)/DEBIAN/{config,{pre,post}*}
+ chmod 644 $(PACKAGE_DIR)/DEBIAN/templates
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_bug:
dh_installdirs usr/share/bug/$(PACKAGE_NAME)
dh_install debian/templates/image.plain.bug/*
usr/share/bug/$(PACKAGE_NAME)
- chmod 755 '$(PACKAGE_DIR)'/usr/share/bug/$(PACKAGE_NAME)/script
- echo "RELEASE='$(REAL_VERSION)'" >
'$(PACKAGE_DIR)'/usr/share/bug/$(PACKAGE_NAME)/info
+ chmod 755 $(PACKAGE_DIR)/usr/share/bug/$(PACKAGE_NAME)/script
+ echo "RELEASE='$(REAL_VERSION)'" >
$(PACKAGE_DIR)/usr/share/bug/$(PACKAGE_NAME)/info
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-s390-tape:
dh_testdir
@@ -468,29 +468,29 @@
$(MAKE_SELF) install-base
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen: MODULES_PACKAGE_NAME
= linux-modules-$(REAL_VERSION)
-install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen: MODULES_PACKAGE_DIR
= $(CURDIR)/debian/$(MODULES_PACKAGE_NAME)
-install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen: DH_OPTIONS =
-p$(PACKAGE_NAME) -p$(MODULES_PACKAGE_NAME)
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen: MODULES_PACKAGE_DIR
= debian/$(MODULES_PACKAGE_NAME)
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen: DH_OPTIONS =
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen:
dh_testdir
dh_testroot
dh_clean -d -k
- DH_OPTIONS= dh_installdirs -p$(PACKAGE_NAME) 'boot'
'var/lib/$(PACKAGE_NAME)'
- DH_OPTIONS= dh_installdirs -p$(MODULES_PACKAGE_NAME) 'boot'
+ dh_installdirs -p$(PACKAGE_NAME) boot 'var/lib/$(PACKAGE_NAME)'
+ dh_installdirs -p$(MODULES_PACKAGE_NAME) boot
ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
$(DEB_HOST_GNU_TYPE)-objcopy -g --strip-unneeded $(DIR)/vmlinux
$(DIR)/vmlinux-stripped
else
objcopy -g --strip-unneeded $(DIR)/vmlinux $(DIR)/vmlinux-stripped
endif
gzip -c -9 $(DIR)/vmlinux-stripped >
$(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
- $(MAKE_CLEAN) -C $(DIR) modules_install
INSTALL_MOD_PATH=$(MODULES_PACKAGE_DIR)
+ $(MAKE_CLEAN) -C $(DIR) modules_install
INSTALL_MOD_PATH='$(CURDIR)/$(MODULES_PACKAGE_DIR)'
cp $(DIR)/.config $(MODULES_PACKAGE_DIR)/boot/config-$(REAL_VERSION)
cp $(DIR)/System.map
$(MODULES_PACKAGE_DIR)/boot/System.map-$(REAL_VERSION)
rm $(MODULES_PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/{build,source}
- DH_OPTIONS= dh_installmodules -p$(MODULES_PACKAGE_NAME)
+ dh_installmodules -p$(MODULES_PACKAGE_NAME)
for i in $(XEN_VERSIONS); do echo $$i; done >
$(PACKAGE_DIR)/var/lib/$(PACKAGE_NAME)/xen-versions
install -d $(PACKAGE_DIR)/DEBIAN
echo /var/lib/$(PACKAGE_NAME)/xen-versions >>
$(PACKAGE_DIR)/DEBIAN/conffiles
- $(MAKE_SELF) install-base
+ $(MAKE_SELF) install-base DH_OPTIONS='-p$(PACKAGE_NAME)
-p$(MODULES_PACKAGE_NAME)'
install-patch: PACKAGE = linux-patch-debian-$(VERSION)
install-patch: pbase := /usr/src/kernel-patches/all/$(UPSTREAMVERSION)
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
