Pairs like "dhcp" and "dhcp6" keep swapping around, messing up the diff
for checked in generated files.
---
scripts/config2help.c | 2 +-
scripts/make.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
From b296dac61f8404a24a34c6efcf0d0d61cb8656b4 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <e...@google.com>
Date: Mon, 18 Sep 2017 16:41:33 -0700
Subject: [PATCH] Stably sort generated/help.h.
Pairs like "dhcp" and "dhcp6" keep swapping around, messing up the diff
for checked in generated files.
---
scripts/config2help.c | 2 +-
scripts/make.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/config2help.c b/scripts/config2help.c
index 575b7b8..807c76b 100644
--- a/scripts/config2help.c
+++ b/scripts/config2help.c
@@ -422,7 +422,7 @@ int main(int argc, char *argv[])
dd = dd->next;
if (dd == sym->help) break;
}
- printf("\"\n\n");
+ printf("\"\n");
}
sym = sym->next;
}
diff --git a/scripts/make.sh b/scripts/make.sh
index 77e0e06..ba1fb6c 100755
--- a/scripts/make.sh
+++ b/scripts/make.sh
@@ -259,7 +259,7 @@ fi
if isnewer generated/help.h generated/Config.in
then
echo "generated/help.h"
- generated/config2help Config.in $KCONFIG_CONFIG > generated/help.h || exit 1
+ generated/config2help Config.in $KCONFIG_CONFIG | sort -s > generated/help.h || exit 1
fi
[ ! -z "$NOBUILD" ] && exit 0
--
2.14.1.690.gbb1197296e-goog
_______________________________________________
Toybox mailing list
Toybox@lists.landley.net
http://lists.landley.net/listinfo.cgi/toybox-landley.net
