diff options
author | Alexey Neyman <stilor@att.net> | 2017-12-02 23:30:38 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-02 23:30:38 (GMT) |
commit | d917a29865876b913fe2939ee2a0728145e8543a (patch) | |
tree | 4e048ed57988306696efa3c5b81a80d48030e913 /packages/uClibc/0.9.33.2/999-make-olddefconfig.patch | |
parent | e832b9b220f90b11b893e2815ceb37ec2b708683 (diff) | |
parent | 98bc4decdeab1361bdc585c86591718fb08c8ffb (diff) |
Merge pull request #874 from stilor/renumber-update-patches
Renumber & update patches
Diffstat (limited to 'packages/uClibc/0.9.33.2/999-make-olddefconfig.patch')
-rw-r--r-- | packages/uClibc/0.9.33.2/999-make-olddefconfig.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/packages/uClibc/0.9.33.2/999-make-olddefconfig.patch b/packages/uClibc/0.9.33.2/999-make-olddefconfig.patch deleted file mode 100644 index 8bc87ec..0000000 --- a/packages/uClibc/0.9.33.2/999-make-olddefconfig.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -urpN uClibc-0.9.33.2.orig/extra/config/conf.c uClibc-0.9.33.2/extra/config/conf.c ---- uClibc-0.9.33.2.orig/extra/config/conf.c 2017-02-04 12:57:38.488808014 -0800 -+++ uClibc-0.9.33.2/extra/config/conf.c 2017-02-04 20:26:28.613244457 -0800 -@@ -435,6 +435,7 @@ int main(int ac, char **av) - const char *name; - const char *configname = conf_get_configname(); - struct stat tmpstat; -+ int olddefconfig = 0; - - setlocale(LC_ALL, ""); - bindtextdomain(PACKAGE, LOCALEDIR); -@@ -451,6 +452,7 @@ int main(int ac, char **av) - break; - case 'd': - input_mode = set_default; -+ olddefconfig = 1; - break; - case 'D': - input_mode = set_default; -@@ -514,7 +516,7 @@ int main(int ac, char **av) - switch (input_mode) { - case set_default: - if (!defconfig_file) -- defconfig_file = conf_get_default_confname(); -+ defconfig_file = olddefconfig ? NULL : conf_get_default_confname(); - if (conf_read(defconfig_file)) { - printf(_("***\n" - "*** Can't find default configuration \"%s\"!\n" -diff -urpN uClibc-0.9.33.2.orig/Makefile.in uClibc-0.9.33.2/Makefile.in ---- uClibc-0.9.33.2.orig/Makefile.in 2017-02-04 12:57:38.484807980 -0800 -+++ uClibc-0.9.33.2/Makefile.in 2017-02-04 12:59:34.625789324 -0800 -@@ -460,6 +460,9 @@ allyesconfig: $(conf) - allnoconfig: $(conf) - $(Q)$< -n extra/Configs/Config.in - -+olddefconfig: $(conf) -+ $(Q)$< -d extra/Configs/Config.in -+ - defconfig: $(conf) - $(Q)$< -D extra/Configs/defconfigs/$(ARCH)/$@ extra/Configs/Config.in - |