* debian/bin/gencontrol.py, debian/lib/python/debian_linux/gencontrol.py
- Use _ as seperator. - Simplify logic. * debian/modules/gencontrol.py, debian/modules/rules.include, debian/rules: Use _ as seperator. svn path=/dists/trunk/linux-2.6/; revision=9576
This commit is contained in:
Bastian Blank
parent
42beec9f26
commit
8bacccee1a
|
|
@ -48,14 +48,10 @@ class Gencontrol(Base):
|
|||
package['Architecture'] = [arch]
|
||||
packages.append(package)
|
||||
|
||||
cmds_binary_arch = []
|
||||
cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-arch %s" % makeflags))
|
||||
cmds_source = []
|
||||
cmds_source.append(("$(MAKE) -f debian/rules.real source-arch %s" % makeflags,))
|
||||
makefile.append(("binary-arch-%s-real:" % arch, cmds_binary_arch))
|
||||
makefile.append(("build-%s-real:" % arch))
|
||||
makefile.append(("setup-%s-real:" % arch))
|
||||
makefile.append(("source-%s-real:" % arch, cmds_source))
|
||||
cmds_binary_arch = [("$(MAKE) -f debian/rules.real binary-arch-arch %s" % makeflags)]
|
||||
cmds_source = [("$(MAKE) -f debian/rules.real source-arch %s" % makeflags,)]
|
||||
makefile.append(("binary-arch_%s_real::" % arch, cmds_binary_arch))
|
||||
makefile.append(("source_%s_real::" % arch, cmds_source))
|
||||
|
||||
def do_featureset_setup(self, vars, makeflags, arch, featureset, extra):
|
||||
vars.update(self.config.get(('image', arch, featureset), {}))
|
||||
|
|
@ -79,14 +75,10 @@ class Gencontrol(Base):
|
|||
package_headers['Architecture'] = [arch]
|
||||
packages.append(package_headers)
|
||||
|
||||
cmds_binary_arch = []
|
||||
cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-featureset %s" % makeflags,))
|
||||
cmds_source = []
|
||||
cmds_source.append(("$(MAKE) -f debian/rules.real source-featureset %s" % makeflags,))
|
||||
makefile.append(("binary-arch-%s-%s-real:" % (arch, featureset), cmds_binary_arch))
|
||||
makefile.append("build-%s-%s-real:" % (arch, featureset))
|
||||
makefile.append(("setup-%s-%s-real:" % (arch, featureset)))
|
||||
makefile.append(("source-%s-%s-real:" % (arch, featureset), cmds_source))
|
||||
cmds_binary_arch = [("$(MAKE) -f debian/rules.real binary-arch-featureset %s" % makeflags,)]
|
||||
cmds_source = [("$(MAKE) -f debian/rules.real source-featureset %s" % makeflags,)]
|
||||
makefile.append(("binary-arch_%s_%s_real::" % (arch, featureset), cmds_binary_arch))
|
||||
makefile.append(("source_%s_%s_real::" % (arch, featureset), cmds_source))
|
||||
|
||||
def do_flavour_setup(self, vars, makeflags, arch, featureset, flavour, extra):
|
||||
vars.update(self.config.get(('image', arch, featureset, flavour), {}))
|
||||
|
|
@ -234,14 +226,12 @@ class Gencontrol(Base):
|
|||
cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags,))
|
||||
if packages_dummy:
|
||||
cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s' %s" % (' '.join(["-p%s" % i['Package'] for i in packages_dummy]), makeflags),))
|
||||
cmds_build = []
|
||||
cmds_build.append(("$(MAKE) -f debian/rules.real build %s" % makeflags,))
|
||||
cmds_setup = []
|
||||
cmds_setup.append(("$(MAKE) -f debian/rules.real setup-flavour %s" % makeflags,))
|
||||
makefile.append(("binary-arch-%s-%s-%s-real:" % (arch, featureset, flavour), cmds_binary_arch))
|
||||
makefile.append(("build-%s-%s-%s-real:" % (arch, featureset, flavour), cmds_build))
|
||||
makefile.append(("setup-%s-%s-%s-real:" % (arch, featureset, flavour), cmds_setup))
|
||||
makefile.append(("source-%s-%s-%s-real:" % (arch, featureset, flavour)))
|
||||
cmds_build = [("$(MAKE) -f debian/rules.real build %s" % makeflags,)]
|
||||
cmds_setup = [("$(MAKE) -f debian/rules.real setup-flavour %s" % makeflags,)]
|
||||
makefile.append(("binary-arch_%s_%s_%s_real::" % (arch, featureset, flavour), cmds_binary_arch))
|
||||
makefile.append(("build_%s_%s_%s_real::" % (arch, featureset, flavour), cmds_build))
|
||||
makefile.append(("setup_%s_%s_%s_real::" % (arch, featureset, flavour), cmds_setup))
|
||||
makefile.append(("source_%s_%s_%s_real::" % (arch, featureset, flavour)))
|
||||
|
||||
def do_extra(self, packages, makefile):
|
||||
apply = self.templates['patch.apply']
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ class Gencontrol(object):
|
|||
def do_main_makefile(self, makefile, makeflags, extra):
|
||||
cmds_binary_indep = []
|
||||
cmds_binary_indep.append(("$(MAKE) -f debian/rules.real binary-indep %s" % makeflags,))
|
||||
makefile.append(("binary-indep:", cmds_binary_indep))
|
||||
makefile.append(("binary-indep::", cmds_binary_indep))
|
||||
|
||||
def do_main_packages(self, packages, extra):
|
||||
pass
|
||||
|
|
@ -97,8 +97,8 @@ class Gencontrol(object):
|
|||
if i.has_key('X-Version-Overwrite-Epoch'):
|
||||
tmp.append("-v1:%s" % self.version['source'])
|
||||
cmds.append("$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-p%s' GENCONTROL_ARGS='%s'" % (i['Package'], ' '.join(tmp)))
|
||||
makefile.append("binary-arch-%s:: binary-arch-%s-extra" % (arch, arch))
|
||||
makefile.append(("binary-arch-%s-extra:" % arch, cmds))
|
||||
makefile.append("binary-arch_%s:: binary-arch_%s_extra" % (arch, arch))
|
||||
makefile.append(("binary-arch_%s_extra::" % arch, cmds))
|
||||
|
||||
def do_arch(self, packages, makefile, arch, vars, makeflags, extra):
|
||||
config_base = self.config['base', arch]
|
||||
|
|
@ -117,12 +117,14 @@ class Gencontrol(object):
|
|||
|
||||
def do_arch_makefile(self, makefile, arch, makeflags, extra):
|
||||
for i in self.makefile_targets:
|
||||
makefile.append("%s:: %s-%s" % (i, i, arch))
|
||||
makefile.append("%s-%s:: %s-%s-real" % (i, arch, i, arch))
|
||||
target1 = i
|
||||
target2 = "%s_%s" % (i, arch)
|
||||
makefile.append("%s:: %s" % (target1, target2))
|
||||
makefile.append("%s:: %s_real" % (target2, target2))
|
||||
makefile.append("%s_real::" % target2)
|
||||
|
||||
def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
|
||||
for i in self.makefile_targets:
|
||||
makefile.append("%s-%s-real:" % (i, arch))
|
||||
pass
|
||||
|
||||
def do_arch_recurse(self, packages, makefile, arch, vars, makeflags, extra):
|
||||
for featureset in self.config['base', arch]['featuresets']:
|
||||
|
|
@ -151,12 +153,14 @@ class Gencontrol(object):
|
|||
|
||||
def do_featureset_makefile(self, makefile, arch, featureset, makeflags, extra):
|
||||
for i in self.makefile_targets:
|
||||
makefile.append("%s-%s:: %s-%s-%s" % (i, arch, i, arch, featureset))
|
||||
makefile.append("%s-%s-%s:: %s-%s-%s-real" % (i, arch, featureset, i, arch, featureset))
|
||||
target1 = "%s_%s" % (i, arch)
|
||||
target2 = "%s_%s_%s" % (i, arch, featureset)
|
||||
makefile.append("%s:: %s" % (target1, target2))
|
||||
makefile.append("%s:: %s_real" % (target2, target2))
|
||||
makefile.append("%s_real::" % target2)
|
||||
|
||||
def do_featureset_packages(self, packages, makefile, arch, featureset, vars, makeflags, extra):
|
||||
for i in self.makefile_targets:
|
||||
makefile.append("%s-%s-%s-real:" % (i, arch, featureset))
|
||||
pass
|
||||
|
||||
def do_featureset_recurse(self, packages, makefile, arch, featureset, vars, makeflags, extra):
|
||||
for flavour in self.config['base', arch, featureset]['flavours']:
|
||||
|
|
@ -186,8 +190,11 @@ class Gencontrol(object):
|
|||
|
||||
def do_flavour_makefile(self, makefile, arch, featureset, flavour, makeflags, extra):
|
||||
for i in self.makefile_targets:
|
||||
makefile.append("%s-%s-%s:: %s-%s-%s-%s" % (i, arch, featureset, i, arch, featureset, flavour))
|
||||
makefile.append("%s-%s-%s-%s:: %s-%s-%s-%s-real" % (i, arch, featureset, flavour, i, arch, featureset, flavour))
|
||||
target1 = "%s_%s_%s" % (i, arch, featureset)
|
||||
target2 = "%s_%s_%s_%s" % (i, arch, featureset, flavour)
|
||||
makefile.append("%s:: %s" % (target1, target2))
|
||||
makefile.append("%s:: %s_real" % (target2, target2))
|
||||
makefile.append("%s_real::" % target2)
|
||||
|
||||
def do_flavour_packages(self, packages, makefile, arch, featureset, flavour, vars, makeflags, extra):
|
||||
pass
|
||||
|
|
|
|||
|
|
@ -47,15 +47,12 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
|
|||
|
||||
makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
|
||||
|
||||
cmds_binary_arch = []
|
||||
cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags_string,))
|
||||
cmds_build = []
|
||||
cmds_build.append(("$(MAKE) -f debian/rules.real build %s" % makeflags_string,))
|
||||
cmds_setup = []
|
||||
cmds_setup.append(("$(MAKE) -f debian/rules.real setup-flavour %s" % makeflags_string,))
|
||||
makefile.append(("binary-arch-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_binary_arch))
|
||||
makefile.append(("build-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_build))
|
||||
makefile.append(("setup-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_setup))
|
||||
cmds_binary_arch = [("$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags_string,)]
|
||||
cmds_build = [("$(MAKE) -f debian/rules.real build %s" % makeflags_string,)]
|
||||
cmds_setup = [("$(MAKE) -f debian/rules.real setup-flavour %s" % makeflags_string,)]
|
||||
makefile.append(("binary-arch_%s_%s_%s_real:" % (arch, subarch, flavour), cmds_binary_arch))
|
||||
makefile.append(("build_%s_%s_%s_real:" % (arch, subarch, flavour), cmds_build))
|
||||
makefile.append(("setup_%s_%s_%s_real:" % (arch, subarch, flavour), cmds_setup))
|
||||
|
||||
def process_config_version(self, config):
|
||||
entry = config['version',]
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ BUILD_STAMP = $(STAMPS_DIR)/build-base
|
|||
build: debian/control $(BUILD_STAMP)
|
||||
$(BUILD_STAMP): $(BUILD_DIR) $(STAMPS_DIR)
|
||||
dh_testdir
|
||||
$(MAKE) -f debian/rules.gen build-$(DEB_HOST_ARCH)
|
||||
$(MAKE) -f debian/rules.gen build_$(DEB_HOST_ARCH)
|
||||
touch $@
|
||||
|
||||
$(BUILD_DIR) $(STAMPS_DIR):
|
||||
|
|
@ -29,7 +29,7 @@ binary-indep:
|
|||
|
||||
binary-arch:
|
||||
dh_testdir
|
||||
$(MAKE) -f debian/rules.gen binary-arch-$(DEB_HOST_ARCH)
|
||||
$(MAKE) -f debian/rules.gen binary-arch_$(DEB_HOST_ARCH)
|
||||
|
||||
binary: binary-indep binary-arch
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ include debian/rules.defs
|
|||
source: debian/control $(STAMPS_DIR)/source-base
|
||||
$(STAMPS_DIR)/source-base: $(BUILD_DIR) $(STAMPS_DIR)
|
||||
dh_testdir
|
||||
$(MAKE) -f debian/rules.gen source-$(DEB_HOST_ARCH)
|
||||
$(MAKE) -f debian/rules.gen source_$(DEB_HOST_ARCH)
|
||||
touch $@
|
||||
|
||||
source-all: debian/control $(BUILD_DIR) $(STAMPS_DIR)
|
||||
|
|
@ -25,13 +25,13 @@ source-all: debian/control $(BUILD_DIR) $(STAMPS_DIR)
|
|||
setup: debian/control $(STAMPS_DIR)/setup-base
|
||||
$(STAMPS_DIR)/setup-base: $(STAMPS_DIR)/source-base
|
||||
dh_testdir
|
||||
$(MAKE) -f debian/rules.gen setup-$(DEB_HOST_ARCH)
|
||||
$(MAKE) -f debian/rules.gen setup_$(DEB_HOST_ARCH)
|
||||
touch $@
|
||||
|
||||
build: debian/control $(STAMPS_DIR)/build-base
|
||||
$(STAMPS_DIR)/build-base: $(STAMPS_DIR)/setup-base
|
||||
dh_testdir
|
||||
$(MAKE) -f debian/rules.gen build-$(DEB_HOST_ARCH)
|
||||
$(MAKE) -f debian/rules.gen build_$(DEB_HOST_ARCH)
|
||||
touch $@
|
||||
|
||||
$(BUILD_DIR) $(STAMPS_DIR):
|
||||
|
|
@ -63,7 +63,7 @@ binary-indep: $(STAMPS_DIR)/source-base
|
|||
|
||||
binary-arch: $(STAMPS_DIR)/build-base
|
||||
dh_testdir
|
||||
$(MAKE) -f debian/rules.gen binary-arch-$(DEB_HOST_ARCH)
|
||||
$(MAKE) -f debian/rules.gen binary-arch_$(DEB_HOST_ARCH)
|
||||
|
||||
binary: binary-indep binary-arch
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue