From 8937e2dfb3dbfa23597853e9605f930b3607fa63 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 27 Dec 2016 20:46:59 +0100 Subject: [PATCH 02/11] app location for cpio, vi and lspci Adjust location to where alpine linux installs them --- archival/cpio.c | 2 +- editors/vi.c | 2 +- util-linux/lspci.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/archival/cpio.c b/archival/cpio.c index 683f0bb1f..45362b6bc 100644 --- a/archival/cpio.c +++ b/archival/cpio.c @@ -43,7 +43,7 @@ //config: help //config: Passthrough mode. Rarely used. -//applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP)) +//applet:IF_CPIO(APPLET(cpio, BB_DIR_USR_BIN, BB_SUID_DROP)) //kbuild:lib-$(CONFIG_CPIO) += cpio.o //usage:#define cpio_trivial_usage diff --git a/editors/vi.c b/editors/vi.c index 76d1f261b..73d0a67a9 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -163,7 +163,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/util-linux/lspci.c b/util-linux/lspci.c index 8b38a2366..f918f0972 100644 --- a/util-linux/lspci.c +++ b/util-linux/lspci.c @@ -16,7 +16,7 @@ //config: //config: This version uses sysfs (/sys/bus/pci/devices) only. -//applet:IF_LSPCI(APPLET(lspci, BB_DIR_USR_BIN, BB_SUID_DROP)) +//applet:IF_LSPCI(APPLET(lspci, BB_DIR_USR_SBIN, BB_SUID_DROP)) //kbuild:lib-$(CONFIG_LSPCI) += lspci.o -- 2.13.2