diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-22 12:53:55 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-22 12:53:55 +0000 |
| commit | 4f857db335de6935077d4866c51dd9d6851fed1d (patch) | |
| tree | 1c923be071d1a56bd79f467fd75ac77959a493a3 /packages/busybox | |
| parent | b32403d57d7e0473dd336e76f95c7b26f113cf26 (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/02/21 17:35:27-06:00 ti.com!kergoth
Kill the ipkg paths patch, since its busted.
2005/02/21 17:33:13-06:00 ti.com!kergoth
Fix sbindir in native.bbclass and cross.bbclass. Thanks to Jordan Crouse for reporting.
2005/02/21 17:13:19-06:00 ti.com!kergoth
Add the paths patch to ipkg which fixes it to no longer hardcode the '/usr/lib/ipkg' path, which I forgot to check in from the previous commit.
2005/02/21 17:09:46-06:00 ti.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded
2005/02/21 17:09:03-06:00 ti.com!kergoth
Run a sed script against our packages to fix some hardcoded target path
references. As always when I do things like this, if packages you maintain
were touched by this, please do a sanity check to ensure the sed script didn't
run wild.
2005/02/21 15:49:47-06:00 ti.com!kergoth
Use a HOTPLUG variable to manage which hotplug you prefer, to ensure that hotplug is still included in task-bootstrap even if you dont set DISTRO.
BKrev: 421b2b63X5eoMcSrC7pVcptXK-iFKg
Diffstat (limited to 'packages/busybox')
| -rw-r--r-- | packages/busybox/busybox_1.00.bb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb index fe136407b7..89b3206cb9 100644 --- a/packages/busybox/busybox_1.00.bb +++ b/packages/busybox/busybox_1.00.bb @@ -57,7 +57,7 @@ do_compile () { } do_install () { - install -d ${D}/etc/init.d + install -d ${D}/${sysconfdir}/init.d oe_runmake 'PREFIX=${D}' install install -m 0755 ${WORKDIR}/syslog ${D}/${sysconfdir}/init.d/ install -m 644 ${WORKDIR}/syslog.conf ${D}/${sysconfdir}/ @@ -79,10 +79,10 @@ do_install () { install -m 0755 ${S}/examples/udhcp/simple.script ${D}/${sysconfdir}/udhcpc.d/50default install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script fi - rm ${D}/bin/mount - install -m 0755 ${WORKDIR}/mount.busybox ${D}/bin/ - rm ${D}/bin/umount - install -m 0755 ${WORKDIR}/umount.busybox ${D}/bin/ + rm ${D}/${base_bindir}/mount + install -m 0755 ${WORKDIR}/mount.busybox ${D}/${base_bindir}/ + rm ${D}/${base_bindir}/umount + install -m 0755 ${WORKDIR}/umount.busybox ${D}/${base_bindir}/ } pkg_postinst () { |