Merge pull request #2079 from ghaerr/v081

[build] Change version number to v0.8.1
ghaerr · Oct 16, 2024 · 9bd1e04 · 9bd1e04
2 parents d3972b7 + 72e6be7
commit 9bd1e04
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 12 deletions.
diff --git a/build.sh b/build.sh
@@ -37,8 +37,8 @@ if [ "$1" = "auto" ]; then
 	echo "Invoking 'make defconfig'..."
 	make defconfig || clean_exit 2
 	echo "Building IBM PC image..."
-	#cp ibmpc-1440.config .config
-	cp ibmpc-1440-nc.config .config
+	cp ibmpc-1440.config .config
+	#cp ibmpc-1440-nc.config .config
 else
 	echo
 	echo "Now invoking 'make menuconfig' for you to configure the system."

diff --git a/buildimages.sh b/buildimages.sh
@@ -1,5 +1,7 @@
 #
 # This script is used to build all ELKS images outside Github CI
+set -x
+set -e
 
 cleanup()
 {
@@ -41,6 +43,7 @@ build_ibm()
 {
     cleanup
     cp ibmpc-1440.config .config
+    #cp ibmpc-1440-nc.config .config
     make
 
     cd image
@@ -54,5 +57,6 @@ build_pc98
 build_8018x
 
 cp ibmpc-1440.config .config
+#cp ibmpc-1440-nc.config .config
 cleanup
 make
diff --git a/elks/Makefile-rules b/elks/Makefile-rules
@@ -57,7 +57,7 @@ include $(TOPDIR)/Make.defs
 
 VERSION     = 0	# (0-255)
 PATCHLEVEL  = 8	# (0-255)
-SUBLEVEL    = 0	# (0-255)
+SUBLEVEL    = 1	# (0-255)
 PRE         =
 
 #########################################################################

diff --git a/elkscmd/sys_utils/beep.c b/elkscmd/sys_utils/beep.c
@@ -37,7 +37,8 @@ static void beep(long freq)
 
     //And play the sound using the PC speaker
     outb(0x06, PORTC_CONTROL);
-#else
+#endif
+#ifdef CONFIG_ARCH_IBMPC
     //Set the PIT to the desired frequency
     unsigned int d = 1193180L / freq;
     outb(0xb6, TIMER_CMDS_PORT);
@@ -56,7 +57,8 @@ static void silent()
 {
 #ifdef CONFIG_ARCH_PC98
     outb(0x07, PORTC_CONTROL);
-#else
+#endif
+#ifdef CONFIG_ARCH_IBMPC
     unsigned int tmp = inb(SPEAKER_PORT) & 0xFC;
     outb(tmp, SPEAKER_PORT);
 #endif

diff --git a/image/Make.devices b/image/Make.devices
@@ -15,11 +15,11 @@ devices:
 
 ##############################################################################
 # Create frequently accessed /dev files first
-	$(MKDEV) /dev/console	c 4 254 1 1 0600
-	$(MKDEV) /dev/tty1      c 4 0
-	$(MKDEV) /dev/ttyS0     c 4 64
-	$(MKDEV) /dev/fd0       b 3 32
-	$(MKDEV) /dev/fd1       b 3 40
+#	$(MKDEV) /dev/console	c 4 254 1 1 0600
+#	$(MKDEV) /dev/tty1      c 4 0
+#	$(MKDEV) /dev/ttyS0     c 4 64
+#	$(MKDEV) /dev/fd0       b 3 32
+#	$(MKDEV) /dev/fd1       b 3 40
 
 ##############################################################################
 # Create memory devices.

diff --git a/image/Make.image b/image/Make.image
@@ -77,14 +77,15 @@ endif
 
 minixfs:
 	rm -f $(TARGET_FILE)
-	mfs $(VERBOSE) $(TARGET_FILE) mkfs $(MINIX_MKFSOPTS)
+#	mfs $(VERBOSE) $(TARGET_FILE) mkfs $(MINIX_MKFSOPTS)
 #	mfs -v $(VERBOSE) $(TARGET_FILE) addfs Image.all $(DESTDIR)
 #	rm -f Filelist
 #	for f in $$(cd $(DESTDIR); find * -name '*'); do \
 #		echo $$f >> FileList; \
 #	done
 #	mfs -v $(VERBOSE) $(TARGET_FILE) addfs Filelist $(DESTDIR)
-	mfs $(VERBOSE) $(TARGET_FILE) genfs -a $(MINIX_MKFSOPTS) $(DESTDIR)
+#	mfs $(VERBOSE) $(TARGET_FILE) genfs -a $(MINIX_MKFSOPTS) $(DESTDIR)
+	mfs $(VERBOSE) $(TARGET_FILE) genfs $(MINIX_MKFSOPTS) $(DESTDIR)
 ifdef CONFIG_IMG_DEV
 	# command to make char/block devices in image (no sudo required)
 	$(MAKE) -f Make.devices "MKDEV=mfs $(TARGET_FILE) mknod"