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/update-rc.d.bbclass | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 classes/update-rc.d.bbclass (limited to 'classes/update-rc.d.bbclass') diff --git a/classes/update-rc.d.bbclass b/classes/update-rc.d.bbclass new file mode 100644 index 0000000000..e69de29bb2 -- cgit v1.2.3 From 3775cf9797fe57174a9e841f5d42c2928c4022b3 Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Wed, 29 Dec 2004 18:41:41 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2004/12/29 13:22:16-05:00 handhelds.org!kergoth Demote the 'adding update-rc.d calls' message to debug(1,...). BKrev: 41d2fa65mMyXYfoMDBBDJZtV-8S7dA --- classes/update-rc.d.bbclass | 47 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'classes/update-rc.d.bbclass') diff --git a/classes/update-rc.d.bbclass b/classes/update-rc.d.bbclass index e69de29bb2..894db65f93 100644 --- a/classes/update-rc.d.bbclass +++ b/classes/update-rc.d.bbclass @@ -0,0 +1,47 @@ +DEPENDS_append = " update-rc.d" +RDEPENDS_append = " update-rc.d" + +INIT_D_DIR = "${sysconfdir}/init.d" + +updatercd_postinst() { +if test "x$D" != "x"; then + D="-r $D" +else + D="-s" +fi +update-rc.d $D ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} +} + +updatercd_postrm() { +if test "x$D" != "x"; then + D="-r $D" +else + ${INIT_D_DIR}/${INITSCRIPT_NAME} stop +fi +update-rc.d $D ${INITSCRIPT_NAME} remove +} + +python __anonymous() { + if bb.data.getVar('INITSCRIPT_NAME', d) == None: + raise bb.build.FuncFailed, "%s inherits update-rc.d but doesn't set INITSCRIPT_NAME" % bb.data.getVar('FILE', d) + if bb.data.getVar('INITSCRIPT_PARAMS', d) == None: + raise bb.build.FuncFailed, "%s inherits update-rc.d but doesn't set INITSCRIPT_PARAMS" % bb.data.getVar('FILE', d) +} + +python populate_packages_prepend () { + pkg = bb.data.getVar('PN', d, 1) + packages = (bb.data.getVar('PACKAGES', d, 1) or "").split() + if not pkg in packages: + pkg = packages[0] + bb.debug(1, 'adding update-rc.d calls to postinst/postrm for %s' % pkg) + postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1) + if not postinst: + postinst = '#!/bin/sh\n' + postinst += bb.data.getVar('updatercd_postinst', d, 1) + bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d) + postrm = bb.data.getVar('pkg_postrm_%s' % pkg, d, 1) or bb.data.getVar('pkg_postrm', d, 1) + if not postrm: + postrm = '#!/bin/sh\n' + postrm += bb.data.getVar('updatercd_postrm', d, 1) + bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d) +} -- cgit v1.2.3 From b59f7b5c9da751e5ef22f523565239cd75d76f74 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Wed, 25 May 2005 07:50:44 +0000 Subject: Merge marsco.kalmiopsis:/home/nslu2/openembedded into marsco.kalmiopsis:/home/nslu2/ref 2005/05/25 00:48:22-07:00 kalmiopsis!jbowler Bump PR to give the merged .bb a new number. 2005/05/25 00:44:57-07:00 kalmiopsis!jbowler Bump PR for merge 2005/05/24 22:51:42+02:00 hrw.one.pl!hrw unified qpf-dejavu build updated DejaVu font to 1.10 2005/05/24 22:10:55+02: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/05/24 22:10:41+02:00 uni-frankfurt.de!mickeyl remove opie-tabmanager which has gone to unsupported upstream 2005/05/24 20:21:04+01:00 reciva.com!pb ship busybox httpd bits in a separate package; include update-rc.d call and /srv/www directory 2005/05/24 20:16:43+01:00 reciva.com!pb support multiple subpackages with different update-rc.d requirements BKrev: 42942e54d1EfSGoGC-vVDT7ppNTuRQ --- classes/update-rc.d.bbclass | 50 ++++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 19 deletions(-) (limited to 'classes/update-rc.d.bbclass') diff --git a/classes/update-rc.d.bbclass b/classes/update-rc.d.bbclass index 894db65f93..c3ee89dfb9 100644 --- a/classes/update-rc.d.bbclass +++ b/classes/update-rc.d.bbclass @@ -22,26 +22,38 @@ update-rc.d $D ${INITSCRIPT_NAME} remove } python __anonymous() { - if bb.data.getVar('INITSCRIPT_NAME', d) == None: - raise bb.build.FuncFailed, "%s inherits update-rc.d but doesn't set INITSCRIPT_NAME" % bb.data.getVar('FILE', d) - if bb.data.getVar('INITSCRIPT_PARAMS', d) == None: - raise bb.build.FuncFailed, "%s inherits update-rc.d but doesn't set INITSCRIPT_PARAMS" % bb.data.getVar('FILE', d) + if bb.data.getVar('INITSCRIPT_PACKAGES', d) == None: + if bb.data.getVar('INITSCRIPT_NAME', d) == None: + raise bb.build.FuncFailed, "%s inherits update-rc.d but doesn't set INITSCRIPT_NAME" % bb.data.getVar('FILE', d) + if bb.data.getVar('INITSCRIPT_PARAMS', d) == None: + raise bb.build.FuncFailed, "%s inherits update-rc.d but doesn't set INITSCRIPT_PARAMS" % bb.data.getVar('FILE', d) } python populate_packages_prepend () { - pkg = bb.data.getVar('PN', d, 1) - packages = (bb.data.getVar('PACKAGES', d, 1) or "").split() - if not pkg in packages: - pkg = packages[0] - bb.debug(1, 'adding update-rc.d calls to postinst/postrm for %s' % pkg) - postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1) - if not postinst: - postinst = '#!/bin/sh\n' - postinst += bb.data.getVar('updatercd_postinst', d, 1) - bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d) - postrm = bb.data.getVar('pkg_postrm_%s' % pkg, d, 1) or bb.data.getVar('pkg_postrm', d, 1) - if not postrm: - postrm = '#!/bin/sh\n' - postrm += bb.data.getVar('updatercd_postrm', d, 1) - bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d) + def update_rcd_package(pkg): + bb.debug(1, 'adding update-rc.d calls to postinst/postrm for %s' % pkg) + localdata = bb.data.createCopy(d) + overrides = bb.data.getVar("OVERRIDES", localdata, 1) + bb.data.setVar("OVERRIDES", "%s:%s" % (pkg, overrides), localdata) + bb.data.update_data(localdata) + + postinst = bb.data.getVar('pkg_postinst', localdata, 1) + if not postinst: + postinst = '#!/bin/sh\n' + postinst += bb.data.getVar('updatercd_postinst', localdata, 1) + bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d) + postrm = bb.data.getVar('pkg_postrm', localdata, 1) + if not postrm: + postrm = '#!/bin/sh\n' + postrm += bb.data.getVar('updatercd_postrm', localdata, 1) + bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d) + + pkgs = bb.data.getVar('INITSCRIPT_PACKAGES', d, 1) + if pkgs == None: + pkgs = bb.data.getVar('PN', d, 1) + packages = (bb.data.getVar('PACKAGES', d, 1) or "").split() + if not pkgs in packages: + pkgs = packages[0] + for pkg in pkgs.split(): + update_rcd_package(pkg) } -- cgit v1.2.3 From ab67512dd0019cd2d0f1beb718de0fe255037509 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Wed, 25 May 2005 17:14:37 +0000 Subject: Merge with OE (there may still be a bug in the busybox postinst script) 2005/05/25 16:24:12+01:00 reciva.com!pb patch usb.rc to work with busybox (no "grep -o") 2005/05/25 13:09:04+01:00 reciva.com!pb Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded into mill.internal.reciva.com:/nexus/home/pb/oe/oe 2005/05/25 13:05:58+01:00 reciva.com!pb apply patch to udhcpc to send the current hostname if no -H option is given 2005/05/25 12:54:31+02: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/05/25 12:54:19+02:00 uni-frankfurt.de!mickeyl fix yacc in bison-native 2005/05/25 11:48:52+01:00 reciva.com!pb turn on support for "readlink -f", needed by usbutils 2005/05/25 11:40:50+01:00 reciva.com!pb Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded into mill.internal.reciva.com:/nexus/home/pb/oe/oe 2005/05/25 11:37:22+01:00 reciva.com!pb don't require /etc/httpd.conf to start busybox httpd, it works fine without that file 2005/05/25 12:29:58+02:00 handhelds.org!CoreDump Add altboot: A text based 'boot manager' (/sbin/init hack) to allow booting from SD and CF, boot a recovery shell (init=/bin/sh) or boot into a GUI-less runlevel 2005/05/25 11:24:50+01:00 reciva.com!pb package busybox udhcpd bits separately; remove stray copy of main postinst in -httpd package. 2005/05/25 11:52:12+02:00 local!hrw Merge bk://oe-devel.bkbits.net/openembedded into marcinj.local:/home/hrw/zaurus/oe/openembedded 2005/05/25 11:51:20+02:00 local!hrw regenerated dejavu fonts 2005/05/25 10:50:32+01:00 reciva.com!pb set default update-rc.d parameters to "defaults" BKrev: 4294b27d6MVA-cFYArKaJud80nBnzA --- classes/update-rc.d.bbclass | 2 ++ 1 file changed, 2 insertions(+) (limited to 'classes/update-rc.d.bbclass') diff --git a/classes/update-rc.d.bbclass b/classes/update-rc.d.bbclass index c3ee89dfb9..5f256b28af 100644 --- a/classes/update-rc.d.bbclass +++ b/classes/update-rc.d.bbclass @@ -1,6 +1,8 @@ DEPENDS_append = " update-rc.d" RDEPENDS_append = " update-rc.d" +INITSCRIPT_PARAMS ?= "defaults" + INIT_D_DIR = "${sysconfdir}/init.d" updatercd_postinst() { -- cgit v1.2.3 From 9499ab1e95b21471373670a1338ee6c5a3e4bc50 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Mon, 6 Jun 2005 14:45:48 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into marsco.kalmiopsis:/home/nslu2/openembedded 2005/06/06 15:42:51+02:00 utwente.nl!koen Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into bitbake.utwente.nl:/home/koen/OE/openembedded 2005/06/06 15:42:10+02:00 utwente.nl!koen Fix ts.conf so it actually parses, courtesy Florian Boor 2005/06/06 14:40:46+01:00 reciva.com!pb tweak device node creation in lirc-modules postinst 2005/06/06 14:36:41+01:00 reciva.com!pb need to call "initscript stop" in prerm, not postrm 2005/06/06 13:27:26+02:00 mn-solutions.de!schurig MNCI "Ramses": get rid of my experimental arm-linuxeabi TARGET_ARCH 2005/06/06 13:25:41+02:00 mn-solutions.de!schurig make modutils-cross compile again, tip from do13 on IRC 2005/06/06 13:10:24+02:00 utwente.nl!koen xserver-kdrive-omap_6.6.3.bb: tweak xserver-omap, courtesy Florian Boor 2005/06/06 12:40:49+02: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/06/06 12:40:28+02:00 uni-frankfurt.de!mickeyl openzaurus-3.5.4: bump CVSDATE 2005/06/06 10:18:58+01:00 reciva.com!pb remove gcc_csl-arm preference on armeb 2005/06/06 10:15:53+01:00 reciva.com!pb disable ifupdown-spurious-environ patch due to segfaults on armeb 2005/06/06 11:04:32+02:00 utwente.nl!koen nokia770.conf: remove unneeded orinoco driver BKrev: 42a4619cgEf5_eucbkPjTgBmQzeUMw --- classes/update-rc.d.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/update-rc.d.bbclass') diff --git a/classes/update-rc.d.bbclass b/classes/update-rc.d.bbclass index 5f256b28af..e3f7963baa 100644 --- a/classes/update-rc.d.bbclass +++ b/classes/update-rc.d.bbclass @@ -14,7 +14,7 @@ fi update-rc.d $D ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} } -updatercd_postrm() { +updatercd_prerm() { if test "x$D" != "x"; then D="-r $D" else -- cgit v1.2.3 From bf3b5d6d8c0556fc1f00283d4afb058ee91da1c1 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Mon, 6 Jun 2005 21:28:20 +0000 Subject: Build fix for busybox (and other?) packages which inherit update-rc.d.bbclass BKrev: 42a4bff4MUETw0IzxDhGlJU8F87N2Q --- classes/update-rc.d.bbclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'classes/update-rc.d.bbclass') diff --git a/classes/update-rc.d.bbclass b/classes/update-rc.d.bbclass index e3f7963baa..7583c88f83 100644 --- a/classes/update-rc.d.bbclass +++ b/classes/update-rc.d.bbclass @@ -44,11 +44,11 @@ python populate_packages_prepend () { postinst = '#!/bin/sh\n' postinst += bb.data.getVar('updatercd_postinst', localdata, 1) bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d) - postrm = bb.data.getVar('pkg_postrm', localdata, 1) - if not postrm: - postrm = '#!/bin/sh\n' - postrm += bb.data.getVar('updatercd_postrm', localdata, 1) - bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d) + prerm = bb.data.getVar('pkg_prerm', localdata, 1) + if not prerm: + prerm = '#!/bin/sh\n' + prerm += bb.data.getVar('updatercd_prerm', localdata, 1) + bb.data.setVar('pkg_prerm%s' % pkg, prerm, d) pkgs = bb.data.getVar('INITSCRIPT_PACKAGES', d, 1) if pkgs == None: -- cgit v1.2.3 From 6df171ed659aa21947821f2a5b8c5af96b69e8d6 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 7 Jun 2005 18:12:58 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into marsco.kalmiopsis:/home/nslu2/openembedded 2005/06/07 16:00:28+02: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/06/07 16:00:10+02:00 uni-frankfurt.de!mickeyl wireless tools: package libiw (again) 2005/06/07 15:49:41+02:00 utwente.nl!koen documentation.conf: typo-- 2005/06/07 14:00:41+02:00 utwente.nl!koen Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into bitbake.utwente.nl:/home/koen/OE/openembedded 2005/06/07 14:00:25+02:00 utwente.nl!koen gkdial_1.8.1.bb: point SRC_URI to the hh.org sourcemirror. ~lart disappearing sources 2005/06/07 13:49:20+02:00 hrw.one.pl!hrw Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into home.hrw.one.pl:/home/hrw/zaurus/oe/openembedded 2005/06/07 13:48:31+02:00 hrw.one.pl!hrw flex: unbreak non-native build, mark BROKEN on arm 2005/06/07 11:50:45+02:00 mn-solutions.de!schurig wpa-supplicant_cvs.bb: fix path for the defaults 2005/06/07 10:24:03+02:00 mn-solutions.de!schurig Fixes the "TypeError: cannot concatenate 'str' and 'NoneType' objects" we got for packages like atd, dbus etc in update-rc.d.bbclass. Thanks do13 BKrev: 42a5e3aaLki5_YPl8KJqM8Qwgk5q4w --- classes/update-rc.d.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/update-rc.d.bbclass') diff --git a/classes/update-rc.d.bbclass b/classes/update-rc.d.bbclass index 7583c88f83..a41dd7850c 100644 --- a/classes/update-rc.d.bbclass +++ b/classes/update-rc.d.bbclass @@ -48,7 +48,7 @@ python populate_packages_prepend () { if not prerm: prerm = '#!/bin/sh\n' prerm += bb.data.getVar('updatercd_prerm', localdata, 1) - bb.data.setVar('pkg_prerm%s' % pkg, prerm, d) + bb.data.setVar('pkg_prerm_%s' % pkg, prerm, d) pkgs = bb.data.getVar('INITSCRIPT_PACKAGES', d, 1) if pkgs == None: -- cgit v1.2.3 From da5d82591ce9aa123161b84e9b2189ab5b032c7d Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Mon, 27 Jun 2005 20:27:02 +0000 Subject: avoid crash when PACKAGES is empty BKrev: 42c06116btgOA5Mtq_TVBmuq5daBcg --- classes/update-rc.d.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/update-rc.d.bbclass') diff --git a/classes/update-rc.d.bbclass b/classes/update-rc.d.bbclass index a41dd7850c..ffa5d49a81 100644 --- a/classes/update-rc.d.bbclass +++ b/classes/update-rc.d.bbclass @@ -54,7 +54,7 @@ python populate_packages_prepend () { if pkgs == None: pkgs = bb.data.getVar('PN', d, 1) packages = (bb.data.getVar('PACKAGES', d, 1) or "").split() - if not pkgs in packages: + if not pkgs in packages and packages != []: pkgs = packages[0] for pkg in pkgs.split(): update_rcd_package(pkg) -- cgit v1.2.3 From f9186ef3e24f59340c74f211450d747d3b84ec4f Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Tue, 28 Jun 2005 12:51:44 +0000 Subject: provide both postrm and prerm for update-rc.d users BKrev: 42c147e0CkwnoUmrLRuV35U7XC-5iQ --- classes/update-rc.d.bbclass | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'classes/update-rc.d.bbclass') diff --git a/classes/update-rc.d.bbclass b/classes/update-rc.d.bbclass index ffa5d49a81..0bfba467c1 100644 --- a/classes/update-rc.d.bbclass +++ b/classes/update-rc.d.bbclass @@ -20,6 +20,9 @@ if test "x$D" != "x"; then else ${INIT_D_DIR}/${INITSCRIPT_NAME} stop fi +} + +updatercd_postrm() { update-rc.d $D ${INITSCRIPT_NAME} remove } @@ -49,6 +52,11 @@ python populate_packages_prepend () { prerm = '#!/bin/sh\n' prerm += bb.data.getVar('updatercd_prerm', localdata, 1) bb.data.setVar('pkg_prerm_%s' % pkg, prerm, d) + postrm = bb.data.getVar('pkg_postrm', localdata, 1) + if not postrm: + postrm = '#!/bin/sh\n' + postrm += bb.data.getVar('updatercd_postrm', localdata, 1) + bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d) pkgs = bb.data.getVar('INITSCRIPT_PACKAGES', d, 1) if pkgs == None: -- cgit v1.2.3