diff options
| author |   Phil Blundell <philb@gnu.org> | 2008-10-20 08:16:58 +0100 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2008-10-20 08:16:58 +0100 |
| commit | a62e78edb46f5070e668c7349da51b4a6b38165e (patch) | |
| tree | 12d4b2ad3519fdff324bd40229537cce9ee0044a /packages/busybox | |
| parent | d047ea450460173217152b00469d140e83922cfc (diff) | |
| download | openembedded-a62e78edb46f5070e668c7349da51b4a6b38165e.tar.gz | |
busybox: tolerate empty layout_execprefix
Diffstat (limited to 'packages/busybox')
| -rw-r--r-- | packages/busybox/busybox.inc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/packages/busybox/busybox.inc b/packages/busybox/busybox.inc index cc196ad767..63f839e246 100644 --- a/packages/busybox/busybox.inc +++ b/packages/busybox/busybox.inc @@ -58,6 +58,13 @@ do_compile() { } do_install () { + oe_runmake busybox.links + if [ "x${layout_prefix}" = "x" ]; then + sed 's:^/usr/:/:' < busybox.links >busybox.links.new + mv busybox.links.new busybox.links + elif [ "${layout_prefix}" != "/usr" ]; then + echo "warning, busybox.links will lose with this prefix" + fi unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS install -d ${D}${sysconfdir}/init.d oe_runmake "PREFIX=${D}" install @@ -67,7 +74,11 @@ do_install () { install -d ${D}/busybox ls ${D} -R - cp -dPr ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/ + for i in ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ; do + if [ -d $i ]; then + cp -dPr $i ${D}/busybox/ + fi + done # Move the busybox binary back to /bin install -d ${D}${base_bindir} mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/ |