Changeset 338a8382 in mainline for boot/arch/sparc64/Makefile.inc

Timestamp:

2008-10-12T22:35:46Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

94f8e3c1

Parents:

756f475

Message:

Introduce a boot component configuration option CONFIG_RD_EXTERNAL.
Currently used by the sparc64 port. It says whether the ramdisk
is part of image.boot or a separate file.

File:

• boot/arch/sparc64/Makefile.inc (modified) (2 diffs)

boot/arch/sparc64/Makefile.inc

@@ -27 +27 @@
 #
 
-TMP=distroot
+TMP = distroot
 
 build: $(BASE)/image.iso
+
+ifeq ($(CONFIG_RD_EXTERNAL),y)
+SILO_CONF_FILTER = cat
+else
+SILO_CONF_FILTER = grep -v initrd
+endif
 
 $(BASE)/image.iso: depend arch/$(ARCH)/loader/image.boot
@@ -35 +41 @@
         mkdir -p $(TMP)/HelenOS
         cat arch/$(ARCH)/silo/silo.tar.gz | (cd $(TMP)/boot; tar xvfz -)
-        cp arch/$(ARCH)/silo/README arch/$(ARCH)/silo/COPYING arch/$(ARCH)/silo/silo.conf $(TMP)/boot
+        cp arch/$(ARCH)/silo/README arch/$(ARCH)/silo/COPYING $(TMP)/boot
+        cat arch/$(ARCH)/silo/silo.conf | $(SILO_CONF_FILTER) >$(TMP)/boot/silo.conf
         cp arch/$(ARCH)/loader/image.boot $(TMP)/HelenOS/image.boot
         gzip -f $(TMP)/HelenOS/image.boot
+ifeq ($(CONFIG_RD_EXTERNAL),y)
         cp arch/$(ARCH)/loader/initrd.img $(TMP)/HelenOS/initrd.img
+endif
         mkisofs -f -G $(TMP)/boot/isofs.b -B ... -r -o $(BASE)/image.iso $(TMP)/