summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox/busybox-1.21.1/run-parts.in.usr-bin.patch
blob: 45f69a937c959d42fd35264af62c9e70ea067186 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
Upstream-Status: Inappropriate [configuration]

# copy commit message from OE as the patch comment:
#    commit f1b326c83be0d95571b991d8d2ee239982380b6b
#    Author: Martin Jansa <Martin.Jansa@gmail.com>
#    Date:   Fri Apr 30 15:37:38 2010 +0200
#
#    busybox: add patch for installing run-parts to /usr/bin/ instead of /bin
#    
#    * otherwise debianutils install will fail with
#      update-alternatives: Error: cannot register alternative run-parts to /usr/bin/run-parts since it is 
#    
#    Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
#
# Poky doesn't have debianutils, but let's keep it for safety
# above comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06

diff -uNr busybox-1.15.3.orig//include/applets.src.h busybox-1.15.3/include/applets.src.h
--- busybox-1.15.3.orig//include/applets.src.h	2009-12-12 22:13:28.000000000 +0100
+++ busybox-1.15.3/include/applets.src.h	2010-04-30 15:35:40.000000000 +0200
@@ -304,7 +304,7 @@
 IF_RPM(APPLET(rpm, BB_DIR_BIN, BB_SUID_DROP))
 IF_RPM2CPIO(APPLET(rpm2cpio, BB_DIR_USR_BIN, BB_SUID_DROP))
 IF_RTCWAKE(APPLET(rtcwake, BB_DIR_USR_SBIN, BB_SUID_DROP))
-IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, BB_DIR_BIN, BB_SUID_DROP, run_parts))
+IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, BB_DIR_USR_BIN, BB_SUID_DROP, run_parts))
 IF_RUNCON(APPLET(runcon, BB_DIR_USR_BIN, BB_SUID_DROP))
 IF_RUNLEVEL(APPLET(runlevel, BB_DIR_SBIN, BB_SUID_DROP))
 IF_RUNSV(APPLET(runsv, BB_DIR_USR_BIN, _BB_SUID_DROP))