[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4a25ada199d26bf5da93c05150c6d85b82efce74 - IPFire-SCM

21 Feb 2019

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  4a25ada199d26bf5da93c05150c6d85b82efce74 (commit)
       via  a2d49659f3947e5a5a77cbc1bf384eb0b2760ca9 (commit)
       via  8c8b4b21545338efea26df2c1285d89793e1b77c (commit)
       via  8f49959d70210f4a2d6d1bbf2f6936d4e3e28f6b (commit)
      from  17872019ba56d6ec81742fc61218933f25988f7e (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 4a25ada199d26bf5da93c05150c6d85b82efce74
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Thu Feb 21 19:23:05 2019 +0100
core128: add kernel to updater
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit a2d49659f3947e5a5a77cbc1bf384eb0b2760ca9
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Thu Feb 21 19:13:27 2019 +0100
kernel: cleanup unused rpi patch
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 8c8b4b21545338efea26df2c1285d89793e1b77c
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Thu Feb 21 10:50:15 2019 +0100
kernel: update to 4.14.102
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 8f49959d70210f4a2d6d1bbf2f6936d4e3e28f6b
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Tue Feb 19 13:48:12 2019 +0100
partresize: enable serial console on PC Engines APU
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 .../124 => core/128}/filelists/aarch64/linux       |  0
 .../128}/filelists/aarch64/linux-initrd            |  0
 .../128}/filelists/armv5tel/linux-initrd-kirkwood  |  0
 .../128}/filelists/armv5tel/linux-initrd-multi     |  0
 .../128}/filelists/armv5tel/linux-kirkwood         |  0
 .../128}/filelists/armv5tel/linux-multi            |  0
 config/rootfiles/core/128/filelists/files          |  1 +
 .../{oldcore/100 => core/128}/filelists/i586/linux |  0
 .../100 => core/128}/filelists/i586/linux-initrd   |  0
 .../100 => core/128}/filelists/x86_64/linux        |  0
 .../100 => core/128}/filelists/x86_64/linux-initrd |  0
 config/rootfiles/core/128/update.sh                | 87 ++++++++++++++++++-
 lfs/linux                                          | 10 +--
 src/initscripts/system/partresize                  | 14 ++-
 ...ux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch | 99 ----------------------
 15 files changed, 102 insertions(+), 109 deletions(-)
 copy config/rootfiles/{oldcore/124 => core/128}/filelists/aarch64/linux (100%)
 copy config/rootfiles/{oldcore/124 => core/128}/filelists/aarch64/linux-initrd (100%)
 copy config/rootfiles/{oldcore/121 => core/128}/filelists/armv5tel/linux-initrd-kirkwood (100%)
 copy config/rootfiles/{oldcore/121 => core/128}/filelists/armv5tel/linux-initrd-multi (100%)
 copy config/rootfiles/{oldcore/100 => core/128}/filelists/armv5tel/linux-kirkwood (100%)
 copy config/rootfiles/{oldcore/100 => core/128}/filelists/armv5tel/linux-multi (100%)
 copy config/rootfiles/{oldcore/100 => core/128}/filelists/i586/linux (100%)
 copy config/rootfiles/{oldcore/100 => core/128}/filelists/i586/linux-initrd (100%)
 copy config/rootfiles/{oldcore/100 => core/128}/filelists/x86_64/linux (100%)
 copy config/rootfiles/{oldcore/100 => core/128}/filelists/x86_64/linux-initrd (100%)
 delete mode 100644 src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch
Difference in files:

diff --git a/config/rootfiles/core/128/filelists/aarch64/linux b/config/rootfiles/core/128/filelists/aarch64/linux
new file mode 120000
index 000000000..3a2532bc7
--- /dev/null
+++ b/config/rootfiles/core/128/filelists/aarch64/linux
@@ -0,0 +1 @@
+../../../../common/aarch64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/128/filelists/aarch64/linux-initrd b/config/rootfiles/core/128/filelists/aarch64/linux-initrd
new file mode 120000
index 000000000..8acdb0f31
--- /dev/null
+++ b/config/rootfiles/core/128/filelists/aarch64/linux-initrd
@@ -0,0 +1 @@
+../../../../common/aarch64/linux-initrd
\ No newline at end of file
diff --git a/config/rootfiles/core/128/filelists/armv5tel/linux-initrd-kirkwood b/config/rootfiles/core/128/filelists/armv5tel/linux-initrd-kirkwood
new file mode 120000
index 000000000..39c5591b7
--- /dev/null
+++ b/config/rootfiles/core/128/filelists/armv5tel/linux-initrd-kirkwood
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-initrd-kirkwood
\ No newline at end of file
diff --git a/config/rootfiles/core/128/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/core/128/filelists/armv5tel/linux-initrd-multi
new file mode 120000
index 000000000..0b1b4530a
--- /dev/null
+++ b/config/rootfiles/core/128/filelists/armv5tel/linux-initrd-multi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-initrd-multi
\ No newline at end of file
diff --git a/config/rootfiles/core/128/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/128/filelists/armv5tel/linux-kirkwood
new file mode 120000
index 000000000..72171071e
--- /dev/null
+++ b/config/rootfiles/core/128/filelists/armv5tel/linux-kirkwood
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-kirkwood
\ No newline at end of file
diff --git a/config/rootfiles/core/128/filelists/armv5tel/linux-multi b/config/rootfiles/core/128/filelists/armv5tel/linux-multi
new file mode 120000
index 000000000..204eb4c43
--- /dev/null
+++ b/config/rootfiles/core/128/filelists/armv5tel/linux-multi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-multi
\ No newline at end of file
diff --git a/config/rootfiles/core/128/filelists/files b/config/rootfiles/core/128/filelists/files
index 9a34f756b..568413342 100644
--- a/config/rootfiles/core/128/filelists/files
+++ b/config/rootfiles/core/128/filelists/files
@@ -5,6 +5,7 @@ var/ipfire/langs
 etc/rc.d/helper/aws-setup
 etc/rc.d/init.d/aws
 etc/rc.d/init.d/firewall
+etc/rc.d/init.d/partresize
 etc/rc.d/init.d/unbound
 etc/ssl/openssl.cnf
 etc/sysctl.conf
diff --git a/config/rootfiles/core/128/filelists/i586/linux b/config/rootfiles/core/128/filelists/i586/linux
new file mode 120000
index 000000000..693ec4bbf
--- /dev/null
+++ b/config/rootfiles/core/128/filelists/i586/linux
@@ -0,0 +1 @@
+../../../../common/i586/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/128/filelists/i586/linux-initrd b/config/rootfiles/core/128/filelists/i586/linux-initrd
new file mode 120000
index 000000000..32a03e6a9
--- /dev/null
+++ b/config/rootfiles/core/128/filelists/i586/linux-initrd
@@ -0,0 +1 @@
+../../../../common/i586/linux-initrd
\ No newline at end of file
diff --git a/config/rootfiles/core/128/filelists/x86_64/linux b/config/rootfiles/core/128/filelists/x86_64/linux
new file mode 120000
index 000000000..0615b5b9a
--- /dev/null
+++ b/config/rootfiles/core/128/filelists/x86_64/linux
@@ -0,0 +1 @@
+../../../../common/x86_64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/128/filelists/x86_64/linux-initrd b/config/rootfiles/core/128/filelists/x86_64/linux-initrd
new file mode 120000
index 000000000..1b9fff70f
--- /dev/null
+++ b/config/rootfiles/core/128/filelists/x86_64/linux-initrd
@@ -0,0 +1 @@
+../../../../common/x86_64/linux-initrd
\ No newline at end of file
diff --git a/config/rootfiles/core/128/update.sh b/config/rootfiles/core/128/update.sh
index 99c036d60..bc15679c5 100644
--- a/config/rootfiles/core/128/update.sh
+++ b/config/rootfiles/core/128/update.sh
@@ -26,11 +26,59 @@
core=128
+exit_with_error() {
+	# Set last succesfull installed core.
+	echo $(($core-1)) > /opt/pakfire/db/core/mine
+	# don't start pakfire again at error
+	killall -KILL pak_update
+	/usr/bin/logger -p syslog.emerg -t ipfire \
+		"core-update-${core}: $1"
+	exit $2
+}
+
 # Remove old core updates from pakfire cache to save space...
 for (( i=1; i<=$core; i++ )); do
    rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
 done
+KVER="xxxKVERxxx"
+
+# Backup uEnv.txt if exist
+if [ -e /boot/uEnv.txt ]; then
+	cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
+fi
+
+# Do some sanity checks.
+case $(uname -r) in
+	*-ipfire*)
+		# Ok.
+		;;
+	*)
+		exit_with_error "ERROR cannot update. No IPFire Kernel." 1
+		;;
+esac
+
+# Check diskspace on root
+ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+
+if [ $ROOTSPACE -lt 80000 ]; then
+	exit_with_error "ERROR cannot update because not enough free space on root." 2
+	exit 2
+fi
+
+# Remove the old kernel
+rm -rf /boot/System.map-*
+rm -rf /boot/config-*
+rm -rf /boot/ipfirerd-*
+rm -rf /boot/initramfs-*
+rm -rf /boot/vmlinuz-*
+rm -rf /boot/uImage-*-ipfire-*
+rm -rf /boot/zImage-*-ipfire-*
+rm -rf /boot/uInit-*-ipfire-*
+rm -rf /boot/dtb-*-ipfire-*
+rm -rf /lib/modules
+rm -f  /etc/sysconfig/lm_sensors
+
 # Stop services
# Remove files
@@ -43,7 +91,6 @@ rm -vf \
    /.rnd \
    /root/.rnd
-
 # Extract files
 extract_files
@@ -64,8 +111,42 @@ fi
 /etc/init.d/apache restart
 /etc/init.d/unbound restart
-# This update needs a reboot...
-touch /var/run/need_reboot
+# Upadate Kernel version uEnv.txt
+if [ -e /boot/uEnv.txt ]; then
+	sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt
+fi
+
+# call user update script (needed for some arm boards)
+if [ -e /boot/pakfire-kernel-update ]; then
+	/boot/pakfire-kernel-update ${KVER}
+fi
+
+case "$(uname -m)" in
+	i?86)
+		# Force (re)install pae kernel if pae is supported
+		rm -rf /opt/pakfire/db/installed/meta-linux-pae
+		rm -rf /opt/pakfire/db/rootfiles/linux-pae
+		if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
+			ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+			BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+			if [ $BOOTSPACE -lt 22000 -o $ROOTSPACE -lt 120000 ]; then
+				/usr/bin/logger -p syslog.emerg -t ipfire \
+				"core-update-${core}: WARNING not enough space for pae kernel."
+				touch /var/run/need_reboot
+			else
+				echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
+				echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
+				echo "Release: 0"     >> /opt/pakfire/db/installed/meta-linux-pae
+			fi
+		else
+			touch /var/run/need_reboot
+		fi
+		;;
+	*)
+		# This update needs a reboot...
+		touch /var/run/need_reboot
+		;;
+esac
# Finish
 /etc/init.d/fireinfo start
diff --git a/lfs/linux b/lfs/linux
index 38c8fdec9..8092381b6 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
include Config
-VER         = 4.14.101
-ARM_PATCHES = 4.14.101-ipfire0
+VER         = 4.14.102
+ARM_PATCHES = 4.14.102-ipfire0
THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -82,7 +82,7 @@ objects =$(DL_FILE) \
 $(DL_FILE)					= $(URL_IPFIRE)/$(DL_FILE)
 arm-multi-patches-$(ARM_PATCHES).patch.xz	= $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
-$(DL_FILE)_MD5					= fd0952d086222e6267588c12c8d6fab1
+$(DL_FILE)_MD5					= 8e45ababe805901139c58a0af3711f90
 arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5	= 1cda52264dad96fcba65bd335fbbfa95
install : $(TARGET)
@@ -153,13 +153,11 @@ endif
 ifeq "$(KCFG)" "-multi"
    # Apply Arm-multiarch kernel patches.
    cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1
-#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch
-
 endif
+
 ifeq "$(BUILD_ARCH)" "aarch64"
    # Apply Arm-multiarch kernel patches.
    cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1
-#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch
 endif
    cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-3.14.79-amba-fix.patch
diff --git a/src/initscripts/system/partresize b/src/initscripts/system/partresize
index 2fad11251..f3e3c0f0d 100644
--- a/src/initscripts/system/partresize
+++ b/src/initscripts/system/partresize
@@ -29,10 +29,22 @@ case "${1}" in
    		(exit ${failed})
    		evaluate_retval
+			# check if serial console enabled
+			scon="off";
+			if [ ! "$(grep "console=ttyS0" /proc/cmdline)" == "" ]; then
+				scon="on";
+			fi
+			IFS= read -r DMI_PRODUCT_NAME < /sys/class/dmi/id/product_name;
+			case ${DMI_PRODUCT_NAME} in
+				APU|apu[2-4]|PC\ Engines\ apu[1-4] )
+						scon="on";
+					;;
+			esac
+
    		mount /boot > /dev/null
    		if [ -e /boot/grub/grub.cfg ]; then
    			# swtich permanent to serial console if it was selected on first boot
-				if [ ! "$(grep "console=ttyS0" /proc/cmdline)" == "" ]; then
+				if [ "${scon}" = "on" ]; then
    				# Enable also serial console on GRUB
    				echo "GRUB_TERMINAL="serial console"" >> /etc/default/grub
    				echo "GRUB_SERIAL_COMMAND="serial --unit=0 --speed=115200"" >> /etc/default/grub
diff --git a/src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch b/src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch
deleted file mode 100644
index e4c8b9982..000000000
--- a/src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From a44147a09baf8c46cc0b02332df3a4656e0659d5 Mon Sep 17 00:00:00 2001
-From: Arne Fitzenreiter arne_f@ipfire.org
-Date: Mon, 10 Dec 2018 13:12:00 +0100
-Subject: [PATCH] Revert "usb: dwc2: Fix DMA alignment to start at allocated
- boundary"
-
-This reverts commit 68fc92a0f3913d539d1ac68a861f895e34099e46.
----
- drivers/usb/dwc2/hcd.c | 44 +++++++++++++++++++++-----------------------
- 1 file changed, 21 insertions(+), 23 deletions(-)
-
-diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
-index fa20ec4..4b81d08 100644
---- a/drivers/usb/dwc2/hcd.c
-+++ b/drivers/usb/dwc2/hcd.c
-@@ -2644,29 +2644,34 @@ static int dwc2_alloc_split_dma_aligned_buf(struct dwc2_hsotg *hsotg,
- 
- #define DWC2_USB_DMA_ALIGN 4
- 
-+struct dma_aligned_buffer {
-+	void *kmalloc_ptr;
-+	void *old_xfer_buffer;
-+	u8 data[0];
-+};
-+
- static void dwc2_free_dma_aligned_buffer(struct urb *urb)
- {
--	void *stored_xfer_buffer;
-+	struct dma_aligned_buffer *temp;
- 
- 	if (!(urb->transfer_flags & URB_ALIGNED_TEMP_BUFFER))
- 		return;
- 
--	/* Restore urb->transfer_buffer from the end of the allocated area */
--	memcpy(&stored_xfer_buffer, urb->transfer_buffer +
--	       urb->transfer_buffer_length, sizeof(urb->transfer_buffer));
-+	temp = container_of(urb->transfer_buffer,
-+			    struct dma_aligned_buffer, data);
- 
- 	if (usb_urb_dir_in(urb))
--		memcpy(stored_xfer_buffer, urb->transfer_buffer,
-+		memcpy(temp->old_xfer_buffer, temp->data,
- 		       urb->transfer_buffer_length);
--	kfree(urb->transfer_buffer);
--	urb->transfer_buffer = stored_xfer_buffer;
-+	urb->transfer_buffer = temp->old_xfer_buffer;
-+	kfree(temp->kmalloc_ptr);
- 
- 	urb->transfer_flags &= ~URB_ALIGNED_TEMP_BUFFER;
- }
- 
- static int dwc2_alloc_dma_aligned_buffer(struct urb *urb, gfp_t mem_flags)
- {
--	void *kmalloc_ptr;
-+	struct dma_aligned_buffer *temp, *kmalloc_ptr;
- 	size_t kmalloc_size;
- 
- 	if (urb->num_sgs || urb->sg ||
-@@ -2674,29 +2679,22 @@ static int dwc2_alloc_dma_aligned_buffer(struct urb *urb, gfp_t mem_flags)
- 	    !((uintptr_t)urb->transfer_buffer & (DWC2_USB_DMA_ALIGN - 1)))
- 		return 0;
- 
--	/*
--	 * Allocate a buffer with enough padding for original transfer_buffer
--	 * pointer. This allocation is guaranteed to be aligned properly for
--	 * DMA
--	 */
-+	/* Allocate a buffer with enough padding for alignment */
- 	kmalloc_size = urb->transfer_buffer_length +
--		sizeof(urb->transfer_buffer);
-+		sizeof(struct dma_aligned_buffer) + DWC2_USB_DMA_ALIGN - 1;
- 
- 	kmalloc_ptr = kmalloc(kmalloc_size, mem_flags);
- 	if (!kmalloc_ptr)
- 		return -ENOMEM;
- 
--	/*
--	 * Position value of original urb->transfer_buffer pointer to the end
--	 * of allocation for later referencing
--	 */
--	memcpy(kmalloc_ptr + urb->transfer_buffer_length,
--	       &urb->transfer_buffer, sizeof(urb->transfer_buffer));
--
-+	/* Position our struct dma_aligned_buffer such that data is aligned */
-+	temp = PTR_ALIGN(kmalloc_ptr + 1, DWC2_USB_DMA_ALIGN) - 1;
-+	temp->kmalloc_ptr = kmalloc_ptr;
-+	temp->old_xfer_buffer = urb->transfer_buffer;
- 	if (usb_urb_dir_out(urb))
--		memcpy(kmalloc_ptr, urb->transfer_buffer,
-+		memcpy(temp->data, urb->transfer_buffer,
- 		       urb->transfer_buffer_length);
--	urb->transfer_buffer = kmalloc_ptr;
-+	urb->transfer_buffer = temp->data;
- 
- 	urb->transfer_flags |= URB_ALIGNED_TEMP_BUFFER;
- 
--- 
-2.7.4
-
hooks/post-receive
--
IPFire 2.x development tree

    