changeset 1357:a1dc80180a05

Update migrate-kernel.sh to work with baseconfigs.
author Rob Landley <rob@landley.net>
date Sun, 22 May 2011 04:13:54 -0500
parents 5198cfb8e368
children 9252453c40d0
files more/migrate-kernel.sh
diffstat 1 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/more/migrate-kernel.sh	Sat May 21 23:38:59 2011 -0500
+++ b/more/migrate-kernel.sh	Sun May 22 04:13:54 2011 -0500
@@ -17,13 +17,12 @@
 
 USE_UNSTABLE=
 
+(getconfig linux && echo -e "$MORE_KERNEL_CONFIG") > "$WORK/miniconfig-linux"
+
 setupfor linux
 
-cp "$(getconfig linux)" mini.conf || dienow
-[ "$SYSIMAGE_TYPE" == "initramfs" ] &&
-  (echo "CONFIG_BLK_DEV_INITRD=y" >> mini.conf || dienow)
-make ARCH="$BOOT_KARCH" KCONFIG_ALLCONFIG=mini.conf $LINUX_FLAGS \
-  allnoconfig > /dev/null &&
+make ARCH=$BOOT_KARCH $LINUX_FLAGS KCONFIG_ALLCONFIG="$WORK/miniconfig-linux" \
+  allnoconfig >/dev/null &&
 cp .config "$WORK"
 
 cleanup
@@ -32,7 +31,7 @@
 
 setupfor linux
 
-cp "$WORK/.config" . &&
+mv "$WORK/.config" . &&
 yes "" | make ARCH="$BOOT_KARCH" oldconfig &&
 mv .config walrus &&
 ARCH="${BOOT_KARCH}" "$SOURCES/toys/miniconfig.sh" walrus || dienow
@@ -45,3 +44,6 @@
 mv mini.config "$CFG"
 
 cleanup
+
+diff -u <(sort "$WORK/miniconfig-linux") <(sort "$CFG") \
+ | sed '/^ /d;/^@/d;1,2d' | tee "$WORK/mini.diff"