0004-app-location-for-cpio-vi-and-lspci.patch 1.61 KB
Newer Older
1
From 9bbc93f12f7cff8fb51a0bf89907d9875f5c14e6 Mon Sep 17 00:00:00 2001
2 3
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 27 Dec 2016 20:46:59 +0100
4
Subject: [PATCH 04/16] app location for cpio, vi and lspci
5

Natanael Copa's avatar
Natanael Copa committed
6
Adjust location to where alpine linux installs them
7
---
Natanael Copa's avatar
Natanael Copa committed
8
 archival/cpio.c    | 2 +-
9 10
 editors/vi.c       | 2 +-
 util-linux/lspci.c | 2 +-
Natanael Copa's avatar
Natanael Copa committed
11
 3 files changed, 3 insertions(+), 3 deletions(-)
12

Natanael Copa's avatar
Natanael Copa committed
13
diff --git a/archival/cpio.c b/archival/cpio.c
14
index 1d6cbd1e2..0c14f79e7 100644
Natanael Copa's avatar
Natanael Copa committed
15 16
--- a/archival/cpio.c
+++ b/archival/cpio.c
17
@@ -39,7 +39,7 @@
Natanael Copa's avatar
Natanael Copa committed
18
 //config:	help
19
 //config:	Passthrough mode. Rarely used.
Natanael Copa's avatar
Natanael Copa committed
20 21 22
 
-//applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_CPIO(APPLET(cpio, BB_DIR_USR_BIN, BB_SUID_DROP))
23
 
Natanael Copa's avatar
Natanael Copa committed
24 25
 //kbuild:lib-$(CONFIG_CPIO) += cpio.o
 
26
diff --git a/editors/vi.c b/editors/vi.c
27
index cdfb27cc5..20077727e 100644
28 29
--- a/editors/vi.c
+++ b/editors/vi.c
30 31 32
@@ -161,7 +161,7 @@
 //config:	Unless you want more (or less) frequent "undo points" while typing,
 //config:	you should probably leave this unchanged.
33 34 35 36 37 38 39
 
-//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
40
index 0000fbfda..34189d2b5 100644
41 42 43 44
--- a/util-linux/lspci.c
+++ b/util-linux/lspci.c
@@ -16,7 +16,7 @@
 //config:
45
 //config:	This version uses sysfs (/sys/bus/pci/devices) only.
46
 
47 48
-//applet:IF_LSPCI(APPLET_NOEXEC(lspci, lspci, BB_DIR_USR_BIN, BB_SUID_DROP, lspci))
+//applet:IF_LSPCI(APPLET_NOEXEC(lspci, lspci, BB_DIR_USR_SBIN, BB_SUID_DROP, lspci))
49 50 51 52
 
 //kbuild:lib-$(CONFIG_LSPCI) += lspci.o
 
-- 
53
2.16.2
54