Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

lfs/flash-images

@@ -121,6 +121,9 @@ ifeq "$(MACHINE_TYPE)" "arm"
 	cp -v /boot/MLO $(MNThdd)/boot/
 	cp -v /boot/u-boot.img $(MNThdd)/boot/
 	cp -v /boot/zImage-ipfire-multi $(MNThdd)/boot/
+	# work around a u-boot bug not find the folders sometimes
+	mkdir -pv $(MNThdd)/boot/dtb-$(KVER)-ipfire-multi
+	mkdir -pv $(MNThdd)/boot/dtb-$(KVER)-ipfire-kirkwood
 	sync
 	umount $(MNThdd)/boot
 	mount $(PART_BOOT) $(MNThdd)/boot

lfs/u-boot

@@ -126,6 +126,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	# config (uEnv.txt)
 	cp -vf $(DIR_SRC)/config/u-boot/* /boot/
+	# patch real Kernel version to uEnv.txt
+	sed -e "s/xxxKVERxxx/$(KVER)/g" -i /boot/uEnv.txt
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)