dac8e79a1
Denys Vlasenko
2012-06-20
Subject
Move several applets to different install dir:
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/applets.src.h+20 -20
| @@ -70,12 +70,12 @@ INSERT | |
| IF_TEST(APPLET_NOFORK([, test, BB_DIR_USR_BIN, BB_SUID_DROP, test)) | |
| IF_TEST(APPLET_NOFORK([[, test, BB_DIR_USR_BIN, BB_SUID_DROP, test)) | |
| IF_ACPID(APPLET(acpid, BB_DIR_SBIN, BB_SUID_DROP)) | |
| - | IF_ADDGROUP(APPLET(addgroup, BB_DIR_BIN, BB_SUID_DROP)) |
| - | IF_ADDUSER(APPLET(adduser, BB_DIR_BIN, BB_SUID_DROP)) |
| + | IF_ADDGROUP(APPLET(addgroup, BB_DIR_USR_SBIN, BB_SUID_DROP)) |
| + | IF_ADDUSER(APPLET(adduser, BB_DIR_SBIN, BB_SUID_DROP)) |
| IF_ADJTIMEX(APPLET(adjtimex, BB_DIR_SBIN, BB_SUID_DROP)) | |
| IF_AR(APPLET(ar, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| IF_ARP(APPLET(arp, BB_DIR_SBIN, BB_SUID_DROP)) | |
| - | IF_ARPING(APPLET(arping, BB_DIR_USR_BIN, BB_SUID_DROP)) |
| + | IF_ARPING(APPLET(arping, BB_DIR_USR_SBIN, BB_SUID_DROP)) |
| IF_AWK(APPLET_NOEXEC(awk, awk, BB_DIR_USR_BIN, BB_SUID_DROP, awk)) | |
| IF_BASENAME(APPLET_NOFORK(basename, basename, BB_DIR_USR_BIN, BB_SUID_DROP, basename)) | |
| IF_BBCONFIG(APPLET(bbconfig, BB_DIR_BIN, BB_SUID_DROP)) | |
| @@ -86,7 +86,7 @@ IF_BZIP2(APPLET(bzip2, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| IF_CAL(APPLET(cal, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| IF_CAT(APPLET_NOFORK(cat, cat, BB_DIR_BIN, BB_SUID_DROP, cat)) | |
| IF_CATV(APPLET(catv, BB_DIR_BIN, BB_SUID_DROP)) | |
| - | IF_CHAT(APPLET(chat, BB_DIR_USR_BIN, BB_SUID_DROP)) |
| + | IF_CHAT(APPLET(chat, BB_DIR_USR_SBIN, BB_SUID_DROP)) |
| IF_CHATTR(APPLET(chattr, BB_DIR_BIN, BB_SUID_DROP)) | |
| IF_CHCON(APPLET(chcon, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| IF_CHGRP(APPLET_NOEXEC(chgrp, chgrp, BB_DIR_BIN, BB_SUID_DROP, chgrp)) | |
| @@ -111,8 +111,8 @@ IF_CUT(APPLET_NOEXEC(cut, cut, BB_DIR_USR_BIN, BB_SUID_DROP, cut)) | |
| IF_DC(APPLET(dc, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| IF_DD(APPLET_NOEXEC(dd, dd, BB_DIR_BIN, BB_SUID_DROP, dd)) | |
| IF_DEALLOCVT(APPLET(deallocvt, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| - | IF_DELGROUP(APPLET_ODDNAME(delgroup, deluser, BB_DIR_BIN, BB_SUID_DROP, delgroup)) |
| - | IF_DELUSER(APPLET(deluser, BB_DIR_BIN, BB_SUID_DROP)) |
| + | IF_DELGROUP(APPLET_ODDNAME(delgroup, deluser, BB_DIR_USR_SBIN, BB_SUID_DROP, delgroup)) |
| + | IF_DELUSER(APPLET(deluser, BB_DIR_USR_SBIN, BB_SUID_DROP)) |
| IF_DEVFSD(APPLET(devfsd, BB_DIR_SBIN, BB_SUID_DROP)) | |
| IF_DEVMEM(APPLET(devmem, BB_DIR_SBIN, BB_SUID_DROP)) | |
| IF_DF(APPLET(df, BB_DIR_BIN, BB_SUID_DROP)) | |
| @@ -136,7 +136,7 @@ IF_EJECT(APPLET(eject, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| IF_ENV(APPLET_NOEXEC(env, env, BB_DIR_USR_BIN, BB_SUID_DROP, env)) | |
| IF_ENVDIR(APPLET_ODDNAME(envdir, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, envdir)) | |
| IF_ENVUIDGID(APPLET_ODDNAME(envuidgid, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, envuidgid)) | |
| - | IF_ETHER_WAKE(APPLET_ODDNAME(ether-wake, ether_wake, BB_DIR_USR_BIN, BB_SUID_DROP, ether_wake)) |
| + | IF_ETHER_WAKE(APPLET_ODDNAME(ether-wake, ether_wake, BB_DIR_USR_SBIN, BB_SUID_DROP, ether_wake)) |
| IF_EXPAND(APPLET(expand, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| IF_EXPR(APPLET(expr, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| IF_FAKEIDENTD(APPLET(fakeidentd, BB_DIR_USR_SBIN, BB_SUID_DROP)) | |
| @@ -144,7 +144,7 @@ IF_FALSE(APPLET_NOFORK(false, false, BB_DIR_BIN, BB_SUID_DROP, false)) | |
| IF_FBSET(APPLET(fbset, BB_DIR_USR_SBIN, BB_SUID_DROP)) | |
| IF_FBSPLASH(APPLET(fbsplash, BB_DIR_SBIN, BB_SUID_DROP)) | |
| IF_FDFLUSH(APPLET_ODDNAME(fdflush, freeramdisk, BB_DIR_BIN, BB_SUID_DROP, fdflush)) | |
| - | IF_FDFORMAT(APPLET(fdformat, BB_DIR_USR_BIN, BB_SUID_DROP)) |
| + | IF_FDFORMAT(APPLET(fdformat, BB_DIR_USR_SBIN, BB_SUID_DROP)) |
| IF_FDISK(APPLET(fdisk, BB_DIR_SBIN, BB_SUID_DROP)) | |
| IF_FGCONSOLE(APPLET(fgconsole, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| /* Benefits from suid root: better access to /dev/BLOCKDEVs: */ | |
| @@ -182,7 +182,7 @@ IF_HWCLOCK(APPLET(hwclock, BB_DIR_SBIN, BB_SUID_DROP)) | |
| IF_IFCONFIG(APPLET(ifconfig, BB_DIR_SBIN, BB_SUID_DROP)) | |
| IF_IFUPDOWN(APPLET_ODDNAME(ifdown, ifupdown, BB_DIR_SBIN, BB_SUID_DROP, ifdown)) | |
| IF_IFENSLAVE(APPLET(ifenslave, BB_DIR_SBIN, BB_SUID_DROP)) | |
| - | IF_IFPLUGD(APPLET(ifplugd, BB_DIR_USR_BIN, BB_SUID_DROP)) |
| + | IF_IFPLUGD(APPLET(ifplugd, BB_DIR_USR_SBIN, BB_SUID_DROP)) |
| IF_IFUPDOWN(APPLET_ODDNAME(ifup, ifupdown, BB_DIR_SBIN, BB_SUID_DROP, ifup)) | |
| IF_INETD(APPLET(inetd, BB_DIR_USR_SBIN, BB_SUID_DROP)) | |
| IF_INOTIFYD(APPLET(inotifyd, BB_DIR_SBIN, BB_SUID_DROP)) | |
| @@ -193,20 +193,20 @@ IF_IONICE(APPLET(ionice, BB_DIR_BIN, BB_SUID_DROP)) | |
| || ENABLE_FEATURE_IP_LINK \ | |
| || ENABLE_FEATURE_IP_TUNNEL \ | |
| || ENABLE_FEATURE_IP_RULE | |
| - | IF_IP(APPLET(ip, BB_DIR_BIN, BB_SUID_DROP)) |
| + | IF_IP(APPLET(ip, BB_DIR_SBIN, BB_SUID_DROP)) |
| #endif | |
| - | IF_IPADDR(APPLET(ipaddr, BB_DIR_BIN, BB_SUID_DROP)) |
| + | IF_IPADDR(APPLET(ipaddr, BB_DIR_SBIN, BB_SUID_DROP)) |
| IF_IPCALC(APPLET(ipcalc, BB_DIR_BIN, BB_SUID_DROP)) | |
| IF_IPCRM(APPLET(ipcrm, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| IF_IPCS(APPLET(ipcs, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| - | IF_IPLINK(APPLET(iplink, BB_DIR_BIN, BB_SUID_DROP)) |
| - | IF_IPROUTE(APPLET(iproute, BB_DIR_BIN, BB_SUID_DROP)) |
| - | IF_IPRULE(APPLET(iprule, BB_DIR_BIN, BB_SUID_DROP)) |
| - | IF_IPTUNNEL(APPLET(iptunnel, BB_DIR_BIN, BB_SUID_DROP)) |
| - | IF_KBD_MODE(APPLET(kbd_mode, BB_DIR_USR_BIN, BB_SUID_DROP)) |
| + | IF_IPLINK(APPLET(iplink, BB_DIR_SBIN, BB_SUID_DROP)) |
| + | IF_IPROUTE(APPLET(iproute, BB_DIR_SBIN, BB_SUID_DROP)) |
| + | IF_IPRULE(APPLET(iprule, BB_DIR_SBIN, BB_SUID_DROP)) |
| + | IF_IPTUNNEL(APPLET(iptunnel, BB_DIR_SBIN, BB_SUID_DROP)) |
| + | IF_KBD_MODE(APPLET(kbd_mode, BB_DIR_BIN, BB_SUID_DROP)) |
| IF_KILL(APPLET(kill, BB_DIR_BIN, BB_SUID_DROP)) | |
| IF_KILLALL(APPLET_ODDNAME(killall, kill, BB_DIR_USR_BIN, BB_SUID_DROP, killall)) | |
| - | IF_KILLALL5(APPLET_ODDNAME(killall5, kill, BB_DIR_USR_BIN, BB_SUID_DROP, killall5)) |
| + | IF_KILLALL5(APPLET_ODDNAME(killall5, kill, BB_DIR_USR_SBIN, BB_SUID_DROP, killall5)) |
| IF_KLOGD(APPLET(klogd, BB_DIR_SBIN, BB_SUID_DROP)) | |
| IF_LAST(APPLET(last, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| //IF_LENGTH(APPLET_NOFORK(length, length, BB_DIR_USR_BIN, BB_SUID_DROP, length)) | |
| @@ -288,7 +288,7 @@ IF_PWD(APPLET_NOFORK(pwd, pwd, BB_DIR_BIN, BB_SUID_DROP, pwd)) | |
| IF_RAIDAUTORUN(APPLET(raidautorun, BB_DIR_SBIN, BB_SUID_DROP)) | |
| IF_RDATE(APPLET(rdate, BB_DIR_USR_SBIN, BB_SUID_DROP)) | |
| IF_RDEV(APPLET(rdev, BB_DIR_USR_SBIN, BB_SUID_DROP)) | |
| - | IF_READAHEAD(APPLET(readahead, BB_DIR_USR_BIN, BB_SUID_DROP)) |
| + | IF_READAHEAD(APPLET(readahead, BB_DIR_USR_SBIN, BB_SUID_DROP)) |
| IF_READLINK(APPLET(readlink, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| IF_READPROFILE(APPLET(readprofile, BB_DIR_USR_SBIN, BB_SUID_DROP)) | |
| IF_REALPATH(APPLET(realpath, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| @@ -303,7 +303,7 @@ IF_RMDIR(APPLET_NOFORK(rmdir, rmdir, BB_DIR_BIN, BB_SUID_DROP, rmdir)) | |
| IF_ROUTE(APPLET(route, BB_DIR_SBIN, BB_SUID_DROP)) | |
| 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_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_RUNCON(APPLET(runcon, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| IF_RUNLEVEL(APPLET(runlevel, BB_DIR_SBIN, BB_SUID_DROP)) | |
| @@ -365,7 +365,7 @@ IF_TELNETD(APPLET(telnetd, BB_DIR_USR_SBIN, BB_SUID_DROP)) | |
| IF_TEST(APPLET_NOFORK(test, test, BB_DIR_USR_BIN, BB_SUID_DROP, test)) | |
| #if ENABLE_FEATURE_TFTP_GET || ENABLE_FEATURE_TFTP_PUT | |
| IF_TFTP(APPLET(tftp, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| - | IF_TFTPD(APPLET(tftpd, BB_DIR_USR_BIN, BB_SUID_DROP)) |
| + | IF_TFTPD(APPLET(tftpd, BB_DIR_USR_SBIN, BB_SUID_DROP)) |
| #endif | |
| IF_TIME(APPLET(time, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| IF_TIMEOUT(APPLET(timeout, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
loginutils/add-remove-shell.c+2 -2
| @@ -8,8 +8,8 @@ | |
| * for details. | |
| */ | |
| - | //applet:IF_ADD_SHELL( APPLET_ODDNAME(add-shell , add_remove_shell, BB_DIR_USR_BIN, BB_SUID_DROP, add_shell )) |
| - | //applet:IF_REMOVE_SHELL(APPLET_ODDNAME(remove-shell, add_remove_shell, BB_DIR_USR_BIN, BB_SUID_DROP, remove_shell)) |
| + | //applet:IF_ADD_SHELL( APPLET_ODDNAME(add-shell , add_remove_shell, BB_DIR_USR_SBIN, BB_SUID_DROP, add_shell )) |
| + | //applet:IF_REMOVE_SHELL(APPLET_ODDNAME(remove-shell, add_remove_shell, BB_DIR_USR_SBIN, BB_SUID_DROP, remove_shell)) |
| //kbuild:lib-$(CONFIG_ADD_SHELL) += add-remove-shell.o | |
| //kbuild:lib-$(CONFIG_REMOVE_SHELL) += add-remove-shell.o | |
procps/powertop.c+1 -1
| @@ -9,7 +9,7 @@ | |
| * Licensed under GPLv2, see file LICENSE in this source tree. | |
| */ | |
| - | //applet:IF_POWERTOP(APPLET(powertop, BB_DIR_BIN, BB_SUID_DROP)) |
| + | //applet:IF_POWERTOP(APPLET(powertop, BB_DIR_USR_SBIN, BB_SUID_DROP)) |
| //kbuild:lib-$(CONFIG_POWERTOP) += powertop.o | |