From 0dab6f340920d1e5c61bda6640205a9e376b9a97 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 4 Aug 2016 11:05:02 +0200 Subject: [PATCH 02/15] set applet location to correspond to upstream for vi and lspci --- editors/vi.c | 2 +- include/applets.src.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/editors/vi.c b/editors/vi.c index 974f997..05d39ea 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -166,7 +166,7 @@ //config: Unless you want more (or less) frequent "undo points" while typing, //config: you should probably leave this unchanged. -//applet:IF_VI(APPLET(vi, BB_DIR_BIN, BB_SUID_DROP)) +//applet:IF_VI(APPLET(vi, BB_DIR_USR_BIN, BB_SUID_DROP)) //kbuild:lib-$(CONFIG_VI) += vi.o diff --git a/include/applets.src.h b/include/applets.src.h index 6e1b02f..03ee70d 100644 --- a/include/applets.src.h +++ b/include/applets.src.h @@ -199,7 +199,7 @@ IF_LOADKMAP(APPLET(loadkmap, BB_DIR_SBIN, BB_SUID_DROP)) IF_LOGNAME(APPLET_NOFORK(logname, logname, BB_DIR_USR_BIN, BB_SUID_DROP, logname)) IF_LOSETUP(APPLET(losetup, BB_DIR_SBIN, BB_SUID_DROP)) IF_LS(APPLET_NOEXEC(ls, ls, BB_DIR_BIN, BB_SUID_DROP, ls)) -IF_LSPCI(APPLET(lspci, BB_DIR_USR_BIN, BB_SUID_DROP)) +IF_LSPCI(APPLET(lspci, BB_DIR_USR_SBIN, BB_SUID_DROP)) IF_LSUSB(APPLET(lsusb, BB_DIR_USR_BIN, BB_SUID_DROP)) IF_MAKEDEVS(APPLET(makedevs, BB_DIR_SBIN, BB_SUID_DROP)) IF_MAKEMIME(APPLET(makemime, BB_DIR_BIN, BB_SUID_DROP)) -- 2.9.1