aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/config/conf.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-01-08 14:33:53 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-01-08 14:33:53 +0000
commita9f6941436e83d2f91caf06c13bee86cad309064 (patch)
tree8f3b14ce3f98718cc2513344b82ceb703638ba9b /scripts/config/conf.c
parent3f26960a5c8db5b7cbdf120ddcd7feaadca51c8f (diff)
downloadupstream-a9f6941436e83d2f91caf06c13bee86cad309064.tar.gz
upstream-a9f6941436e83d2f91caf06c13bee86cad309064.tar.bz2
upstream-a9f6941436e83d2f91caf06c13bee86cad309064.zip
scripts/config: sync with linux upstream
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43873
Diffstat (limited to 'scripts/config/conf.c')
-rw-r--r--scripts/config/conf.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/scripts/config/conf.c b/scripts/config/conf.c
index b769654a89..16e5c43787 100644
--- a/scripts/config/conf.c
+++ b/scripts/config/conf.c
@@ -13,6 +13,7 @@
#include <getopt.h>
#include <sys/stat.h>
#include <sys/time.h>
+#include <errno.h>
#include "lkc.h"
@@ -514,14 +515,24 @@ int main(int ac, char **av)
{
struct timeval now;
unsigned int seed;
+ char *seed_env;
/*
* Use microseconds derived seed,
* compensate for systems where it may be zero
*/
gettimeofday(&now, NULL);
-
seed = (unsigned int)((now.tv_sec + 1) * (now.tv_usec + 1));
+
+ seed_env = getenv("KCONFIG_SEED");
+ if( seed_env && *seed_env ) {
+ char *endp;
+ int tmp = (int)strtol(seed_env, &endp, 0);
+ if (*endp == '\0') {
+ seed = tmp;
+ }
+ }
+ fprintf( stderr, "KCONFIG_SEED=0x%X\n", seed );
srand(seed);
break;
}
@@ -622,7 +633,8 @@ int main(int ac, char **av)
conf_set_all_new_symbols(def_default);
break;
case randconfig:
- conf_set_all_new_symbols(def_random);
+ /* Really nothing to do in this loop */
+ while (conf_set_all_new_symbols(def_random)) ;
break;
case defconfig:
conf_set_all_new_symbols(def_default);
@@ -664,7 +676,7 @@ int main(int ac, char **av)
} else if (input_mode == savedefconfig) {
if (conf_write_defconfig(defconfig_file)) {
fprintf(stderr, _("n*** Error while saving defconfig to: %s\n\n"),
- defconfig_file);
+ defconfig_file);
return 1;
}
} else if (input_mode != listnewconfig) {