fix problems with initram

4 files changed, 11 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index 1fee43d..3cc638d 100644
--- a/Makefile
+++ b/Makefile
@@ -55,6 +55,7 @@ clean:
 	@$(MAKE) -C scripts/write_config/ clean
 	$(RM) -r build
 	$(RM) -r scripts/buildroot/system/skeleton/usr/share/benchmark
+	$(RM) $(INITRAM)
 
 distclean: clean distclean_linux distclean_buildroot
 	$(RM) .conf.mk
@@ -82,15 +83,18 @@ parse_kconfig:
 write_config:
 	@$(MAKE) -C scripts/write_config/
 
-%:
+scripts/buildroot/system/skeleton/usr/share/%:
+	mkdir -p $@
+
+build:
 	mkdir -p $@
 
 $(BUILDROOT_INITRAM): scripts/buildroot/.config
 	@$(MAKE) -C scripts/buildroot
 
-$(INITRAM): $(shell dirname $(INITRAM))
-$(INITRAM): $(BUILDROOT_INITRAM) $${@D}
-	mv $^ $@
+$(INITRAM): build
+$(INITRAM): $(BUILDROOT_INITRAM)
+	mv $< $@
 
 scripts/buildroot/.config:
 	cp $(BUILDROOT_DEF_CONFIG) $@
diff --git a/conf.py b/conf.py
index 8a15b3f..3b6c39b 100644
--- a/conf.py
+++ b/conf.py
@@ -34,7 +34,6 @@ buildroot_def_config = pf('scripts/buildroot_recipe/buildroot.def.config')
 buildroot_inittab_directive = pf('scripts/buildroot_recipe/inittab_directive')
 buildroot_initscript = pf('scripts/buildroot_recipe/linux-conf-perf')
 buildroot_initram = pf('scripts/buildroot/output/images/rootfs.cpio.gz')
-initram = build_folder + '/initram.gz2'
 
 nbscript = pf('scripts/nbscript')
 
@@ -49,3 +48,4 @@ minisat_output = False
 kernel_config_output = True
 kernel_make_output = True
 boot_output = True
+initram = build_folder + 'initram.gz'
diff --git a/scripts/buildroot_recipe/linux-conf-perf b/scripts/buildroot_recipe/linux-conf-perf
index 031ba83..f95ed7c 100755
--- a/scripts/buildroot_recipe/linux-conf-perf
+++ b/scripts/buildroot_recipe/linux-conf-perf
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 /usr/share/benchmark/start | sed -e 's/^/lcp-output: /'
 
diff --git a/scripts/confmk.py b/scripts/confmk.py
index bb44def..9647b5b 100755
--- a/scripts/confmk.py
+++ b/scripts/confmk.py
@@ -19,6 +19,7 @@ def gen_confmk():
 		f.write("INITRAM := " + conf.initram + "\n")
 		f.write("BUILDROOT_DEF_CONFIG := " + conf.buildroot_def_config + "\n")
 		f.write("\n")
+		f.write("INITRAM := " + conf.initram + "\n")
 
 #################################################################################