Changeset fd6c8b1 in mainline

Timestamp:

2019-08-17T12:49:43Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

28fcaee

Parents:

2d75831

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-27 17:44:42)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:43)

Message:

Build initrd.img from meson

Files:

• boot/Makefile.initrd (modified) (1 diff)
• install.sh.in (modified) (1 diff)
• meson.build (modified) (2 diffs)

boot/Makefile.initrd

@@ -27 +27 @@
 #
 
-INIT_FILES := $(addprefix $(DIST_PATH).initrd/,$(INIT_TASKS))
-INIT_FILES := $(INIT_FILES) $(addsuffix .gz,$(INIT_FILES))
-
-$(INITRD).img:
-        rm -rf $(DIST_PATH).initrd
-        cp -R $(DIST_PATH) $(DIST_PATH).initrd
-        rm -f $(INIT_FILES)
-        rm -rf $(DIST_PATH).initrd/boot
-ifeq ($(RDFMT),tmpfs)
-        tar -c -f $@ -C $(DIST_PATH).initrd .
-endif
-ifeq ($(RDFMT),fat)
-        $(MKFAT) 1048576 $(DIST_PATH).initrd $@
-endif
-ifeq ($(RDFMT),ext4fs)
-        $(MKEXT4) 1048576 $(DIST_PATH).initrd $@
-endif
+$(INITRD).img: ../build/initrd.img
+        cp $< $@

install.sh.in

@@ -11 +11 @@
 fi
 
-rm -r "${DESTDIR}"
+rm -rf "${DESTDIR}"
 
 mkdir -p "${DESTDIR}cfg/"

meson.build

@@ -23 +23 @@
 which = find_program('which')
 sh = find_program('sh')
+mkext4 = find_program('tools/mkext4.py')
+mkfat = find_program('tools/mkfat.py')
 
 autocheck = generator(find_program('tools/autocheck.awk'),
@@ -444 +446 @@
 # Build up dist
 
+dist_dir = meson.current_build_dir()/'dist/'
+
 dist = custom_target('DIST',
         output: 'dist.tag',
         input: [ install_script, install_deps ],
-        command: [ sh, '-x', '-u', '-e', '@INPUT0@', '@OUTPUT@', meson.current_build_dir()/'dist/' ],
+        command: [ sh, '-x', '-u', '-e', '@INPUT0@', '@OUTPUT@', dist_dir ],
         build_by_default: true,
 )
 
-#initrd_img = custom_target('initrd.img',
-#       output: 'initrd.img',
-#       input: dist,
-
-
+# Build initrd image
+
+if RDFMT == 'tmpfs'
+        initrd_cmd = [ 'tar', '-c', '-f', '@OUTPUT@', '-C', dist_dir, '.' ]
+elif RDFMT == 'fat'
+        initrd_cmd = [ mkfat, '1048576', dist_dir, '@OUTPUT@' ]
+elif RDFMT == 'ext4fs'
+        initrd_cmd = [ mkext4, '1048576', dist_dir, '@OUTPUT@' ]
+else
+        error('Unknown RDFMT: ' + RDFMT)
+endif
+
+initrd_img = custom_target('initrd.img',
+        output: 'initrd.img',
+        input: dist,
+        command: initrd_cmd,
+        build_by_default: true,
+)
+