From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arne Fitzenreiter To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 924b48c7890ef573c1400474ef92951fb9cf3ded Date: Wed, 12 Sep 2018 20:05:07 +0100 Message-ID: <20180912190508.3A53E1081BD3@git01.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3441034417310908277==" List-Id: --===============3441034417310908277== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 924b48c7890ef573c1400474ef92951fb9cf3ded (commit) from eee037b8902c3163850069f302479e7733966bd0 (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 924b48c7890ef573c1400474ef92951fb9cf3ded Author: Arne Fitzenreiter Date: Wed Sep 12 21:04:07 2018 +0200 kernel: update to 4.14.69 =20 Signed-off-by: Arne Fitzenreiter ----------------------------------------------------------------------- Summary of changes: .../kernel/kernel.config.armv5tel-ipfire-kirkwood | 8 +-- config/kernel/kernel.config.armv5tel-ipfire-multi | 9 ++- config/kernel/kernel.config.i586-ipfire | 11 +-- config/kernel/kernel.config.i586-ipfire-pae | 11 +-- config/kernel/kernel.config.x86_64-ipfire | 11 +-- config/rootfiles/common/i586/linux | 2 - config/rootfiles/common/x86_64/linux | 2 - config/rootfiles/core/124/update.sh | 81 ++++++++++++++++++++= +- config/rootfiles/packages/linux-pae | 2 - lfs/linux | 10 +-- 10 files changed, 111 insertions(+), 36 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/ke= rnel/kernel.config.armv5tel-ipfire-kirkwood index 93dd593bf..02645d074 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood +++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.14.43 Kernel Configuration +# Linux/arm 4.14.68 Kernel Configuration # CONFIG_ARM=3Dy CONFIG_ARM_HAS_SG_CHAIN=3Dy @@ -1075,6 +1075,9 @@ CONFIG_NF_CONNTRACK_IPV6=3Dy CONFIG_NF_SOCKET_IPV6=3Dm CONFIG_NF_TABLES_IPV6=3Dm CONFIG_NFT_CHAIN_ROUTE_IPV6=3Dm +CONFIG_NFT_CHAIN_NAT_IPV6=3Dm +CONFIG_NFT_MASQ_IPV6=3Dm +CONFIG_NFT_REDIR_IPV6=3Dm CONFIG_NFT_REJECT_IPV6=3Dm CONFIG_NFT_DUP_IPV6=3Dm CONFIG_NFT_FIB_IPV6=3Dm @@ -1082,10 +1085,7 @@ CONFIG_NF_DUP_IPV6=3Dm CONFIG_NF_REJECT_IPV6=3Dm CONFIG_NF_LOG_IPV6=3Dm CONFIG_NF_NAT_IPV6=3Dm -CONFIG_NFT_CHAIN_NAT_IPV6=3Dm CONFIG_NF_NAT_MASQUERADE_IPV6=3Dm -CONFIG_NFT_MASQ_IPV6=3Dm -CONFIG_NFT_REDIR_IPV6=3Dm CONFIG_IP6_NF_IPTABLES=3Dy CONFIG_IP6_NF_MATCH_AH=3Dm CONFIG_IP6_NF_MATCH_EUI64=3Dm diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kerne= l/kernel.config.armv5tel-ipfire-multi index 002302c70..7e4a42ba1 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-multi +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.14.43 Kernel Configuration +# Linux/arm 4.14.68 Kernel Configuration # CONFIG_ARM=3Dy CONFIG_ARM_HAS_SG_CHAIN=3Dy @@ -1344,6 +1344,9 @@ CONFIG_NF_CONNTRACK_IPV6=3Dy CONFIG_NF_SOCKET_IPV6=3Dm CONFIG_NF_TABLES_IPV6=3Dm CONFIG_NFT_CHAIN_ROUTE_IPV6=3Dm +CONFIG_NFT_CHAIN_NAT_IPV6=3Dm +CONFIG_NFT_MASQ_IPV6=3Dm +CONFIG_NFT_REDIR_IPV6=3Dm CONFIG_NFT_REJECT_IPV6=3Dm CONFIG_NFT_DUP_IPV6=3Dm CONFIG_NFT_FIB_IPV6=3Dm @@ -1351,10 +1354,7 @@ CONFIG_NF_DUP_IPV6=3Dm CONFIG_NF_REJECT_IPV6=3Dm CONFIG_NF_LOG_IPV6=3Dm CONFIG_NF_NAT_IPV6=3Dm -CONFIG_NFT_CHAIN_NAT_IPV6=3Dm CONFIG_NF_NAT_MASQUERADE_IPV6=3Dm -CONFIG_NFT_MASQ_IPV6=3Dm -CONFIG_NFT_REDIR_IPV6=3Dm CONFIG_IP6_NF_IPTABLES=3Dy CONFIG_IP6_NF_MATCH_AH=3Dm CONFIG_IP6_NF_MATCH_EUI64=3Dm @@ -5879,7 +5879,6 @@ CONFIG_DMA_ENGINE_RAID=3Dy CONFIG_SYNC_FILE=3Dy # CONFIG_SW_SYNC is not set # CONFIG_AUXDISPLAY is not set -CONFIG_ARM_CHARLCD=3Dy # CONFIG_PANEL is not set CONFIG_UIO=3Dm # CONFIG_UIO_CIF is not set diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.c= onfig.i586-ipfire index f5eeff526..3d0047ab4 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.43 Kernel Configuration +# Linux/x86 4.14.69 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=3Dy @@ -236,6 +236,7 @@ CONFIG_SLUB_CPU_PARTIAL=3Dy # CONFIG_SYSTEM_DATA_VERIFICATION is not set # CONFIG_PROFILING is not set CONFIG_TRACEPOINTS=3Dy +CONFIG_HOTPLUG_SMT=3Dy CONFIG_HAVE_OPROFILE=3Dy CONFIG_OPROFILE_NMI_TIMER=3Dy # CONFIG_KPROBES is not set @@ -270,6 +271,7 @@ CONFIG_HAVE_PERF_REGS=3Dy CONFIG_HAVE_PERF_USER_STACK_DUMP=3Dy CONFIG_HAVE_ARCH_JUMP_LABEL=3Dy CONFIG_HAVE_RCU_TABLE_FREE=3Dy +CONFIG_HAVE_RCU_TABLE_INVALIDATE=3Dy CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=3Dy CONFIG_HAVE_ALIGNED_STRUCT_PAGE=3Dy CONFIG_HAVE_CMPXCHG_LOCAL=3Dy @@ -1281,6 +1283,9 @@ CONFIG_NF_CONNTRACK_IPV6=3Dy CONFIG_NF_SOCKET_IPV6=3Dm CONFIG_NF_TABLES_IPV6=3Dm CONFIG_NFT_CHAIN_ROUTE_IPV6=3Dm +CONFIG_NFT_CHAIN_NAT_IPV6=3Dm +CONFIG_NFT_MASQ_IPV6=3Dm +CONFIG_NFT_REDIR_IPV6=3Dm CONFIG_NFT_REJECT_IPV6=3Dm CONFIG_NFT_DUP_IPV6=3Dm CONFIG_NFT_FIB_IPV6=3Dm @@ -1288,10 +1293,7 @@ CONFIG_NF_DUP_IPV6=3Dm CONFIG_NF_REJECT_IPV6=3Dm CONFIG_NF_LOG_IPV6=3Dm CONFIG_NF_NAT_IPV6=3Dm -CONFIG_NFT_CHAIN_NAT_IPV6=3Dm CONFIG_NF_NAT_MASQUERADE_IPV6=3Dm -CONFIG_NFT_MASQ_IPV6=3Dm -CONFIG_NFT_REDIR_IPV6=3Dm CONFIG_IP6_NF_IPTABLES=3Dy CONFIG_IP6_NF_MATCH_AH=3Dm CONFIG_IP6_NF_MATCH_EUI64=3Dm @@ -6869,7 +6871,6 @@ CONFIG_CRYPTO_DES=3Dm CONFIG_CRYPTO_FCRYPT=3Dm CONFIG_CRYPTO_KHAZAD=3Dm CONFIG_CRYPTO_SALSA20=3Dm -CONFIG_CRYPTO_SALSA20_586=3Dm CONFIG_CRYPTO_CHACHA20=3Dm CONFIG_CRYPTO_SEED=3Dm CONFIG_CRYPTO_SERPENT=3Dm diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kern= el.config.i586-ipfire-pae index ffe1beb06..0dabb067f 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.43 Kernel Configuration +# Linux/x86 4.14.69 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=3Dy @@ -236,6 +236,7 @@ CONFIG_SLUB_CPU_PARTIAL=3Dy # CONFIG_SYSTEM_DATA_VERIFICATION is not set # CONFIG_PROFILING is not set CONFIG_TRACEPOINTS=3Dy +CONFIG_HOTPLUG_SMT=3Dy CONFIG_HAVE_OPROFILE=3Dy CONFIG_OPROFILE_NMI_TIMER=3Dy # CONFIG_KPROBES is not set @@ -270,6 +271,7 @@ CONFIG_HAVE_PERF_REGS=3Dy CONFIG_HAVE_PERF_USER_STACK_DUMP=3Dy CONFIG_HAVE_ARCH_JUMP_LABEL=3Dy CONFIG_HAVE_RCU_TABLE_FREE=3Dy +CONFIG_HAVE_RCU_TABLE_INVALIDATE=3Dy CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=3Dy CONFIG_HAVE_ALIGNED_STRUCT_PAGE=3Dy CONFIG_HAVE_CMPXCHG_LOCAL=3Dy @@ -1299,6 +1301,9 @@ CONFIG_NF_CONNTRACK_IPV6=3Dy CONFIG_NF_SOCKET_IPV6=3Dm CONFIG_NF_TABLES_IPV6=3Dm CONFIG_NFT_CHAIN_ROUTE_IPV6=3Dm +CONFIG_NFT_CHAIN_NAT_IPV6=3Dm +CONFIG_NFT_MASQ_IPV6=3Dm +CONFIG_NFT_REDIR_IPV6=3Dm CONFIG_NFT_REJECT_IPV6=3Dm CONFIG_NFT_DUP_IPV6=3Dm CONFIG_NFT_FIB_IPV6=3Dm @@ -1306,10 +1311,7 @@ CONFIG_NF_DUP_IPV6=3Dm CONFIG_NF_REJECT_IPV6=3Dm CONFIG_NF_LOG_IPV6=3Dm CONFIG_NF_NAT_IPV6=3Dm -CONFIG_NFT_CHAIN_NAT_IPV6=3Dm CONFIG_NF_NAT_MASQUERADE_IPV6=3Dm -CONFIG_NFT_MASQ_IPV6=3Dm -CONFIG_NFT_REDIR_IPV6=3Dm CONFIG_IP6_NF_IPTABLES=3Dy CONFIG_IP6_NF_MATCH_AH=3Dm CONFIG_IP6_NF_MATCH_EUI64=3Dm @@ -6875,7 +6877,6 @@ CONFIG_CRYPTO_DES=3Dm CONFIG_CRYPTO_FCRYPT=3Dm CONFIG_CRYPTO_KHAZAD=3Dm CONFIG_CRYPTO_SALSA20=3Dm -CONFIG_CRYPTO_SALSA20_586=3Dm CONFIG_CRYPTO_CHACHA20=3Dm CONFIG_CRYPTO_SEED=3Dm CONFIG_CRYPTO_SERPENT=3Dm diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel= .config.x86_64-ipfire index 579a0284c..6c445d8b7 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.43 Kernel Configuration +# Linux/x86 4.14.69 Kernel Configuration # CONFIG_64BIT=3Dy CONFIG_X86_64=3Dy @@ -245,6 +245,7 @@ CONFIG_SLUB_CPU_PARTIAL=3Dy # CONFIG_SYSTEM_DATA_VERIFICATION is not set # CONFIG_PROFILING is not set CONFIG_TRACEPOINTS=3Dy +CONFIG_HOTPLUG_SMT=3Dy CONFIG_HAVE_OPROFILE=3Dy CONFIG_OPROFILE_NMI_TIMER=3Dy # CONFIG_KPROBES is not set @@ -279,6 +280,7 @@ CONFIG_HAVE_PERF_REGS=3Dy CONFIG_HAVE_PERF_USER_STACK_DUMP=3Dy CONFIG_HAVE_ARCH_JUMP_LABEL=3Dy CONFIG_HAVE_RCU_TABLE_FREE=3Dy +CONFIG_HAVE_RCU_TABLE_INVALIDATE=3Dy CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=3Dy CONFIG_HAVE_ALIGNED_STRUCT_PAGE=3Dy CONFIG_HAVE_CMPXCHG_LOCAL=3Dy @@ -1273,6 +1275,9 @@ CONFIG_NF_CONNTRACK_IPV6=3Dy CONFIG_NF_SOCKET_IPV6=3Dm CONFIG_NF_TABLES_IPV6=3Dm CONFIG_NFT_CHAIN_ROUTE_IPV6=3Dm +CONFIG_NFT_CHAIN_NAT_IPV6=3Dm +CONFIG_NFT_MASQ_IPV6=3Dm +CONFIG_NFT_REDIR_IPV6=3Dm CONFIG_NFT_REJECT_IPV6=3Dm CONFIG_NFT_DUP_IPV6=3Dm CONFIG_NFT_FIB_IPV6=3Dm @@ -1280,10 +1285,7 @@ CONFIG_NF_DUP_IPV6=3Dm CONFIG_NF_REJECT_IPV6=3Dm CONFIG_NF_LOG_IPV6=3Dm CONFIG_NF_NAT_IPV6=3Dm -CONFIG_NFT_CHAIN_NAT_IPV6=3Dm CONFIG_NF_NAT_MASQUERADE_IPV6=3Dm -CONFIG_NFT_MASQ_IPV6=3Dm -CONFIG_NFT_REDIR_IPV6=3Dm CONFIG_IP6_NF_IPTABLES=3Dy CONFIG_IP6_NF_MATCH_AH=3Dm CONFIG_IP6_NF_MATCH_EUI64=3Dm @@ -6749,7 +6751,6 @@ CONFIG_CRYPTO_DES3_EDE_X86_64=3Dm CONFIG_CRYPTO_FCRYPT=3Dm CONFIG_CRYPTO_KHAZAD=3Dm CONFIG_CRYPTO_SALSA20=3Dm -CONFIG_CRYPTO_SALSA20_X86_64=3Dm CONFIG_CRYPTO_CHACHA20=3Dm CONFIG_CRYPTO_CHACHA20_X86_64=3Dm CONFIG_CRYPTO_SEED=3Dm diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i58= 6/linux index c25283385..832b64134 100644 --- a/config/rootfiles/common/i586/linux +++ b/config/rootfiles/common/i586/linux @@ -11,7 +11,6 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/arch/x86/crypto #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/crc32-pclmul.ko #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/glue_helper.ko -#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/salsa20-i586.ko #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/serpent-sse2-i586.ko #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/twofish-i586.ko #lib/modules/KVER-ipfire/kernel/arch/x86/events @@ -1471,7 +1470,6 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/net/dsa/b53/b53_mmap.ko #lib/modules/KVER-ipfire/kernel/drivers/net/dsa/b53/b53_srab.ko #lib/modules/KVER-ipfire/kernel/drivers/net/dsa/dsa_loop.ko -#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/dsa_loop_bdinfo.ko #lib/modules/KVER-ipfire/kernel/drivers/net/dsa/lan9303-core.ko #lib/modules/KVER-ipfire/kernel/drivers/net/dsa/lan9303_i2c.ko #lib/modules/KVER-ipfire/kernel/drivers/net/dsa/lan9303_mdio.ko diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x= 86_64/linux index d7d070862..697d54ce5 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -22,7 +22,6 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/des3_ede-x86_64.ko #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/ghash-clmulni-intel.ko #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/poly1305-x86_64.ko -#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/salsa20-x86_64.ko #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/serpent-avx-x86_64.ko #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/serpent-avx2.ko #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/serpent-sse2-x86_64.ko @@ -1474,7 +1473,6 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/net/dsa/b53/b53_mmap.ko #lib/modules/KVER-ipfire/kernel/drivers/net/dsa/b53/b53_srab.ko #lib/modules/KVER-ipfire/kernel/drivers/net/dsa/dsa_loop.ko -#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/dsa_loop_bdinfo.ko #lib/modules/KVER-ipfire/kernel/drivers/net/dsa/lan9303-core.ko #lib/modules/KVER-ipfire/kernel/drivers/net/dsa/lan9303_i2c.ko #lib/modules/KVER-ipfire/kernel/drivers/net/dsa/lan9303_mdio.ko diff --git a/config/rootfiles/core/124/update.sh b/config/rootfiles/core/124/= update.sh index 59f1e8f55..88da254e0 100644 --- a/config/rootfiles/core/124/update.sh +++ b/config/rootfiles/core/124/update.sh @@ -26,11 +26,59 @@ =20 core=3D124 =20 +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=3D1; i<=3D$core; i++ )); do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire done =20 +KVER=3D"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=3D`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 =20 # Remove files @@ -66,8 +114,39 @@ fi # Update bootloader /usr/bin/install-bootloader =20 +# Upadate Kernel version uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=3D.*/KVER=3D${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 + if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" =3D=3D "" ]; then + ROOTSPACE=3D`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + BOOTSPACE=3D`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." + 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 + fi + ;; +esac + # This update needs a reboot... -touch /var/run/need_reboot +if [ ! -e /opt/pakfire/db/installed/meta-linux-pae ]; then + touch /var/run/need_reboot +fi =20 # Finish /etc/init.d/fireinfo start diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/= linux-pae index bcdd85a71..12473cd18 100644 --- a/config/rootfiles/packages/linux-pae +++ b/config/rootfiles/packages/linux-pae @@ -10,7 +10,6 @@ lib/modules/KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/kernel/arch/x86/crypto #lib/modules/KVER-ipfire-pae/kernel/arch/x86/crypto/crc32-pclmul.ko #lib/modules/KVER-ipfire-pae/kernel/arch/x86/crypto/glue_helper.ko -#lib/modules/KVER-ipfire-pae/kernel/arch/x86/crypto/salsa20-i586.ko #lib/modules/KVER-ipfire-pae/kernel/arch/x86/crypto/serpent-sse2-i586.ko #lib/modules/KVER-ipfire-pae/kernel/arch/x86/crypto/twofish-i586.ko #lib/modules/KVER-ipfire-pae/kernel/arch/x86/events @@ -1471,7 +1470,6 @@ lib/modules/KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/kernel/drivers/net/dsa/b53/b53_mmap.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/net/dsa/b53/b53_srab.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/net/dsa/dsa_loop.ko -#lib/modules/KVER-ipfire-pae/kernel/drivers/net/dsa/dsa_loop_bdinfo.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/net/dsa/lan9303-core.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/net/dsa/lan9303_i2c.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/net/dsa/lan9303_mdio.ko diff --git a/lfs/linux b/lfs/linux index 0196e0b90..950684616 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ =20 include Config =20 -VER =3D 4.14.50 -ARM_PATCHES =3D 4.14.50-ipfire0 +VER =3D 4.14.69 +ARM_PATCHES =3D 4.14.69-ipfire0 =20 THISAPP =3D linux-$(VER) DL_FILE =3D linux-$(VER).tar.xz @@ -34,7 +34,7 @@ DIR_APP =3D $(DIR_SRC)/$(THISAPP) CFLAGS =3D CXXFLAGS =3D =20 -PAK_VER =3D 76 +PAK_VER =3D 77 DEPS =3D "" =20 HEADERS_ARCH =3D $(BUILD_PLATFORM) @@ -82,8 +82,8 @@ objects =3D$(DL_FILE) \ $(DL_FILE) =3D $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz =3D $(URL_IPFIRE)/arm-multi-patche= s-$(ARM_PATCHES).patch.xz =20 -$(DL_FILE)_MD5 =3D 0d397a2e14669a97d54c1b82ab2b1994 -arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 =3D c38181f9fd416f10352e3dd3a0= 1bb1d1 +$(DL_FILE)_MD5 =3D 9ec4fd07909174918970b876e1778221 +arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 =3D 7af1693eb8882c99e4d965a9f4= 39ef17 =20 install : $(TARGET) =20 hooks/post-receive -- IPFire 2.x development tree --===============3441034417310908277==--