summaryrefslogtreecommitdiff
path: root/system/busybox/0004-app-location-for-cpio-vi-and-lspci.patch
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2019-02-26 17:26:55 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2019-02-26 17:26:55 +0000
commitf5f17b24b3fa8017760ac3d09f22bfc86e52bf57 (patch)
tree615baf50f5556d00b750046b0c9cdbf78b2bac2a /system/busybox/0004-app-location-for-cpio-vi-and-lspci.patch
parentba5fe57ac3da43128560a805407bc66718ece336 (diff)
parent4618f5695b7bd00c07d656e965db11b31f0d8b36 (diff)
downloadpackages-f5f17b24b3fa8017760ac3d09f22bfc86e52bf57.tar.gz
packages-f5f17b24b3fa8017760ac3d09f22bfc86e52bf57.tar.bz2
packages-f5f17b24b3fa8017760ac3d09f22bfc86e52bf57.tar.xz
packages-f5f17b24b3fa8017760ac3d09f22bfc86e52bf57.zip
Merge branch 'busyborks' into 'master'
Deprecate busybox package due to insane maintanership burden nobody is willing to take up. See merge request !183
Diffstat (limited to 'system/busybox/0004-app-location-for-cpio-vi-and-lspci.patch')
-rw-r--r--system/busybox/0004-app-location-for-cpio-vi-and-lspci.patch54
1 files changed, 0 insertions, 54 deletions
diff --git a/system/busybox/0004-app-location-for-cpio-vi-and-lspci.patch b/system/busybox/0004-app-location-for-cpio-vi-and-lspci.patch
deleted file mode 100644
index 7f105cb67..000000000
--- a/system/busybox/0004-app-location-for-cpio-vi-and-lspci.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 9bbc93f12f7cff8fb51a0bf89907d9875f5c14e6 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 27 Dec 2016 20:46:59 +0100
-Subject: [PATCH 04/16] 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 1d6cbd1e2..0c14f79e7 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 cdfb27cc5..20077727e 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
-
---
-2.16.2
-