From a780643c4b6aa11e1a36965a69df7116477c7b4c Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Tue, 7 Dec 2004 22:05:47 +0000 Subject: Merge oe-devel@oe-devel.bkbits.net:packages.bb into handhelds.org:/home/kergoth/code/packages.bb 2004/12/07 04:58:25-06:00 ti.com!kergoth More updates per the core rename. 2004/12/07 04:46:51-06:00 ti.com!kergoth Update soundtracker per the core rename. 2004/12/07 04:44:14-06:00 ti.com!kergoth Merge 2004/12/07 04:42:38-06:00 ti.com!kergoth Updates per the recent rename of the oe core from 'oe' to 'bitbake'. BKrev: 41b6293b91LRHSxMOt6WnrZVAdLbFw --- classes/package_ipk.bbclass | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 classes/package_ipk.bbclass (limited to 'classes/package_ipk.bbclass') diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass new file mode 100644 index 0000000000..e69de29bb2 -- cgit v1.2.3 From 6e89a194460a08817abc75ea36f35c784b2715ae Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Sat, 1 Jan 2005 16:40:07 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/01/01 16:16:30+00:00 nexus.co.uk!pb add support for Replaces: and Conflicts: headers in package_ipk output BKrev: 41d6d267FiwUlbQfROBn9bTijUPUKw --- classes/package_ipk.bbclass | 230 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 230 insertions(+) (limited to 'classes/package_ipk.bbclass') diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index e69de29bb2..550dc41508 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -0,0 +1,230 @@ +inherit package +DEPENDS_prepend="${@["ipkg-utils-native ", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}" +BOOTSTRAP_EXTRA_RDEPENDS += "ipkg-collateral ipkg ipkg-link" +BOOTSTRAP_EXTRA_DEPENDS += "ipkg-collateral ipkg ipkg-link" + +python package_ipk_fn () { + from bb import data + bb.data.setVar('PKGFN', bb.data.getVar('PKG',d), d) +} + +python package_ipk_install () { + import os, sys + pkg = bb.data.getVar('PKG', d, 1) + pkgfn = bb.data.getVar('PKGFN', d, 1) + rootfs = bb.data.getVar('IMAGE_ROOTFS', d, 1) + ipkdir = bb.data.getVar('DEPLOY_DIR_IPK', d, 1) + stagingdir = bb.data.getVar('STAGING_DIR', d, 1) + tmpdir = bb.data.getVar('TMPDIR', d, 1) + + if None in (pkg,pkgfn,rootfs): + raise bb.build.FuncFailed("missing variables (one or more of PKG, PKGFN, IMAGEROOTFS)") + try: + bb.mkdirhier(rootfs) + os.chdir(rootfs) + except OSError: + (type, value, traceback) = sys.exc_info() + print value + raise bb.build.FuncFailed + + # Generate ipk.conf if it or the stamp doesnt exist + conffile = os.path.join(stagingdir,"ipkg.conf") + if not os.access(conffile, os.R_OK): + ipkg_archs = bb.data.getVar('IPKG_ARCHS',d) + if ipkg_archs is None: + bb.error("IPKG_ARCHS missing") + raise FuncFailed + ipkg_archs = ipkg_archs.split() + arch_priority = 1 + + f = open(conffile,"w") + for arch in ipkg_archs: + f.write("arch %s %s\n" % ( arch, arch_priority )) + arch_priority += 1 + f.write("src local file:%s" % ipkdir) + f.close() + + + if (not os.access(os.path.join(ipkdir,"Packages"), os.R_OK) or + not os.access(os.path.join(os.path.join(tmpdir, "stamps"),"do_packages"),os.R_OK)): + ret = os.system('ipkg-make-index -p %s %s ' % (os.path.join(ipkdir, "Packages"), ipkdir)) + if (ret != 0 ): + raise bb.build.FuncFailed + f=open(os.path.join(os.path.join(tmpdir, "stamps"),"do_packages"),"w") + f.close() + + ret = os.system('ipkg-cl -o %s -f %s update' % (rootfs, conffile)) + ret = os.system('ipkg-cl -o %s -f %s install %s' % (rootfs, conffile, pkgfn)) + if (ret != 0 ): + raise bb.build.FuncFailed +} + +python package_ipk_do_package_ipk () { + import copy # to back up env data + import sys + + workdir = bb.data.getVar('WORKDIR', d, 1) + if not workdir: + bb.error("WORKDIR not defined, unable to package") + return + + import os # path manipulations + outdir = bb.data.getVar('DEPLOY_DIR_IPK', d, 1) + if not outdir: + bb.error("DEPLOY_DIR_IPK not defined, unable to package") + return + bb.mkdirhier(outdir) + + dvar = bb.data.getVar('D', d, 1) + if not dvar: + bb.error("D not defined, unable to package") + return + bb.mkdirhier(dvar) + + packages = bb.data.getVar('PACKAGES', d, 1) + if not packages: + bb.debug(1, "PACKAGES not defined, nothing to package") + return + + tmpdir = bb.data.getVar('TMPDIR', d, 1) + # Invalidate the packages file + if os.access(os.path.join(os.path.join(tmpdir, "stamps"),"do_packages"),os.R_OK): + os.unlink(os.path.join(os.path.join(tmpdir, "stamps"),"do_packages")) + + if packages == []: + bb.debug(1, "No packages; nothing to do") + return + + for pkg in packages.split(): + from copy import deepcopy + localdata = deepcopy(d) + root = "%s/install/%s" % (workdir, pkg) + + bb.data.setVar('ROOT', '', localdata) + bb.data.setVar('ROOT_%s' % pkg, root, localdata) + pkgname = bb.data.getVar('PKG_%s' % pkg, localdata, 1) + if not pkgname: + pkgname = pkg + bb.data.setVar('PKG', pkgname, localdata) + + overrides = bb.data.getVar('OVERRIDES', localdata) + if not overrides: + raise bb.build.FuncFailed('OVERRIDES not defined') + overrides = bb.data.expand(overrides, localdata) + bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata) + + bb.data.update_data(localdata) + basedir = os.path.join(os.path.dirname(root)) + pkgoutdir = outdir + bb.mkdirhier(pkgoutdir) + os.chdir(root) + from glob import glob + g = glob('*') + try: + del g[g.index('CONTROL')] + del g[g.index('./CONTROL')] + except ValueError: + pass + if not g and not bb.data.getVar('ALLOW_EMPTY', localdata): + from bb import note + note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1))) + continue + controldir = os.path.join(root, 'CONTROL') + bb.mkdirhier(controldir) + try: + ctrlfile = file(os.path.join(controldir, 'control'), 'w') + except OSError: + raise bb.build.FuncFailed("unable to open control file for writing.") + + fields = [] + 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']]) + fields.append(["Maintainer: %s\n", ['MAINTAINER']]) + fields.append(["Architecture: %s\n", ['PACKAGE_ARCH']]) + fields.append(["OE: %s\n", ['P']]) + fields.append(["Source: %s\n", ['SRC_URI']]) + + def pullData(l, d): + l2 = [] + for i in l: + l2.append(bb.data.getVar(i, d, 1)) + return l2 + + ctrlfile.write("Package: %s\n" % pkgname) + # check for required fields + try: + for (c, fs) in fields: + for f in fs: + if bb.data.getVar(f, localdata) is None: + raise KeyError(f) + ctrlfile.write(c % tuple(pullData(fs, localdata))) + except KeyError: + (type, value, traceback) = sys.exc_info() + ctrlfile.close() + raise bb.build.FuncFailed("Missing field for ipk generation: %s" % value) + # more fields + rdepends = explode_deps(bb.data.getVar("RDEPENDS", localdata, 1) or "") + rsuggests = (bb.data.getVar("RSUGGESTS", localdata, 1) or "").split() + rrecommends = (bb.data.getVar("RRECOMMENDS", localdata, 1) or "").split() + rprovides = (bb.data.getVar("RPROVIDES", localdata, 1) or "").split() + rreplaces = (bb.data.getVar("RREPLACES", localdata, 1) or "").split() + rconflicts = (bb.data.getVar("RCONFLICTS", localdata, 1) or "").split() + if rdepends: + ctrlfile.write("Depends: " + ", ".join(rdepends) + "\n") + if rsuggests: + ctrlfile.write("Suggests: " + ", ".join(rsuggests) + "\n") + if rrecommends: + ctrlfile.write("Recommends: " + ", ".join(rrecommends) + "\n") + if rprovides: + ctrlfile.write("Provides: " + ", ".join(rprovides) + "\n") + if rreplaces: + ctrlfile.write("Replaces: " + ", ".join(rreplaces) + "\n") + if rconflicts: + ctrlfile.write("Conflicts: " + ", ".join(rconflicts) + "\n") + ctrlfile.close() + + for script in ["preinst", "postinst", "prerm", "postrm"]: + scriptvar = bb.data.getVar('pkg_%s' % script, localdata, 1) + if not scriptvar: + continue + try: + 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(scriptvar) + scriptfile.close() + os.chmod(os.path.join(controldir, script), 0755) + + conffiles_str = bb.data.getVar("CONFFILES", localdata, 1) + if conffiles_str: + try: + conffiles = file(os.path.join(controldir, 'conffiles'), 'w') + except OSError: + raise bb.build.FuncFailed("unable to open conffiles for writing.") + for f in conffiles_str.split(): + conffiles.write('%s\n' % f) + conffiles.close() + + os.chdir(basedir) + ret = os.system("PATH=\"%s\" ipkg-build -o 0 -g 0 %s %s" % (bb.data.getVar("PATH", localdata, 1), pkg, pkgoutdir)) + if ret != 0: + raise bb.build.FuncFailed("ipkg-build execution failed") + + for script in ["preinst", "postinst", "prerm", "postrm", "control" ]: + scriptfile = os.path.join(controldir, script) + try: + os.remove(scriptfile) + except OSError: + pass + try: + os.rmdir(controldir) + except OSError: + pass + del localdata +} + +EXPORT_FUNCTIONS do_package_ipk + +addtask package_ipk after do_package before do_build -- cgit v1.2.3 From 442b1e01c075ef23f9db223f8199c0d351661029 Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Sun, 16 Jan 2005 23:40:14 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/01/16 23:14:38+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2005/01/16 23:14:08+00:00 nexus.co.uk!pb call read_subpackage_metadata at the start of package_ipk, not from base.bbclass anonymous function BKrev: 41eafb5emDtcv2ti43OMi-pcTItdsA --- classes/package_ipk.bbclass | 2 ++ 1 file changed, 2 insertions(+) (limited to 'classes/package_ipk.bbclass') diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 550dc41508..f4d816adad 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -63,6 +63,8 @@ python package_ipk_do_package_ipk () { import copy # to back up env data import sys + bb.build.exec_func('read_subpackage_metadata', d) + workdir = bb.data.getVar('WORKDIR', d, 1) if not workdir: bb.error("WORKDIR not defined, unable to package") -- cgit v1.2.3 From 4cc600f1bed1c629bf77ebf1178258ca860bca9b Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Thu, 20 Jan 2005 05:14:20 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/01/20 00:02:54-05:00 handhelds.org!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into handhelds.org:/home/kergoth/code/openembedded 2005/01/20 00:01:05-05:00 handhelds.org!kergoth Fix a critical bug resulting from the recent changes in bitbake (facilitating make -j). The behavior is that of the root filesystem not having a ton of required shared libraries, like libc. Our packaging classes relied on the tasks being able to modify the global metadata, which is no longer allowed. Rework how we do packaging to account for this. BKrev: 41ef3e2c_WACPUP9Waae3Humbe58ng --- classes/package_ipk.bbclass | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'classes/package_ipk.bbclass') diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index f4d816adad..1119502bc8 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -2,6 +2,7 @@ inherit package DEPENDS_prepend="${@["ipkg-utils-native ", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}" BOOTSTRAP_EXTRA_RDEPENDS += "ipkg-collateral ipkg ipkg-link" BOOTSTRAP_EXTRA_DEPENDS += "ipkg-collateral ipkg ipkg-link" +PACKAGEFUNCS += "do_package_ipk" python package_ipk_fn () { from bb import data @@ -59,12 +60,10 @@ python package_ipk_install () { raise bb.build.FuncFailed } -python package_ipk_do_package_ipk () { +python do_package_ipk () { import copy # to back up env data import sys - bb.build.exec_func('read_subpackage_metadata', d) - workdir = bb.data.getVar('WORKDIR', d, 1) if not workdir: bb.error("WORKDIR not defined, unable to package") @@ -226,7 +225,3 @@ python package_ipk_do_package_ipk () { pass del localdata } - -EXPORT_FUNCTIONS do_package_ipk - -addtask package_ipk after do_package before do_build -- cgit v1.2.3 From cb82144c79b159a634275390a7ac55f639192d0c Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Wed, 23 Feb 2005 21:54:39 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/23 15:31:35-06:00 ti.com!kergoth Apply fix to lame from Michael Kropfberg that ensures that the library packages get emitted. 2005/02/23 14:04:22-06:00 ti.com!kergoth Use the recent glibc snaps by default for the sh3 and sh4 target architectures. 2005/02/23 13:49:33-06:00 ti.com!kergoth Fix the unpleasant target path mangling in do_install in the uclibc builds to happen only when necessary (thereby unborking the uclibc build with default paths). 2005/02/23 13:30:16-06:00 ti.com!kergoth modutils: apply patch from Hermann Lacheiner to fix another missing /. 2005/02/23 12:36:57-06:00 ti.com!kergoth Add sh3 uclibc defconfigs for all the uclibc versions. 2005/02/23 12:27:56-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/projects/oe/openembedded 2005/02/23 12:27:44-06:00 ti.com!kergoth module-init-tools: fix another bug caused by that rampant sed'ing. 2005/02/23 18:57:22+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/02/23 18:57:02+01:00 uni-frankfurt.de!mickeyl introduce IPKGBUILDCMD to enable overwriting the ipkg-build command line arguments. tweak sharprom-compatible.conf to override IPKGBUILDCMD. thanksfully, ipkg-build still supports the outdated format 2005/02/23 10:32:16-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/projects/oe/openembedded 2005/02/23 10:31:54-06:00 ti.com!kergoth Bump PR in the packages that were broken by the hokey sed from yesterday. 2005/02/23 17:14:56+01:00 uni-frankfurt.de!mickeyl misc opie files: use palmtopdir variable instead of hardcoding /opt/QtPalmtop/ 2005/02/23 17:05:25+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/02/23 09:56:05-06:00 ti.com!kergoth Fixes per the overenthusiastic sed / removal I did yesterday. Thanks to Hermann Lacheiner and Holger Schurig for spotting a couple of them, this should fix the others. 2005/02/23 16:48:08+01:00 uni-frankfurt.de!mickeyl make the prism3-support package work BKrev: 421cfb9f-K6bfhnkhAVPJV_fqpHn7Q --- classes/package_ipk.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'classes/package_ipk.bbclass') diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 1119502bc8..513e4639b5 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -209,7 +209,8 @@ python do_package_ipk () { conffiles.close() os.chdir(basedir) - ret = os.system("PATH=\"%s\" ipkg-build -o 0 -g 0 %s %s" % (bb.data.getVar("PATH", localdata, 1), pkg, pkgoutdir)) + ret = os.system("PATH=\"%s\" %s %s %s" % (bb.data.getVar("PATH", localdata, 1), + bb.data.getVar("IPKGBUILDCMD",d,1), pkg, pkgoutdir)) if ret != 0: raise bb.build.FuncFailed("ipkg-build execution failed") -- cgit v1.2.3 From bae07f485b55b4038b65e117016ea6ff7498eca9 Mon Sep 17 00:00:00 2001 From: Derek Young Date: Tue, 1 Mar 2005 18:55:39 +0000 Subject: Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded into builder.(none):/home/dereky/bbroot/openembedded 2005/02/28 04:40:13-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/28 12:37:13+00:00 nexus.co.uk!pb straighten out new x11 snapshot 2005/02/28 12:18:18+00:00 reciva.com!pb add new version of xproto 2005/02/28 12:16:45+00:00 reciva.com!pb Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded into mebius.reciva.com:/home/pb/oe/oe 2005/03/01 18:55:34+00:00 (none)!pb collapse multiple spaces in SRC_URI to a single space. replace some inefficient string concatenation with %-substitution 2005/03/01 18:54:47+00:00 (none)!pb suppress circular dependency when package contains both binaries and libraries move pkgconfig shlibs data into new location; consider old files first so that new ones override them 2005/03/01 18:53:46+00:00 (none)!pb add missing patch to gstreamer SRC_URI BKrev: 4224baabcSg6J2wzDfVE30KMAuYbQA --- classes/package_ipk.bbclass | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'classes/package_ipk.bbclass') diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 513e4639b5..a029d088fb 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -63,6 +63,7 @@ python package_ipk_install () { python do_package_ipk () { import copy # to back up env data import sys + import re workdir = bb.data.getVar('WORKDIR', d, 1) if not workdir: @@ -145,7 +146,6 @@ python do_package_ipk () { fields.append(["Maintainer: %s\n", ['MAINTAINER']]) fields.append(["Architecture: %s\n", ['PACKAGE_ARCH']]) fields.append(["OE: %s\n", ['P']]) - fields.append(["Source: %s\n", ['SRC_URI']]) def pullData(l, d): l2 = [] @@ -173,17 +173,21 @@ python do_package_ipk () { rreplaces = (bb.data.getVar("RREPLACES", localdata, 1) or "").split() rconflicts = (bb.data.getVar("RCONFLICTS", localdata, 1) or "").split() if rdepends: - ctrlfile.write("Depends: " + ", ".join(rdepends) + "\n") + ctrlfile.write("Depends: %s\n" % ", ".join(rdepends)) if rsuggests: - ctrlfile.write("Suggests: " + ", ".join(rsuggests) + "\n") + ctrlfile.write("Suggests: %s\n" % ", ".join(rsuggests)) if rrecommends: - ctrlfile.write("Recommends: " + ", ".join(rrecommends) + "\n") + ctrlfile.write("Recommends: %s\n" % ", ".join(rrecommends)) if rprovides: - ctrlfile.write("Provides: " + ", ".join(rprovides) + "\n") + ctrlfile.write("Provides: %s\n" % ", ".join(rprovides)) if rreplaces: - ctrlfile.write("Replaces: " + ", ".join(rreplaces) + "\n") + ctrlfile.write("Replaces: %s\n" % ", ".join(rreplaces)) if rconflicts: - ctrlfile.write("Conflicts: " + ", ".join(rconflicts) + "\n") + ctrlfile.write("Conflicts: %s\n" % ", ".join(rconflicts)) + src_uri = bb.data.getVar("SRC_URI", localdata, 1) + if src_uri: + src_uri = re.sub("\s+", " ", src_uri) + ctrlfile.write("Source: %s\n" % src_uri) ctrlfile.close() for script in ["preinst", "postinst", "prerm", "postrm"]: -- cgit v1.2.3 From 3c507a3ffad0aaa68cdf977ffcdf09e4e7c93730 Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Tue, 1 Mar 2005 18:55:57 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/28 19:16:14-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/projects/oe/openembedded 2005/03/01 01:15:28+01:00 dyndns.org!reenoo Merge oe-devel@oe-devel.bkbits.net:openembedded into sugarcube.dyndns.org:/home2/oe/bakery/openembedded 2005/02/28 19:15:51-06:00 ti.com!kergoth Another zlib visibility fix. It's fixed now. Really, it is! 2005/03/01 01:15:11+01:00 dyndns.org!reenoo package_ipk.bbclass: strip whitespace in Source: 2005/02/28 18:53:23-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/projects/oe/openembedded 2005/02/28 18:53:11-06:00 ti.com!kergoth Fix up the zlib visibility bits, and apply that patch again. BKrev: 4224babdbJA27U4xliOayBB7Yypnaw --- classes/package_ipk.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/package_ipk.bbclass') diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index a029d088fb..2d1d2e1422 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -187,7 +187,7 @@ python do_package_ipk () { src_uri = bb.data.getVar("SRC_URI", localdata, 1) if src_uri: src_uri = re.sub("\s+", " ", src_uri) - ctrlfile.write("Source: %s\n" % src_uri) + ctrlfile.write("Source: %s\n" % " ".join(src_uri.split())) ctrlfile.close() for script in ["preinst", "postinst", "prerm", "postrm"]: -- cgit v1.2.3 From 4124851298cd7ec159e3d2ef05077e3520df9c55 Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Sat, 2 Apr 2005 15:12:17 +0000 Subject: Merge oe-devel@oe-devel.bkbits.net:openembedded into sugarcube.dyndns.org:/home2/oe/bakery/openembedded 2005/04/02 17:11:59+02:00 dyndns.org!reenoo sablevm(-classpath): upgrade to 1.11.3. fix versioned dependencies. use zip for jar compression. 2005/04/02 17:10:31+02:00 dyndns.org!reenoo package_ipk.bbclass: allow versioned RRECOMMENDS. BKrev: 424eb651FaWc3ZkLUZeBYeGhOE0BzA --- classes/package_ipk.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/package_ipk.bbclass') diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 2d1d2e1422..e1d87f6d9f 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -167,8 +167,8 @@ python do_package_ipk () { raise bb.build.FuncFailed("Missing field for ipk generation: %s" % value) # more fields rdepends = explode_deps(bb.data.getVar("RDEPENDS", localdata, 1) or "") + rrecommends = explode_deps(bb.data.getVar("RRECOMMENDS", localdata, 1) or "") rsuggests = (bb.data.getVar("RSUGGESTS", localdata, 1) or "").split() - rrecommends = (bb.data.getVar("RRECOMMENDS", localdata, 1) or "").split() rprovides = (bb.data.getVar("RPROVIDES", localdata, 1) or "").split() rreplaces = (bb.data.getVar("RREPLACES", localdata, 1) or "").split() rconflicts = (bb.data.getVar("RCONFLICTS", localdata, 1) or "").split() -- cgit v1.2.3 From 2f9ad2e658e8ad53ecdb6eb82358eb858a8de5f5 Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Tue, 17 May 2005 18:39:51 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/05/17 20:39:04+02:00 uni-frankfurt.de!mickeyl add python-pygtk2 to task-python-everything 2005/05/17 20:32:02+02:00 uni-frankfurt.de!mickeyl apply zecke's patches to prepare for the low memory bitbake. the repository needs bitbake r159 or better now BKrev: 428a3a77SoUtXtfto7tXtwiSdrA1ew --- classes/package_ipk.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'classes/package_ipk.bbclass') diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index e1d87f6d9f..3c6125d9e3 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -98,8 +98,7 @@ python do_package_ipk () { return for pkg in packages.split(): - from copy import deepcopy - localdata = deepcopy(d) + localdata = bb.data.createCopy(d) root = "%s/install/%s" % (workdir, pkg) bb.data.setVar('ROOT', '', localdata) -- cgit v1.2.3 From cd16218f177d083eb32d7f9f59fc0323b749ccce Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 7 Sep 2005 10:21:40 +0000 Subject: classes/package_ipk.bbclass: put HOMEPAGE into the Homepage: control field --- classes/package_ipk.bbclass | 1 + 1 file changed, 1 insertion(+) (limited to 'classes/package_ipk.bbclass') diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 3c6125d9e3..6d3e1eb686 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -145,6 +145,7 @@ python do_package_ipk () { fields.append(["Maintainer: %s\n", ['MAINTAINER']]) fields.append(["Architecture: %s\n", ['PACKAGE_ARCH']]) fields.append(["OE: %s\n", ['P']]) + fields.append(["Homepage: %s\n", ['HOMEPAGE']]) def pullData(l, d): l2 = [] -- cgit v1.2.3