diff mbox

[OpenWrt-Devel] busybox: include config files relative to serveral Config.in

Message ID CA+HL8jf3=kL+Z59en7c2H7XJvaNFa2aTxhzcA+25A=ZSOxP7bA@mail.gmail.com
State Superseded
Headers show

Commit Message

Wensheng Tang Jan. 3, 2016, 5:35 a.m. UTC 
Once reported at https://dev.openwrt.org/ticket/18552. When using SDK we
shouldn't use absolute path in the Config.in.

Signed-off-by: Wensheng Tang <sp3478@gmail.com>

---
 package/utils/busybox/config/Config.in            | 43
++++++++++++++++++++++---------------------
 package/utils/busybox/config/networking/Config.in |  2 +-
 package/utils/busybox/config/util-linux/Config.in |  2 +-
 3 files changed, 24 insertions(+), 23 deletions(-)

Comments

Felix Fietkau Jan. 3, 2016, 11:39 a.m. UTC | #1 
On 2016-01-03 06:35, Wensheng Tang wrote:
> Once reported at https://dev.openwrt.org/ticket/18552. When using SDK we
> shouldn't use absolute path in the Config.in.
> 
> Signed-off-by: Wensheng Tang <sp3478@gmail.com <mailto:sp3478@gmail.com>>
This patch is whitespace mangled and does not apply. Additionally, the
script that generated these files needs to be adjusted as well.
I've taken care of this in r48078

Thanks,

- Felix
diff mbox

Patch

diff --git a/package/utils/busybox/config/Config.in
b/package/utils/busybox/config/Config.in
index 6a205f6..896aed7 100644
--- a/package/utils/busybox/config/Config.in
+++ b/package/utils/busybox/config/Config.in
@@ -815,29 +815,30 @@  config BUSYBOX_CONFIG_PREFIX

 endmenu

-source package/utils/busybox/config/libbb/Config.in
+source libbb/Config.in

 endmenu

 comment "Applets"

-source package/utils/busybox/config/archival/Config.in
-source package/utils/busybox/config/coreutils/Config.in
-source package/utils/busybox/config/console-tools/Config.in
-source package/utils/busybox/config/debianutils/Config.in
-source package/utils/busybox/config/editors/Config.in
-source package/utils/busybox/config/findutils/Config.in
-source package/utils/busybox/config/init/Config.in
-source package/utils/busybox/config/loginutils/Config.in
-source package/utils/busybox/config/e2fsprogs/Config.in
-source package/utils/busybox/config/modutils/Config.in
-source package/utils/busybox/config/util-linux/Config.in
-source package/utils/busybox/config/miscutils/Config.in
-source package/utils/busybox/config/networking/Config.in
-source package/utils/busybox/config/printutils/Config.in
-source package/utils/busybox/config/mailutils/Config.in
-source package/utils/busybox/config/procps/Config.in
-source package/utils/busybox/config/runit/Config.in
-source package/utils/busybox/config/selinux/Config.in
-source package/utils/busybox/config/shell/Config.in
-source package/utils/busybox/config/sysklogd/Config.in
+source archival/Config.in
+source coreutils/Config.in
+source console-tools/Config.in
+source debianutils/Config.in
+source editors/Config.in
+source findutils/Config.in
+source init/Config.in
+source loginutils/Config.in
+source e2fsprogs/Config.in
+source modutils/Config.in
+source util-linux/Config.in
+source miscutils/Config.in
+source networking/Config.in
+source printutils/Config.in
+source mailutils/Config.in
+source procps/Config.in
+source runit/Config.in
+source selinux/Config.in
+source shell/Config.in
+source sysklogd/Config.in
+
diff --git a/package/utils/busybox/config/networking/Config.in
b/package/utils/busybox/config/networking/Config.in
index 40b3c68..7e5a414 100644
--- a/package/utils/busybox/config/networking/Config.in
+++ b/package/utils/busybox/config/networking/Config.in
@@ -1111,7 +1111,7 @@  config BUSYBOX_CONFIG_FEATURE_TUNCTL_UG
          Allow to specify owner and group of newly created interface.
          340 bytes of pure bloat. Say no here.

-source package/utils/busybox/config/networking/udhcp/Config.in
+source udhcp/Config.in

 config BUSYBOX_CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS
        string "ifup udhcpc command line options"
diff --git a/package/utils/busybox/config/util-linux/Config.in
b/package/utils/busybox/config/util-linux/Config.in
index 8c87f53..017b119 100644
--- a/package/utils/busybox/config/util-linux/Config.in
+++ b/package/utils/busybox/config/util-linux/Config.in
@@ -800,6 +800,6 @@  config BUSYBOX_CONFIG_FEATURE_MTAB_SUPPORT
          About the only reason to use this is if you've removed /proc from
          your kernel.

-source package/utils/busybox/config/util-linux/volume_id/Config.in
+source volume_id/Config.in

 endmenu