summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--images/NEWS1
-rwxr-xr-ximages/make_boot_img9
2 files changed, 7 insertions, 3 deletions
diff --git a/images/NEWS b/images/NEWS
index 2cd7818d1..04af08400 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,4 @@
+- do not include ka stuff unlesse BUILD_KA is set
- precreate /sys
Version 1.78 - 31 August 2012 by Thierry Vignaud
diff --git a/images/make_boot_img b/images/make_boot_img
index 2d01d6299..575921a39 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -208,15 +208,18 @@ fi
_ "cp -f $modz/modules.alias $modz/modules.description $tmp_initrd/modules/$ext";
}
# ka deploy need some files in all.rdz
- if ($ENV{DEBUGSTAGE1}) {
- mkdir_p("$tmp_initrd/$_") foreach qw(dev ka proc sys var/tmp tmp/stage2);
+ if ($ENV{DEBUGSTAGE1} || $ENV{BUILD_KA}) {
+ mkdir_p("$tmp_initrd/$_") foreach qw(dev proc sys var/tmp tmp/stage2);
symlink("/sbin", "$tmp_initrd/bin");
- cp_af("/usr/bin/ka-d-client", "$tmp_initrd/ka/ka-d-client");
cp_af("/bin/busybox.static", "$tmp_initrd/sbin/busybox");
my @funct = map { /functions:/ .. /^$/ ? do { s/\s//g; split /,/ } : () } `busybox.static`;
shift @funct;
symlink('busybox', $tmp_initrd . "/sbin/$_") foreach @funct;
}
+ if ($ENV{BUILD_KA}) {
+ mkdir_p("$tmp_initrd/ka");
+ cp_af("/usr/bin/ka-d-client", "$tmp_initrd/ka/ka-d-client");
+ }
_ "(cd $tmp_initrd; find . | cpio -o -c --quiet) | xz --check=crc32 --lzma2=dict=512KiB > $img";
_ "rm -rf $tmp_initrd";