diff options
| author | Karel Kočí <cynerd@email.cz> | 2015-05-06 17:08:30 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2015-05-06 17:08:30 +0200 |
| commit | 86777e27fcb6870694cd166866a37360b7591f5f (patch) | |
| tree | 70267357f882c5ed4ada65756862ddd121c9644c | |
| parent | 6fed74c11b1813eff58fa438fb33c4b1cd1123e5 (diff) | |
| download | linux-conf-perf-86777e27fcb6870694cd166866a37360b7591f5f.tar.gz linux-conf-perf-86777e27fcb6870694cd166866a37360b7591f5f.tar.bz2 linux-conf-perf-86777e27fcb6870694cd166866a37360b7591f5f.zip | |
Remove automatic initram build
Not initram must be set and created manually by user.
| -rw-r--r-- | Makefile | 25 | ||||
| -rw-r--r-- | benchmark.py | 5 | ||||
| -rwxr-xr-x | benchmark/start | 3 | ||||
| -rwxr-xr-x | scripts/confmk.py | 2 |
4 files changed, 3 insertions, 32 deletions
@@ -2,9 +2,6 @@ -include .conf.mk -BENCHMARK_FILES := $(patsubst benchmark/%,scripts/buildroot/system/skeleton/usr/share/benchmark/%,$(shell find benchmark -type f)) -BENCHMARK_FOLDERS := $(shell dirname $(BENCHMARK_FILES)) - all: parse_kconfig write_config picosat help: @@ -41,10 +38,10 @@ mlinux: deflinux: ARCH=$(SRCARCH) $(MAKE) -C linux defconfig -test: $(INITRAM) parse_kconfig +test: $(BUILDROOT_INITRAM) parse_kconfig scripts/test.py -run: parse_kconfig write_config picosat $(INITRAM) +run: parse_kconfig write_config picosat $(BUILDROOT_INITRAM) scripts/loop.py evaluate: @@ -55,8 +52,6 @@ clean: @$(MAKE) -C scripts/write_config clean @if [ -e scripts/picosat-959/makefile ]; then $(MAKE) -C scripts/picosat-959 clean; fi $(RM) -r build - $(RM) -r scripts/buildroot/system/skeleton/usr/share/benchmark - $(RM) $(INITRAM) $(RM) $(NBSCRIPT) distclean: clean distclean_linux distclean_buildroot @@ -85,19 +80,9 @@ 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 scripts/buildroot/system/skeleton/usr/bin/linux-conf-perf $(BENCHMARK_FILES) +$(BUILDROOT_INITRAM): scripts/buildroot/.config scripts/buildroot/system/skeleton/usr/bin/linux-conf-perf @$(MAKE) -C scripts/buildroot -$(INITRAM): build -$(INITRAM): $(BUILDROOT_INITRAM) - cp $< $@ - scripts/buildroot/.config: cp $(BUILDROOT_DEF_CONFIG) $@ @@ -105,10 +90,6 @@ scripts/buildroot/system/skeleton/usr/bin/linux-conf-perf: cp $(BUILDROOT_INITSCRIPT) $@ cat $(BUILDROOT_INITTAB_DIRECTIVE) >> scripts/buildroot/system/skeleton/etc/inittab -$(BENCHMARK_FILES): $(BENCHMARK_FOLDERS) -scripts/buildroot/system/skeleton/usr/share/benchmark/%: benchmark/% - cp $< $@ - picosat: scripts/picosat-959/picosat scripts/picosat-959/picosat: cd scripts/picosat-959 && ./configure diff --git a/benchmark.py b/benchmark.py deleted file mode 100644 index 6d1b342..0000000 --- a/benchmark.py +++ /dev/null @@ -1,5 +0,0 @@ -import sys -import os - -def stdoutput(text): - return {'testing' : 1} diff --git a/benchmark/start b/benchmark/start deleted file mode 100755 index cd36174..0000000 --- a/benchmark/start +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -echo Test diff --git a/scripts/confmk.py b/scripts/confmk.py index 010ca64..de9052e 100755 --- a/scripts/confmk.py +++ b/scripts/confmk.py @@ -16,10 +16,8 @@ def gen_confmk(): f.write("BUILDROOT_INITRAM := " + conf.buildroot_initram + "\n") f.write("BUILDROOT_INITTAB_DIRECTIVE := " + conf.buildroot_inittab_directive + "\n") f.write("BUILDROOT_INITSCRIPT := " + conf.buildroot_initscript + "\n") - 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") f.write("NBSCRIPTS := " + conf.nbscript + "\n") ################################################################################# |