Move image build from /elkscmd to /image

Author: mfld-fr

.gitignore

@@ -25,7 +25,6 @@ cross
 # Normal output and testing dirs
 #
 target
-image
 
 #
 # Backups / patches

Make.defs

@@ -1,6 +1,4 @@
-#
-# Top level Makefile definitions
-#
+# Top level Makefile common definitions
 
 ifndef TOPDIR
 $(error TOPDIR is not defined)

Makefile

@@ -33,10 +33,12 @@ CFG_SHELL	:= $(shell \
 all: .config
 	$(MAKE) -C elks all
 	$(MAKE) -C elkscmd all
+	$(MAKE) -C image all
 
 clean:
 	$(MAKE) -C elks clean
 	$(MAKE) -C elkscmd clean
+	$(MAKE) -C image clean
 	@echo
 	@if [ ! -f .config ]; then \
 	    echo ' * This system is not configured. You need to run' ;\

build.sh

@@ -89,15 +89,5 @@ sleep 1
 make all || clean_exit 5
 test -e elks/arch/i86/boot/Image || clean_exit 6
 
-### Make image files
-cd elkscmd
-make image
-
-# TODO: restore the distribution build
-#make images.zip || clean_exit 8
-#make images.tar.gz || clean_exit 8
-#make images.tar.xz || clean_exit 8
-cd "$WD"
-
-echo "Images and image file archives are under 'elkscmd'."
+echo "Target image is under 'image'."
 clean_exit 0

elkscmd/Make.defs

@@ -54,6 +54,8 @@ ELKSCMD_DIR=$(TOPDIR)/elkscmd
 
 INCLUDES=-I$(TOPDIR)/include -I$(ELKS_DIR)/include
 
+TARGET_MNT=$(TOPDIR)/target
+
 ##############################################################################
 #
 # Determine the ELKS kernel version.
@@ -87,7 +89,7 @@ CFLAGS=$(CFLBASE) $(LOCALFLAGS) $(INCLUDES) -D__ELKS__ -DELKS_VERSION=\"$(ELKS_V
 
 LD=ld86
 
-##############################################################################
+###############################################################################
 #
 # Standard compilation rules.
 
@@ -103,62 +105,4 @@ LD=ld86
 .c.o:
 	$(CC) $(CFLAGS) -c -o $*.o $<
 
-#
-# Image file options
-#
-
-IMGDIR=$(TOPDIR)/image
-
-ifdef CONFIG_IMG_FD360
-TARGET_FILE=$(IMGDIR)/fd360
-TARGET_BLKS=360
-endif
-
-ifdef CONFIG_IMG_FD720
-TARGET_FILE=$(IMGDIR)/fd720
-TARGET_BLKS=720
-endif
-
-ifdef CONFIG_IMG_FD1200
-TARGET_FILE=$(IMGDIR)/fd1200
-TARGET_BLKS=1200
-endif
-
-ifdef CONFIG_IMG_FD1440
-TARGET_FILE=$(IMGDIR)/fd1440
-TARGET_BLKS=1440
-endif
-
-ifdef CONFIG_IMG_FD1680
-TARGET_FILE=$(IMGDIR)/fd1680
-TARGET_BLKS=1680
-endif
-
-# FIXME: should use SIBODEV instead of MAKEDEV
-ifdef CONFIG_IMG_SIBO
-TARGET_FILE=$(IMGDIR)/sibo
-TARGET_BLKS=128
-endif
-
-ifdef CONFIG_IMG_HD
-TARGET_FILE=$(IMGDIR)/hd
-TARGET_BLKS=$(CONFIG_IMG_BLOCKS)
-endif
-
-#
-# Image filesystem options
-#
-
-ifdef CONFIG_IMG_MINIX
-MKFS=mkfs.minix
-MKFS_OPTS=-1 -n14 -i360
-endif
-
-MINIX_BOOT=$(ELKSCMD_DIR)/bootblocks
-
-ifdef CONFIG_IMG_FAT
-MKFS=mkfs.vfat
-MKFS_OPTS=-v
-endif
-
-TARGET_MNT=$(TOPDIR)/target
+###############################################################################

elkscmd/Make.rules

@@ -1,6 +1,3 @@
-#
-# ELKS Commands
-# Common rules
-#
+# Commands common rules
 
 .PHONY: all clean install

elkscmd/Makefile

@@ -115,108 +115,21 @@ ifdef CONFIG_APP_TEST
 BUILDDIRS += test
 endif
 
-###############################################################################
-#
-# State location of boot sector and boot helper.
-
-FD_BSECT	= $(MINIX_BOOT)/minix.bin
-
-KHELPER 	= $(MINIX_BOOT)/minix_elks.bin
-
-###############################################################################
-#
-# Names of all possible image files.
-
-IMAGES		= fd360 fd720 fd1440 fd1680
-
 ###############################################################################
 #
 # Compile everything.
 
+include $(BASEDIR)/Make.rules
+
 all:
 	@if [ ! -e $(TOPDIR)/include/autoconf.h ]; \
 	then echo -e "\n*** ERROR: You must configure ELKS first ***\n" >&2; exit 1; fi
-	+@for DIR in $(BUILDDIRS); do $(MAKE) -C $$DIR all || exit 1; done
+	for DIR in $(BUILDDIRS); do $(MAKE) -C $$DIR all || exit 1; done
 
-images_clean:
-	-umount -d $(IMAGES) || true
-	-rm -f $(IMAGES) images.zip images.tar.*
+install:
+	for i in $(BUILDDIRS); do $(MAKE) -C $$i install || exit 1; done
 
 clean:
-	-sudo umount -d $(TARGET_MNT) || true
-	-rm -f $(IMAGES) core images.zip images.tar.*
-	-rm -f *~
-	@for DIR in $(SUBDIRS); do $(MAKE) -C $$DIR clean || exit 1; done
+	for DIR in $(SUBDIRS); do $(MAKE) -C $$DIR clean || exit 1; done
 
 ###############################################################################
-#
-# Include standard packaging commands.
-
-include $(BASEDIR)/Make.rules
-
-###############################################################################
-#
-# Create disk images
-
-kernel_image: $(ELKS_DIR)/arch/i86/boot/Image
-
-boot_blocks: $(FD_BSECT) $(KHELPER)
-
-ifdef CONFIG_IMG_BOOT
-image: boot_blocks kernel_image
-else
-image:
-endif
-	mkdir -p $(IMGDIR)
-ifdef CONFIG_IMG_DEV
-	-sudo umount -d $(TARGET_FILE)
-endif
-	-sudo rm -rf $(TARGET_FILE)
-ifdef CONFIG_IMG_DEV
-	dd if=/dev/zero of=$(TARGET_FILE) bs=1024 count=$(TARGET_BLKS)
-	sudo $(MKFS) $(MKFS_OPTS) $(TARGET_FILE)
-endif
-	-sudo rm -rf $(TARGET_MNT)
-	mkdir -p $(TARGET_MNT)
-ifdef CONFIG_IMG_DEV
-	sudo mount $(LOOP) $(TARGET_FILE) $(TARGET_MNT)
-endif
-	(cd $(ELKSCMD_DIR)/rootfs_template; \
-		tar cf - --exclude CVS --exclude .keep *) | \
-		(cd $(TARGET_MNT); sudo tar xpf - --no-same-owner)
-ifdef CONFIG_IMG_LINK
-	(cd $(TARGET_MNT)/dev; sudo ./MAKEDEV; sudo rm MAKEDEV MAKESET)
-endif
-	for i in $(BUILDDIRS); do $(MAKE) -C $$i install || exit 1; done
-	sudo bash -c "$(ELKSCMD_DIR)/tools/ver.pl $(ELKS_DIR)/Makefile-rules > $(TARGET_MNT)/etc/issue"
-ifdef CONFIG_IMG_BOOT
-	sudo mkdir -p $(TARGET_MNT)/boot
-	sudo install $(ELKS_DIR)/arch/i86/boot/Image $(TARGET_MNT)/boot/linux
-	sudo install $(KHELPER) $(TARGET_MNT)/boot/boot
-endif
-ifdef CONFIG_IMG_DEV
-	sudo umount -d $(TARGET_FILE)
-ifdef CONFIG_IMG_BOOT
-	dd if=$(FD_BSECT) of=$(TARGET_FILE) bs=512 count=2 conv=notrunc
-endif
-endif
-ifdef CONFIG_IMG_ROM
-	cd $(IMGDIR) && $(ELKS_DIR)/tools/mkromfs $(TARGET_MNT)
-endif
-
-# These ones are now broken
-# Should be moved into a global script
-
-images: $(IMAGES)
-
-images.zip: $(IMAGES)
-	zip -9q images.zip $(IMAGES)
-	-@stat -c "%s %n" images.zip
-
-images.tar.gz: $(IMAGES)
-	tar -c $(IMAGES) | gzip -9 > images.tar.gz
-	-@stat -c "%s %n" images.tar.gz
-
-images.tar.xz: $(IMAGES)
-	tar -c $(IMAGES) | xz -e > images.tar.xz
-	-@stat -c "%s %n" images.tar.xz

image/.gitignore

@@ -0,0 +1,2 @@
+# Image files
+*.bin

image/Make.defs

@@ -0,0 +1,70 @@
+# Make defines for images
+
+ifndef TOPDIR
+$(error TOPDIR is not defined)
+endif
+
+include $(TOPDIR)/Make.defs
+
+# Dependencies folders
+
+ELKS_DIR = $(TOPDIR)/elks
+ELKSCMD_DIR = $(TOPDIR)/elkscmd
+
+MINIX_BOOT = $(ELKSCMD_DIR)/bootblocks
+FD_BSECT = $(MINIX_BOOT)/minix.bin
+KHELPER	= $(MINIX_BOOT)/minix_elks.bin
+
+# Image file options
+
+IMGDIR=$(TOPDIR)/image
+
+ifdef CONFIG_IMG_FD360
+TARGET_FILE = $(IMGDIR)/fd360.bin
+TARGET_BLKS = 360
+endif
+
+ifdef CONFIG_IMG_FD720
+TARGET_FILE = $(IMGDIR)/fd720.bin
+TARGET_BLKS = 720
+endif
+
+ifdef CONFIG_IMG_FD1200
+TARGET_FILE = $(IMGDIR)/fd1200.bin
+TARGET_BLKS = 1200
+endif
+
+ifdef CONFIG_IMG_FD1440
+TARGET_FILE = $(IMGDIR)/fd1440.bin
+TARGET_BLKS = 1440
+endif
+
+ifdef CONFIG_IMG_FD1680
+TARGET_FILE = $(IMGDIR)/fd1680.bin
+TARGET_BLKS = 1680
+endif
+
+# FIXME: should use SIBODEV instead of MAKEDEV
+ifdef CONFIG_IMG_SIBO
+TARGET_FILE = $(IMGDIR)/sibo.bin
+TARGET_BLKS = 128
+endif
+
+ifdef CONFIG_IMG_HD
+TARGET_FILE = $(IMGDIR)/hd.bin
+TARGET_BLKS = $(CONFIG_IMG_BLOCKS)
+endif
+
+# Image filesystem options
+
+ifdef CONFIG_IMG_MINIX
+MKFS = mkfs.minix
+MKFS_OPTS = -1 -n14 -i360
+endif
+
+ifdef CONFIG_IMG_FAT
+MKFS = mkfs.vfat
+MKFS_OPTS = -v
+endif
+
+TARGET_MNT = $(TOPDIR)/target

image/Make.rules

@@ -0,0 +1,3 @@
+# Images common rules
+
+.PHONY: all clean install