[kernel] remember last built version and if new kernel is detected, ask what to do. WARNING: KVERSION file will be missing, write the old (uname -r) under remote/modules/ksrc/KVERSION to be safe :)

2 files changed, 8 insertions, 15 deletions

diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.build b/remote/rootfs/rootfs-stage31/rootfs-stage31.build
index d547d7a4..d9f28636 100644
--- a/remote/rootfs/rootfs-stage31/rootfs-stage31.build
+++ b/remote/rootfs/rootfs-stage31/rootfs-stage31.build
@@ -19,7 +19,10 @@ build() {
 }
 
 post_copy() {
+	pinfo "Generating rootfs for Stage 3.1 ..."
         generate_rootfs
+
+	# copy kernel, modules and firmware
         copy_kernel_modules
         copy_firmware
 	copy_kernel
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
index 39c96ccc..93094f72 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
@@ -104,21 +104,12 @@ post_copy() {
 	sed -i -r 's/^blacklist.*pcspkr/#&/g' "$TARGET_BUILD_DIR/etc/modprobe.d/blacklist.conf"
 
 	echo "minilinux-$(hostname)" > "${TARGET_BUILD_DIR}/etc/hostname"
-	# check for kernel modules, if not present copy from system
-	if [ ! -d ${TARGET_BUILD_DIR}/lib/modules ]; then
-		pinfo "Copying modules for kernel ${KERNEL_VERSION}..."
-		copy_kernel_modules
-	else
-		pinfo "Not copying kernel modules from system, as '${TARGET_BUILD_DIR}/lib/modules' already exists."
-	fi
 
-	# check for firmware, if not present copy from system
-	if [ ! -d ${TARGET_BUILD_DIR}/lib/firmware ]; then
-		pinfo "Copying firmware for kernel ${KERNEL_VERSION}..."
-		copy_firmware
-	else
-		pinfo "Not copying firmware from system, as '${TARGET_BUILD_DIR}/lib/firmware' already exists."
-	fi	
+
+	# copy kernel, modules and firmware
+	copy_kernel_modules
+	copy_firmware
+	copy_kernel
 
 	# Try to fetch distro logo
 	if [ ! -s "$TARGET_BUILD_DIR/etc/distro.png" ]; then
@@ -134,6 +125,5 @@ post_copy() {
 		fi
 	fi
 
-	copy_kernel
 }