r3797 - in people/waldi/kernel/source/linux-2.6/debian: . bin
Bastian Blank
waldi at costa.debian.org
Tue Aug 9 22:39:24 UTC 2005
Author: waldi
Date: 2005-08-09 22:39:24 +0000 (Tue, 09 Aug 2005)
New Revision: 3797
Modified:
people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
people/waldi/kernel/source/linux-2.6/debian/rules
people/waldi/kernel/source/linux-2.6/debian/rules.real
Log:
debian/bin/gencontrol.py, debian/rules, debian/rules.real:
Rename unpack to setup.
Modified: people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py 2005-08-09 22:30:23 UTC (rev 3796)
+++ people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py 2005-08-09 22:39:24 UTC (rev 3797)
@@ -338,7 +338,7 @@
subarch_text = 'none'
subarch_vars['subarch'] = ''
- for i in ('binary', 'build', 'unpack'):
+ for i in ('binary', 'build', 'setup'):
makefile.append(("%s-%s:: %s-%s-%s" % (i, arch, i, arch, subarch_text), None))
makefile.append(("%s-%s-%s:: %s-%s-%s-real" % (i, arch, subarch_text, i, arch, subarch_text), None))
@@ -346,11 +346,11 @@
cmds_binary = []
cmds_binary.append(("$(MAKE) -f debian/rules.real binary-subarch %s" % subarch_makeflags,))
cmds_build = []
- cmds_unpack = []
- cmds_unpack.append(("$(MAKE) -f debian/rules.real unpack-subarch %s" % subarch_makeflags,))
+ cmds_setup = []
+ cmds_setup.append(("$(MAKE) -f debian/rules.real setup-subarch %s" % subarch_makeflags,))
makefile.append(("binary-%s-%s-real:" % (arch, subarch_text), cmds_binary))
makefile.append(("build-%s-%s-real:" % (arch, subarch_text), cmds_build))
- makefile.append(("unpack-%s-%s-real:" % (arch, subarch_text), cmds_unpack))
+ makefile.append(("setup-%s-%s-real:" % (arch, subarch_text), cmds_setup))
flavour_list = arches[arch][subarch].keys()
flavour_list.sort()
@@ -372,7 +372,7 @@
packages.append(process_package(headers[0], flavour_vars))
packages.extend(dummy_packages)
- for i in ('binary', 'build', 'unpack'):
+ for i in ('binary', 'build', 'setup'):
makefile.append(("%s-%s-%s:: %s-%s-%s-%s" % (i, arch, subarch_text, i, arch, subarch_text, flavour), None))
makefile.append(("%s-%s-%s-%s:: %s-%s-%s-%s-real" % (i, arch, subarch_text, flavour, i, arch, subarch_text, flavour), None))
@@ -382,11 +382,11 @@
cmds_binary.append(("$(MAKE) -f debian/rules.real binary-dummy PACKAGES_ARG='%s'" % ' '.join(["-p%s" % i['Package'] for i in dummy_packages]),))
cmds_build = []
cmds_build.append(("$(MAKE) -f debian/rules.real build %s" % flavour_makeflags,))
- cmds_unpack = []
- cmds_unpack.append(("$(MAKE) -f debian/rules.real unpack-flavour %s" % flavour_makeflags,))
+ cmds_setup = []
+ cmds_setup.append(("$(MAKE) -f debian/rules.real setup-flavour %s" % flavour_makeflags,))
makefile.append(("binary-%s-%s-%s-real:" % (arch, subarch_text, flavour), cmds_binary))
makefile.append(("build-%s-%s-%s-real:" % (arch, subarch_text, flavour), cmds_build))
- makefile.append(("unpack-%s-%s-%s-real:" % (arch, subarch_text, flavour), cmds_unpack))
+ makefile.append(("setup-%s-%s-%s-real:" % (arch, subarch_text, flavour), cmds_setup))
extra = read_template("extra")
packages.extend(process_packages(extra, vars))
Modified: people/waldi/kernel/source/linux-2.6/debian/rules
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/rules 2005-08-09 22:30:23 UTC (rev 3796)
+++ people/waldi/kernel/source/linux-2.6/debian/rules 2005-08-09 22:39:24 UTC (rev 3797)
@@ -155,14 +155,14 @@
mv debian/*.deb ..
touch debian/doc-stamp
-unpack: debian/unpack-stamp
-debian/unpack-stamp: $(BUILD_DIR) $(STAMPS_DIR) debian/patch-stamp
+setup: debian/setup-stamp
+debian/setup-stamp: $(BUILD_DIR) $(STAMPS_DIR) debian/patch-stamp
dh_testdir
- $(MAKE) -f debian/rules.gen unpack-$(DEB_BUILD_ARCH)
+ $(MAKE) -f debian/rules.gen setup-$(DEB_BUILD_ARCH)
touch $@
build: debian/control debian/build-stamp
-debian/build-stamp: $(BUILD_DIR) $(STAMPS_DIR) debian/unpack-stamp
+debian/build-stamp: $(BUILD_DIR) $(STAMPS_DIR) debian/setup-stamp
dh_testdir
$(MAKE) -f debian/rules.gen build-$(DEB_BUILD_ARCH)
touch $@
@@ -220,4 +220,4 @@
@echo
exit 1
-.PHONY: clean build unpack binary-indep binary-arch binary patch unpatch source tree
+.PHONY: clean build setup binary-indep binary-arch binary patch unpatch source tree
Modified: people/waldi/kernel/source/linux-2.6/debian/rules.real
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/rules.real 2005-08-09 22:30:23 UTC (rev 3796)
+++ people/waldi/kernel/source/linux-2.6/debian/rules.real 2005-08-09 22:39:24 UTC (rev 3797)
@@ -83,8 +83,8 @@
build: $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
-unpack-subarch: $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH)
-unpack-flavour: $(STAMPS_DIR)/unpack-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
+setup-subarch: $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH)
+setup-flavour: $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
install-flavour-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR=$(BUILD_DIR)/install-flavour-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
install-flavour-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
@@ -183,7 +183,7 @@
# by the headers-install script.
#
$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
-$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/unpack-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
+$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
ln -fs $$(command -v touch) debian/build/touch.orig
cd $(DIR); $(setup_env) PATH=$(CURDIR)/build:$(CURDIR)/bin:$(PATH) $(kpkg_image) build
cd $(DIR); $(if $(image_postproc),$(image_postproc),true)
@@ -198,9 +198,9 @@
#
# Creates a build directory for a particular flavour
#
-$(STAMPS_DIR)/unpack-$(ARCH)-$(SUBARCH)-$(FLAVOUR): SOURCE_DIR=$(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
-$(STAMPS_DIR)/unpack-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
-$(STAMPS_DIR)/unpack-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR) $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH)
+$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR): SOURCE_DIR=$(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
+$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
+$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR) $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH)
rm -rf $(DIR)
cp -al $(SOURCE_DIR) $(DIR)
cp $< $(DIR)/.config
@@ -219,4 +219,3 @@
dh_md5sums $(PACKAGES_ARG)
dh_builddeb $(PACKAGES_ARG)
-.PHONY: build unpack binary-indep binary-arch binary
More information about the Kernel-svn-changes
mailing list