Merge pull request #1713 from ghaerr/version

[build] Update ELKS version to 0.8.0-dev
ghaerr · Sep 12, 2023 · a356c56 · a356c56
2 parents 284a111 + 7fb1145
commit a356c56
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/elks/Makefile-rules b/elks/Makefile-rules
@@ -55,10 +55,10 @@ include $(TOPDIR)/Make.defs
 #########################################################################
 # State the current version of this system.
 
-VERSION 	= 0	# (0-255)
-PATCHLEVEL	= 7	# (0-255)
-SUBLEVEL	= 0	# (0-255)
-PRE		= 0
+VERSION     = 0	# (0-255)
+PATCHLEVEL  = 8	# (0-255)
+SUBLEVEL    = 0	# (0-255)
+PRE         = -dev
 
 #########################################################################
 # Specify the architecture we will use.
@@ -77,14 +77,14 @@ TARGET_NB_IMAGE	= $(TOPDIR)/elks/nbImage
 #########################################################################
 # Define variables directly dependant on the current version number.
 
-ifeq ($(PRE), 0)
+ifeq ($(PRE), )
 
 DIST		= $(shell printf '%u.%u.%u' \
 			$(VERSION) $(PATCHLEVEL) $(SUBLEVEL))
 
 else
 
-DIST		= $(shell printf '%u.%u.%u-pre%u' \
+DIST		= $(shell printf '%u.%u.%u%s' \
 			$(VERSION) $(PATCHLEVEL) $(SUBLEVEL) $(PRE))
 
 endif

diff --git a/image/ver.pl b/image/ver.pl
@@ -2,10 +2,10 @@
 #Get the version from the kernel makefile
 
 while (<>) {
-        /^\s*VERSION\s*=\s*(\d+)/	&& ($ver = $1);
-        /^\s*PATCHLEVEL\s*=\s*(\d+)/	&& ($pat = $1);
-        /^\s*SUBLEVEL\s*=\s*(\d+)/	&& ($sub = $1);
-        /^\s*EXTRAVERSION\s*=\s*(.*)/	&& ($ext = $1);
+        /^\s*VERSION\s*=\s*(\d+)/       && ($ver = $1);
+        /^\s*PATCHLEVEL\s*=\s*(\d+)/    && ($pat = $1);
+        /^\s*SUBLEVEL\s*=\s*(\d+)/      && ($sub = $1);
+        /^\s*PRE\s*=\s*(.*)/            && ($pre = $1);
 }
 
-print "\nELKS ${ver}.${pat}.${sub}${ext}\n\n";
+print "\nELKS ${ver}.${pat}.${sub}${pre}\n\n";