Use Linux 3.18.2 again, fixed kernel .config issues with BusyBox

- Update Linux 3.14 .config, add useful and ARM Versatile features
- Use Linux 3.14 config to create new 3.18 .config
- Move todos from README to TODO
- Update README with section up howto upgrade Linux

Signed-off-by: Joachim Nilsson <[email protected]>

Makefile

@@ -19,7 +19,7 @@
 ARCH            = arm
 CROSS          ?= arm-linux-gnueabi-
 CROSS_COMPILE  ?= $(CROSS)
-KERNEL_VERSION  = 3.14.28
+KERNEL_VERSION  = 3.18.2
 
 NAME           := "TroglOS Linux"
 RELEASE_ID     := "chaos"
@@ -79,7 +79,6 @@ staging:
 	@sed -i 's/HOSTNAME/$(RELEASE_ID)/' $(STAGING)/etc/hosts
 
 kernel:
-	@echo "  KERNEL  $(KERNEL_VERSION)"
 	@$(MAKE) -j5 -C kernel all
 
 kernel_menuconfig:
@@ -92,7 +91,6 @@ kernel_saveconfig:
 	@$(MAKE) -C kernel saveconfig
 
 packages:
-	@echo "  BUILD   Free/Libre Open-Source Software Packages ..."
 	@$(MAKE) -j5 -C packages all
 	@$(MAKE) -j5 -C packages install
 

README.md

@@ -12,6 +12,9 @@ embedded applications before the actual hardware arrives.  It is also
 useful for reference when said hardware starts acting up -- you know it
 always does, right?
 
+Requirements
+------------
+
 The build environment requires at least the following tools, tested on
 Ubuntu 14.04:
 
@@ -23,22 +26,18 @@ Ubuntu 14.04:
 * probably more, gzip?, mkimge?
 
 Clone this repository, then type `make`.  When the build has completed,
-start Qemu with `make run`
+start Qemu with `make run` -- Have fun!
 
-Have fun!  :-)
+Upgrading Linux
+---------------
 
-TODO
-----
+Change the `KERNEL_VERSION` in the top-level `Makefile`.  If the kernel
+is just a minor patch release, you're done.
 
-* Linux Kbuild support for configuration management, more
-* Targets than ARM and Versatile, with different packages and flavours
-* More packages (add Finit and uftpd as a GitHub submodules!)
-* U-Boot and Bareboot images, incl. Westermo squasfs `/boot` extension
-* Add support for [Rocker](https://github.com/scottfeldman/qemu-rocker)
-* Upgrade kernel to support both Rocker and swdev ...
-* Add Quagga support
-* Integrate the cool little CLI idea ...
-* Little bit more documentation so people can get about easier
+If it's a major kernel upgrade, copy the latest `kernel/config-X.YY` to
+`kernel/config-X.ZZ` and call `make kernel_oldconfig`.  This will unpack
+the kernel and give you a set of questions for all new features.
 
-  -- Joachim 
+Make sure to do a `make kernel_saveconfig`, and possibly add the new
+`kernel/config-X.ZZ` to GIT.
 

TODO

@@ -0,0 +1 @@
+TODO.md

TODO.md

@@ -0,0 +1,13 @@
+TODO
+----
+
+* Linux Kbuild support for configuration management, more
+* Targets than ARM and Versatile, with different packages and flavours
+* More packages (add Finit and uftpd as a GitHub submodules!)
+* U-Boot and Bareboot images, incl. Westermo squasfs `/boot` extension
+* Add support for [Rocker](https://github.com/scottfeldman/qemu-rocker)
+* Upgrade kernel to support both Rocker and swdev ...
+* Add Quagga support
+* Integrate the cool little CLI idea ...
+* Little bit more documentation so people can get about easier
+

kernel/Makefile

@@ -43,12 +43,16 @@ $(PKG)/.prepared: $(PKG)/Makefile
 	@touch $@
 
 $(PKG)/.config: $(PKG)/Makefile
-	@echo "  INSTALL $@ from $(CONFIG)"
-	@if [ -f $(CONFIG) ]; then			\
-		cp $(CONFIG) $@;			\
-		$(MAKE) -C $(PKG) oldconfig;		\
-	else						\
-		$(MAKE) -C $(PKG) versatile_defconfig;	\
+	@if [ ! -e $(PKG)/.config ]; then				\
+		echo "  INSTALL $@ from $(CONFIG)";			\
+		if [ -f $(CONFIG) ]; then				\
+			cp $(CONFIG) $@;				\
+			$(MAKE) -C $(PKG) oldconfig;			\
+		else							\
+			$(MAKE) -C $(PKG) versatile_defconfig;		\
+		fi;							\
+	else								\
+		echo "  NO-OP   $(PKG)/.config already installed.";	\
 	fi
 
 $(ZIMAGE): $(PKG)/.config $(PKG)/.prepared