diff options
| -rw-r--r-- | classes/update-rc.d.bbclass | 50 | ||||
| -rw-r--r-- | packages/busybox/busybox_1.00.bb | 14 | ||||
| -rw-r--r-- | packages/meta/meta-opie.bb | 1 | ||||
| -rw-r--r-- | packages/opie-tabmanager/opie-tabmanager_cvs.bb | 8 | ||||
| -rw-r--r-- | packages/qpf-fonts/qpf-dejavu.inc (renamed from packages/opie-tabmanager/opie-tabmanager.inc) | 0 | ||||
| -rw-r--r-- | packages/qpf-fonts/qpf-dejavusans_1.10.bb (renamed from packages/opie-tabmanager/opie-tabmanager_1.2.0.bb) | 0 | ||||
| -rw-r--r-- | packages/qpf-fonts/qpf-dejavusanscondensed_1.10.bb (renamed from packages/qpf-fonts/qpf-dejavusans_1.8.bb) | 0 | ||||
| -rw-r--r-- | packages/qpf-fonts/qpf-dejavusansmono_1.10.bb (renamed from packages/qpf-fonts/qpf-dejavusansmono_1.8.bb) | 0 | ||||
| -rw-r--r-- | packages/qpf-fonts/qpf-dejavuserif_1.10.bb (renamed from packages/qpf-fonts/qpf-dejavuserif_1.8.bb) | 0 | ||||
| -rw-r--r-- | packages/qpf-fonts/qpf-dejavuserifcondensed_1.10.bb (renamed from packages/qpf-fonts/qpf-dejavuserifcondensed_1.8.bb) | 0 |
10 files changed, 41 insertions, 32 deletions
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) } diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb index 0ae99d0b58..8554b95bd9 100644 --- a/packages/busybox/busybox_1.00.bb +++ b/packages/busybox/busybox_1.00.bb @@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -PR = "r20" +PR = "r21" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://add-getkey-applet.patch;patch=1 \ @@ -41,12 +41,17 @@ S = "${WORKDIR}/busybox-${PV}" export EXTRA_CFLAGS = "${CFLAGS}" EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}" +PACKAGES =+ "${PN}-httpd" + +FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" + FILES_${PN} += " ${datadir}/udhcpc" -inherit cml1 update-rc.d +INITSCRIPT_PACKAGES = "${PN} ${PN}-httpd" +INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd" +INITSCRIPT_NAME_${PN} = "syslog" -INITSCRIPT_NAME = "syslog" -INITSCRIPT_PARAMS = "defaults" +inherit cml1 update-rc.d do_configure () { install -m 0644 ${WORKDIR}/defconfig ${S}/.config @@ -68,6 +73,7 @@ do_install () { fi if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/ + install -d ${D}/srv/www fi if grep "CONFIG_UDHCPD=y" ${WORKDIR}/defconfig; then install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/ diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb index 8f5e0c4422..3de66204d2 100644 --- a/packages/meta/meta-opie.bb +++ b/packages/meta/meta-opie.bb @@ -328,7 +328,6 @@ opie-security \ opie-sshkeys \ opie-sysinfo \ opie-systemtime \ -opie-tabmanager \ opie-usermanager \ opie-icon-reload \ opie-vmemo-settings " diff --git a/packages/opie-tabmanager/opie-tabmanager_cvs.bb b/packages/opie-tabmanager/opie-tabmanager_cvs.bb deleted file mode 100644 index 8aeca3a343..0000000000 --- a/packages/opie-tabmanager/opie-tabmanager_cvs.bb +++ /dev/null @@ -1,8 +0,0 @@ -include ${PN}.inc - -PV = "1.2.0+cvs-${CVSDATE}" -PR = "r0" - -SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/tabmanager \ - ${HANDHELDS_CVS};module=opie/pics \ - ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-tabmanager/opie-tabmanager.inc b/packages/qpf-fonts/qpf-dejavu.inc index e69de29bb2..e69de29bb2 100644 --- a/packages/opie-tabmanager/opie-tabmanager.inc +++ b/packages/qpf-fonts/qpf-dejavu.inc diff --git a/packages/opie-tabmanager/opie-tabmanager_1.2.0.bb b/packages/qpf-fonts/qpf-dejavusans_1.10.bb index e69de29bb2..e69de29bb2 100644 --- a/packages/opie-tabmanager/opie-tabmanager_1.2.0.bb +++ b/packages/qpf-fonts/qpf-dejavusans_1.10.bb diff --git a/packages/qpf-fonts/qpf-dejavusans_1.8.bb b/packages/qpf-fonts/qpf-dejavusanscondensed_1.10.bb index e69de29bb2..e69de29bb2 100644 --- a/packages/qpf-fonts/qpf-dejavusans_1.8.bb +++ b/packages/qpf-fonts/qpf-dejavusanscondensed_1.10.bb diff --git a/packages/qpf-fonts/qpf-dejavusansmono_1.8.bb b/packages/qpf-fonts/qpf-dejavusansmono_1.10.bb index e69de29bb2..e69de29bb2 100644 --- a/packages/qpf-fonts/qpf-dejavusansmono_1.8.bb +++ b/packages/qpf-fonts/qpf-dejavusansmono_1.10.bb diff --git a/packages/qpf-fonts/qpf-dejavuserif_1.8.bb b/packages/qpf-fonts/qpf-dejavuserif_1.10.bb index e69de29bb2..e69de29bb2 100644 --- a/packages/qpf-fonts/qpf-dejavuserif_1.8.bb +++ b/packages/qpf-fonts/qpf-dejavuserif_1.10.bb diff --git a/packages/qpf-fonts/qpf-dejavuserifcondensed_1.8.bb b/packages/qpf-fonts/qpf-dejavuserifcondensed_1.10.bb index e69de29bb2..e69de29bb2 100644 --- a/packages/qpf-fonts/qpf-dejavuserifcondensed_1.8.bb +++ b/packages/qpf-fonts/qpf-dejavuserifcondensed_1.10.bb |