aboutsummaryrefslogblamecommitdiffstats
path: root/main/busybox/0004-app-location-for-cpio-vi-and-lspci.patch
blob: ca558f8afbcdffae40c1311a73d8a8395483c33e (plain) (tree)
1
2
3
4
5
6
7
8
9
10
                                                                      

                                           
                                                    
 
                                                   
   
                          

                          
                                                 
 
                                              
                                 

                     
                 
                    
                                              


                                                             
 

                                      
                                        
                                 

                  


                                                                                   






                                                         
                                 



                        
                                                                    
 

                                                                                     


                                        
From d4bc80ad7bf9b846b38c903a087c5ed318e848fb Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 27 Dec 2016 20:46:59 +0100
Subject: [PATCH] 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 221667112..a6d7630a4 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -39,7 +39,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
 
diff --git a/editors/vi.c b/editors/vi.c
index f103e0dc0..89397710c 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -161,7 +161,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 0000fbfda..34189d2b5 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_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))
 
 //kbuild:lib-$(CONFIG_LSPCI) += lspci.o