diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2005-05-25 07:50:44 +0000 |
|---|---|---|
| committer | John Bowler <jbowler@nslu2-linux.org> | 2005-05-25 07:50:44 +0000 |
| commit | b59f7b5c9da751e5ef22f523565239cd75d76f74 (patch) | |
| tree | b3c914b11c7952d7c3533d62e9718310a6ac2c07 /packages/busybox/busybox_1.00.bb | |
| parent | 7e21c43a4a6405132c81a81d9f6af07b24cd9f27 (diff) | |
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
Diffstat (limited to 'packages/busybox/busybox_1.00.bb')
| -rw-r--r-- | packages/busybox/busybox_1.00.bb | 14 |
1 files changed, 10 insertions, 4 deletions
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/ |