[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7529349754e0f99f626a36c895347806fc6f2dd2

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7529349754e0f99f626a36c895347806fc6f2dd2

[git]

[-- Attachment #1: Type: text/plain, Size: 6149 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  7529349754e0f99f626a36c895347806fc6f2dd2 (commit)
       via  28b252145a3240caea81d586d3e63db72c573c87 (commit)
       via  b403b04a139c02156829d8d21943bc69b2cf0c53 (commit)
      from  4a50681905af88adb0c4c19e6bc7dfda3dbe3606 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7529349754e0f99f626a36c895347806fc6f2dd2
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Aug 5 17:19:52 2018 +0200

    kernel: apu2 leds: update string for newer bios
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 28b252145a3240caea81d586d3e63db72c573c87
Merge: b403b04a1 4a5068190
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Aug 5 17:19:36 2018 +0200

    Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

commit b403b04a139c02156829d8d21943bc69b2cf0c53
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Aug 5 13:32:36 2018 +0200

    initrd: add early microcode load
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/dracut/dracut.conf                    | 3 +++
 config/rootfiles/core/123/update.sh          | 3 +++
 lfs/cdrom                                    | 2 +-
 lfs/linux                                    | 2 +-
 lfs/linux-initrd                             | 2 +-
 src/paks/linux-pae/install.sh                | 2 +-
 src/patches/linux/linux-4.9.8-apu_leds.patch | 2 +-
 src/scripts/rebuild-initrd                   | 2 +-
 8 files changed, 12 insertions(+), 6 deletions(-)

Difference in files:
diff --git a/config/dracut/dracut.conf b/config/dracut/dracut.conf
index 52bba9c62..e9bd566b6 100644
--- a/config/dracut/dracut.conf
+++ b/config/dracut/dracut.conf
@@ -31,6 +31,9 @@ filesystems+="reiserfs vfat xfs"
 #hostonly="yes"
 #
 
+# Load microcode for the CPU early
+early_microcode=yes
+
 # install local /etc/mdadm.conf
 #mdadmconf="no"
 
diff --git a/config/rootfiles/core/123/update.sh b/config/rootfiles/core/123/update.sh
index cf488ec49..76eff74bb 100644
--- a/config/rootfiles/core/123/update.sh
+++ b/config/rootfiles/core/123/update.sh
@@ -51,6 +51,9 @@ ldconfig
 /etc/init.d/unbound restart
 /etc/init.d/squid start
 
+# rebuild initrd to add early microcode updates
+rebuild-initrd
+
 # This update needs a reboot...
 touch /var/run/need_reboot
 
diff --git a/lfs/cdrom b/lfs/cdrom
index 6382034b5..08bd609c4 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -84,7 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	dd if=/dev/zero  bs=1k count=2            > /install/cdrom/boot/isolinux/boot.catalog
 ifneq "$(BUILD_PLATFORM)" "arm"
 	cp /boot/vmlinuz-$(KVER)-ipfire             /install/cdrom/boot/isolinux/vmlinuz
-	dracut --force -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire
+	dracut --force --early-microcode -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire
 	cp $(DIR_SRC)/config/syslinux/boot.png      /install/cdrom/boot/isolinux/boot.png
 	cp /usr/lib/memtest86+/memtest.bin          /install/cdrom/boot/isolinux/memtest
 	cp /usr/share/ipfire-netboot/ipxe.lkrn      /install/cdrom/boot/isolinux/netboot
diff --git a/lfs/linux b/lfs/linux
index c5d8a8e88..b5877fc5b 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -34,7 +34,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 75
+PAK_VER    = 76
 DEPS	   = ""
 
 KERNEL_ARCH   = $(BUILD_ARCH)
diff --git a/lfs/linux-initrd b/lfs/linux-initrd
index 1e6b071f9..93f21078e 100644
--- a/lfs/linux-initrd
+++ b/lfs/linux-initrd
@@ -62,7 +62,7 @@ ifneq "$(KCFG)" "-rpi"
 ifneq "$(KCFG)" "-pae"
 
 	# Create initramfs images
-	dracut --force --verbose --strip --xz /boot/initramfs-$(KVER)-$(VERSUFIX).img $(KVER)-$(VERSUFIX)
+	dracut --force --early-microcode --verbose --strip --xz /boot/initramfs-$(KVER)-$(VERSUFIX).img $(KVER)-$(VERSUFIX)
 
 ifeq "$(KCFG)" "-kirkwood"
 #	cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(VERSUFIX)
diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh
index e5f82c567..fd71621d5 100644
--- a/src/paks/linux-pae/install.sh
+++ b/src/paks/linux-pae/install.sh
@@ -60,7 +60,7 @@ depmod -a $KVER-ipfire-pae
 #
 # Made initramdisk
 #
-/usr/bin/dracut --force --xz /boot/initramfs-$KVER-ipfire-pae.img $KVER-ipfire-pae  
+/usr/bin/dracut --force --early-microcode --xz /boot/initramfs-$KVER-ipfire-pae.img $KVER-ipfire-pae  
 
 if [ -e /boot/grub/grub.cfg ]; then
 	#
diff --git a/src/patches/linux/linux-4.9.8-apu_leds.patch b/src/patches/linux/linux-4.9.8-apu_leds.patch
index d34017896..27da2f166 100644
--- a/src/patches/linux/linux-4.9.8-apu_leds.patch
+++ b/src/patches/linux/linux-4.9.8-apu_leds.patch
@@ -175,7 +175,7 @@ diff -Naur linux-4.9.8.org/arch/x86/platform/apu/apu2-led.c linux-4.9.8/arch/x86
 +		goto out;
 +
 +	product = dmi_get_system_info(DMI_PRODUCT_NAME);
-+	if (!product || strcmp(product, "apu2"))
++	if (!product || (strcmp(product, "PC Engines apu2") && strcmp(product, "apu2")) )
 +			goto out;
 +
 +	printk(KERN_INFO "%s: system is recognized as \"%s %s\"\n",
diff --git a/src/scripts/rebuild-initrd b/src/scripts/rebuild-initrd
index 06f30bbf0..91e68ca57 100644
--- a/src/scripts/rebuild-initrd
+++ b/src/scripts/rebuild-initrd
@@ -24,4 +24,4 @@
 #
 KVER=`uname -r | cut -d"-" -f1`
 
-dracut --force --verbose /boot/ipfirerd-$KVER.img $KVER-ipfire
+dracut --force --early-microcode --verbose /boot/ipfirerd-$KVER.img $KVER-ipfire


hooks/post-receive
--
IPFire 2.x development tree