From 7ca9b39e2634a00c8af78f84f14fca369d946811 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 12:57:43 +0000 Subject: package_deb.bbclass: add epoch support --- classes/package_deb.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'classes/package_deb.bbclass') diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass index 9697426d5d..388f9819bd 100644 --- a/classes/package_deb.bbclass +++ b/classes/package_deb.bbclass @@ -138,7 +138,11 @@ python do_package_deb () { raise bb.build.FuncFailed("unable to open control file for writing.") fields = [] - fields.append(["Version: %s-%s\n", ['PV', 'PR']]) + pe = bb.data.getVar('PE', d, 1) + if pe and int(pe) > 0: + fields.append(["Version: %s:%s-%s\n", ['PE', 'PV', 'PR']]) + else: + fields.append(["Version: %s-%s\n", ['PV', 'PR']]) fields.append(["Description: %s\n", ['DESCRIPTION']]) fields.append(["Section: %s\n", ['SECTION']]) fields.append(["Priority: %s\n", ['PRIORITY']]) -- cgit v1.2.3 From 2893993b5767a8d3980f16b7e4b5bf596eb977a8 Mon Sep 17 00:00:00 2001 From: Rodrigo Vivi Date: Thu, 12 Apr 2007 14:10:48 +0000 Subject: package_deb.bbclass: add shebang, closes #2086 --- classes/package_deb.bbclass | 1 + 1 file changed, 1 insertion(+) (limited to 'classes/package_deb.bbclass') diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass index 388f9819bd..0c83e58a37 100644 --- a/classes/package_deb.bbclass +++ b/classes/package_deb.bbclass @@ -209,6 +209,7 @@ python do_package_deb () { scriptfile = file(os.path.join(controldir, script), 'w') except OSError: raise bb.build.FuncFailed("unable to open %s script file for writing." % script) + scriptfile.write("#!/bin/sh\n") scriptfile.write(scriptvar) scriptfile.close() os.chmod(os.path.join(controldir, script), 0755) -- cgit v1.2.3 From 1a7cff6077b770083062952ef6f6f7517bfd2c07 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 18 Apr 2007 21:22:03 +0000 Subject: classes: Add support for intertask dependencies to be specified, needed for correct operation with bitbake 1.8.x. Old behaviour is maintained in a special legacy anonymous function in base.bbclass. The patch is an improved version of the one discussed on the mailing list. --- classes/package_deb.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'classes/package_deb.bbclass') diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass index 0c83e58a37..d172fb1766 100644 --- a/classes/package_deb.bbclass +++ b/classes/package_deb.bbclass @@ -1,5 +1,7 @@ inherit package -DEPENDS_prepend="${@["dpkg-native ", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}" + +PACKAGE_EXTRA_DEPENDS += "dpkg-native fakeroot-native" + BOOTSTRAP_EXTRA_RDEPENDS += "dpkg" DISTRO_EXTRA_RDEPENDS += "dpkg" PACKAGE_WRITE_FUNCS += "do_package_deb" -- cgit v1.2.3 From 933172af0a4715960c3a7dd8c716ff2d9c1f4080 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 7 Aug 2007 15:03:19 +0000 Subject: package_deb/rootfs_deb.bbclass: Sync fixes from Poky --- classes/package_deb.bbclass | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'classes/package_deb.bbclass') diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass index d172fb1766..9a8db4f8f2 100644 --- a/classes/package_deb.bbclass +++ b/classes/package_deb.bbclass @@ -1,3 +1,7 @@ +# +# Copyright 2006-2007 OpenedHand Ltd. +# + inherit package PACKAGE_EXTRA_DEPENDS += "dpkg-native fakeroot-native" @@ -132,6 +136,7 @@ python do_package_deb () { continue controldir = os.path.join(root, 'DEBIAN') bb.mkdirhier(controldir) + os.chmod(controldir, 0755) try: ctrlfile = file(os.path.join(controldir, 'control'), 'wb') # import codecs @@ -150,7 +155,7 @@ python do_package_deb () { fields.append(["Priority: %s\n", ['PRIORITY']]) fields.append(["Maintainer: %s\n", ['MAINTAINER']]) fields.append(["Architecture: %s\n", ['TARGET_ARCH']]) - fields.append(["OE: %s\n", ['P']]) + fields.append(["OE: %s\n", ['PN']]) fields.append(["Homepage: %s\n", ['HOMEPAGE']]) # Package, Version, Maintainer, Description - mandatory -- cgit v1.2.3