[Lunar-commits] <lunar-iso> Updated the config file

[Peter de Ridder]

commit a16cdfdfe992a68c704ff63303c6df61f152753e
Author: Peter de Ridder <peter at lunar-linux.org>
Date: Thu, 30 May 2013 14:38:08 -0700
URL: https://github.com/lunar-linux/lunar-iso/commit/a16cdfdfe992a68c704ff63303c6df61f152753e

Updated the config file
---
  Makefile       | +7/-2     
  README         | +4/-1     
  conf/config.in | +3/-9     
  3 files changed, 14 insertions(+), 12 deletions(-)

--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,9 @@
 # Makefile to make ISO's
 #
 
+# Default target
+all: iso
+
 #
 # all user configurable options are in conf/config
 #
@@ -16,6 +19,10 @@ ISO_ARCH:=$(shell arch)
 
 include $(ISO_SOURCE)/conf/config
 
+$(ISO_SOURCE)/conf/config:
+	@echo First copy conf/config.in to conf/config and change the base
+	@echo parameters. Afterwards run make again.
+
 ###ISO_KSUFFIX = $(shell if echo $(ISO_KVER) | grep -q "^2\.6\." ; then echo 2.6 ; else echo 2.4 ; fi ;)
 
 ifeq ($(ISO_GCCARCH),x86-64)
@@ -33,8 +40,6 @@ ISO_TARGET = $(ISO_SOURCE)/BUILD
 
 export ISO_SOURCE ISO_TARGET ISO_BUILD
 
-all: iso
-
 .SUFFIXES:
 
 include mkfiles/bootstrap.mk
--- a/README
+++ b/README
@@ -25,6 +25,7 @@ that really (really (really)) do not need to be in there.
 The Makefile should be able to do most of the ISO building automatically, but
 there are a few steps that need to be taken:
 
+ o Copy conf/config.in to conf/config
  o Configure the base parameters of the ISO in conf/config
  
 The code tries to pollute the host system as little as it can. It will however
@@ -42,7 +43,9 @@ this cache is used to build all the core modules.
 
 -- Building it
 
-Here's a brief explanation of the make targets:
+Run make to build the ISO. The default target will build the completely ISO.
+
+Here's a brief explanation of the different make targets:
 
 target			create BUILD/ directory
 
--- a/conf/config.in
+++ b/conf/config.in
@@ -10,7 +10,7 @@
 ISO_ARCH = i686
 
 # the ISO major version number
-ISO_MAJOR = 1.6.5
+ISO_MAJOR = 1.7.0
 
 # minor version (pre, rc, etc). leave empty for final release
 ISO_MINOR =
@@ -24,10 +24,10 @@ endif
 # the ISO codename (i.e. Lacus Autumni)
 # Codename scheme: http://en.wikipedia.org/wiki/List_of_maria_on_the_Moon
 # Rotate between lacus, mare and palus for each release to avoid confusion
-ISO_CODENAME = Mare Ingenii
+ISO_CODENAME = Sinus Successus
 
 # the release/offical date tag - must be in the form of YYYYMMDD
-ISO_DATE = 20100822
+ISO_DATE = 20130531
 
 # the iso BUILD arch:
 ISO_BUILD = $(ISO_ARCH)-pc-linux-gnu
@@ -38,12 +38,6 @@ ISO_CNAME = $(ISO_VERSION) ($(ISO_CODENAME) - $(ISO_DATE))
 # the iso label may not contain spaces
 ISO_LABEL = $(shell echo -n Lunar-Linux $(ISO_CODENAME) | tr '[:space:]' _)
 
-## the kernel version shouldn't be used
-# the kernel version used on the ISO
-ISO_KVER = 3.7
-# the patch LEVEL used (from kernel.org)
-ISO_PVER = 3.7.1
-
 # which lunar core tools do we want on the ISO
 ISO_LUNAR_MODULE = lunar