Merge branch 'kernel-4.14' into next

config/etc/inittab

@@ -19,13 +19,11 @@ ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now
 
 su:S016:once:/sbin/sulogin
 
-1:2345:respawn:/sbin/agetty tty1 9600 --noclear
-2:2345:respawn:/sbin/agetty tty2 9600
-3:2345:respawn:/sbin/agetty tty3 9600
-4:2345:respawn:/sbin/agetty tty4 9600
-5:2345:respawn:/sbin/agetty tty5 9600
-6:2345:respawn:/sbin/agetty tty6 9600
-# *** Uncomment for serial console
-#7:2345:respawn:/sbin/agetty ttyS0
+1:2345:respawn:/sbin/agetty console --noclear
+2:2345:respawn:/sbin/agetty tty2
+3:2345:respawn:/sbin/agetty tty3
+4:2345:respawn:/sbin/agetty tty4
+5:2345:respawn:/sbin/agetty tty5
+6:2345:respawn:/sbin/agetty tty6
 
 # End /etc/inittab

config/etc/securetty

@@ -1,15 +1,9 @@
-tty1
+console
 tty2
 tty3
 tty4
 tty5
 tty6
-ttyAMA0
-ttyO2
-ttyS0
-ttyS1
-ttyS2
-ttyS4
 ttyp0
 ttyp1
 ttyp2

config/flash-images/grub/11_linux_scon

@@ -0,0 +1,243 @@
+#! /bin/sh
+set -e
+
+# grub-mkconfig helper script.
+# Copyright (C) 2006,2007,2008,2009,2010  Free Software Foundation, Inc.
+#
+# GRUB is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# GRUB is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+
+prefix="/usr"
+exec_prefix="${prefix}"
+datarootdir="${prefix}/share"
+
+. "${datarootdir}/grub/grub-mkconfig_lib"
+
+export TEXTDOMAIN=grub
+export TEXTDOMAINDIR="${datarootdir}/locale"
+
+CLASS="--class gnu-linux --class gnu --class os"
+
+if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
+  OS=GNU/Linux
+else
+  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
+  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
+fi
+
+# loop-AES arranges things so that /dev/loop/X can be our root device, but
+# the initrds that Linux uses don't like that.
+case ${GRUB_DEVICE} in
+  /dev/loop/*|/dev/loop[0-9])
+    GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/"`
+  ;;
+esac
+
+if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
+    || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
+    || uses_abstraction "${GRUB_DEVICE}" lvm; then
+  LINUX_ROOT_DEVICE=${GRUB_DEVICE}
+else
+  LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
+fi
+
+GRUBFS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2>/dev/null || true`"
+
+if [ x"$GRUBFS" = x ]; then
+    GRUBFS="$(stat -f --printf=%T / || true)"
+fi
+
+case x"$GRUBFS" in
+    xbtrfs)
+	rootsubvol="`make_system_path_relative_to_its_root /`"
+	rootsubvol="${rootsubvol#/}"
+	if [ "x${rootsubvol}" != x ]; then
+	    GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}"
+	fi;;
+    xzfs)
+	rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
+	bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`"
+	LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}"
+	;;
+esac
+
+title_correction_code=
+
+linux_entry ()
+{
+  os="$1"
+  version="$2"
+  type="$3"
+  args="$4"
+
+  if [ -z "$boot_device_id" ]; then
+      boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
+  fi
+  if [ x$type != xsimple ] ; then
+      case $type in
+	  recovery)
+	      title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;;
+	  *)
+	      title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
+      esac
+      if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then
+	  replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')"
+	  quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)"
+	  title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;"
+	  grub_warn "$(gettext_printf "Please don't use old title \`%s' for GRUB_DEFAULT, use \`%s' (for versions before 2.00) or \`%s' (for 2.00 or later)" "$GRUB_ACTUAL_DEFAULT" "$replacement_title" "gnulinux-advanced-$boot_device_id>gnulinux-$version-$type-$boot_device_id")"
+      fi
+      echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
+  else
+      echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
+  fi      
+  if [ x$type != xrecovery ] ; then
+      save_default_entry | sed -e "s/^/\t/"
+  fi
+
+  # Use ELILO's generic "efifb" when it's known to be available.
+  # FIXME: We need an interface to select vesafb in case efifb can't be used.
+  if [ "x$GRUB_GFXPAYLOAD_LINUX" = x ]; then
+      echo "	load_video" | sed "s/^/$submenu_indentation/"
+      if grep -qx "CONFIG_FB_EFI=y" "${config}" 2> /dev/null \
+	  && grep -qx "CONFIG_VT_HW_CONSOLE_BINDING=y" "${config}" 2> /dev/null; then
+	  echo "	set gfxpayload=keep" | sed "s/^/$submenu_indentation/"
+      fi
+  else
+      if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then
+	  echo "	load_video" | sed "s/^/$submenu_indentation/"
+      fi
+      echo "	set gfxpayload=$GRUB_GFXPAYLOAD_LINUX" | sed "s/^/$submenu_indentation/"
+  fi
+
+  echo "	insmod gzio" | sed "s/^/$submenu_indentation/"
+
+  if [ x$dirname = x/ ]; then
+    if [ -z "${prepare_root_cache}" ]; then
+      prepare_root_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/")"
+    fi
+    printf '%s\n' "${prepare_root_cache}" | sed "s/^/$submenu_indentation/"
+  else
+    if [ -z "${prepare_boot_cache}" ]; then
+      prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
+    fi
+    printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
+  fi
+  message="$(gettext_printf "Loading Linux %s ..." ${version})"
+  sed "s/^/$submenu_indentation/" << EOF
+	echo	'$message'
+	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
+EOF
+  if test -n "${initrd}" ; then
+    # TRANSLATORS: ramdisk isn't identifier. Should be translated.
+    message="$(gettext_printf "Loading initial ramdisk ...")"
+    sed "s/^/$submenu_indentation/" << EOF
+	echo	'$message'
+	initrd	${rel_dirname}/${initrd}
+EOF
+  fi
+  sed "s/^/$submenu_indentation/" << EOF
+}
+EOF
+}
+
+machine=`uname -m`
+case "x$machine" in
+    xi?86 | xx86_64)
+	list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do
+                  if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
+              done` ;;
+    *) 
+	list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do
+                  if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
+	     done` ;;
+esac
+
+case "$machine" in
+    i?86) GENKERNEL_ARCH="x86" ;;
+    mips|mips64) GENKERNEL_ARCH="mips" ;;
+    mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;;
+    arm*) GENKERNEL_ARCH="arm" ;;
+    *) GENKERNEL_ARCH="$machine" ;;
+esac
+
+prepare_boot_cache=
+prepare_root_cache=
+boot_device_id=
+title_correction_code=
+
+# Extra indentation to add to menu entries in a submenu. We're not in a submenu
+# yet, so it's empty. In a submenu it will be equal to '\t' (one tab).
+submenu_indentation=""
+
+is_first_entry=true
+while [ "x$list" != "x" ] ; do
+  linux=`version_find_latest $list`
+  gettext_printf "Found linux image: %s\n" "$linux" >&2
+  basename=`basename $linux`
+  dirname=`dirname $linux`
+  rel_dirname=`make_system_path_relative_to_its_root $dirname`
+  version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
+  alt_version=`echo $version | sed -e "s,\.old$,,g"`
+  linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
+
+  initrd=
+  for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
+	   "initrd-${version}" "initramfs-${version}.img" \
+	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
+	   "initrd-${alt_version}" "initramfs-${alt_version}.img" \
+	   "initramfs-genkernel-${version}" \
+	   "initramfs-genkernel-${alt_version}" \
+	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
+	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
+    if test -e "${dirname}/${i}" ; then
+      initrd="$i"
+      break
+    fi
+  done
+
+  config=
+  for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
+    if test -e "${i}" ; then
+      config="${i}"
+      break
+    fi
+  done
+
+  initramfs=
+  if test -n "${config}" ; then
+      initramfs=`grep CONFIG_INITRAMFS_SOURCE= "${config}" | cut -f2 -d= | tr -d \"`
+  fi
+
+  if test -n "${initrd}" ; then
+    gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2
+  elif test -z "${initramfs}" ; then
+    # "UUID=" and "ZFS=" magic is parsed by initrd or initramfs.  Since there's
+    # no initrd or builtin initramfs, it can't work here.
+    linux_root_device_thisversion=${GRUB_DEVICE}
+  fi
+
+  if [ "x$is_first_entry" = xtrue ]; then
+    linux_entry "Serial Console: ${OS}" "${version}" simple \
+    "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} console=ttyS0,115200n8"
+
+    submenu_indentation="\t"
+    
+    if [ -z "$boot_device_id" ]; then
+	boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
+    fi
+  fi
+
+  list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '`
+done
+
+echo "$title_correction_code"

config/qos/makeqosscripts.pl

@@ -252,8 +252,8 @@ foreach $subclassentry (sort @subclasses) {
 }
 print <<END
 
-	### add l7-filter to POSTROUTING chain to see all traffic
-	iptables -t mangle -A POSTROUTING -m layer7 --l7proto unset
+	### add l7-filter to PREROUTING chain to see all traffic
+	iptables -t mangle -A PREROUTING -m layer7 --l7proto unset
 
 	### ADD QOS-OUT CHAIN TO THE MANGLE TABLE IN IPTABLES
 	iptables -t mangle -N QOS-OUT
@@ -715,7 +715,7 @@ print <<END
 	iptables -t mangle --flush  QOS-TOS >/dev/null 2>&1
 	iptables -t mangle --delete-chain QOS-TOS >/dev/null 2>&1
 	# remove l7-filter
-	iptables -t mangle --delete POSTROUTING -m layer7 --l7proto unset
+	iptables -t mangle --delete PREROUTING -m layer7 --l7proto unset
 
 	rmmod sch_htb >/dev/null 2>&1
 

config/rootfiles/common/armv5tel/initscripts

@@ -3,6 +3,7 @@ etc/init.d
 #etc/rc.d/helper
 etc/rc.d/helper/getdnsfromdhcpc.pl
 #etc/rc.d/init.d
+etc/rc.d/init.d/acpid
 etc/rc.d/init.d/apache
 etc/rc.d/init.d/beep
 etc/rc.d/init.d/checkfs
@@ -108,6 +109,7 @@ etc/rc.d/rc0.d/K80network
 etc/rc.d/rc0.d/K82wlanclient
 #etc/rc.d/rc0.d/K84bluetooth
 #etc/rc.d/rc0.d/K85messagebus
+etc/rc.d/rc0.d/K87acpid
 etc/rc.d/rc0.d/K90sysklogd
 etc/rc.d/rc0.d/S60sendsignals
 etc/rc.d/rc0.d/S70localnet
@@ -118,6 +120,7 @@ etc/rc.d/rc0.d/S99halt
 etc/rc.d/rc3.d/S01vnstat
 etc/rc.d/rc3.d/S10sysklogd
 etc/rc.d/rc3.d/S11unbound
+etc/rc.d/rc3.d/S12acpid
 etc/rc.d/rc3.d/S15fireinfo
 #etc/rc.d/rc3.d/S15messagebus
 #etc/rc.d/rc3.d/S16bluetooth
@@ -157,6 +160,7 @@ etc/rc.d/rc6.d/K80network
 etc/rc.d/rc6.d/K82wlanclient
 #etc/rc.d/rc6.d/K84bluetooth
 #etc/rc.d/rc6.d/K85messagebus
+etc/rc.d/rc6.d/K87acpid
 etc/rc.d/rc6.d/K90sysklogd
 etc/rc.d/rc6.d/S60sendsignals
 etc/rc.d/rc6.d/S70mountfs

config/rootfiles/common/armv5tel/linux

@@ -1,4 +0,0 @@
-etc/modprobe.d/framebuffer.conf
-etc/modprobe.d/ipv6.conf
-etc/modprobe.d/isdn.conf
-sbin/gen_init_cpio

config/rootfiles/common/armv5tel/linux-headers

@@ -5,6 +5,7 @@
 #usr/include/asm-generic/errno-base.h
 #usr/include/asm-generic/errno.h
 #usr/include/asm-generic/fcntl.h
+#usr/include/asm-generic/hugetlb_encode.h
 #usr/include/asm-generic/int-l64.h
 #usr/include/asm-generic/int-ll64.h
 #usr/include/asm-generic/ioctl.h
@@ -68,25 +69,35 @@
 #usr/include/asm/termbits.h
 #usr/include/asm/termios.h
 #usr/include/asm/types.h
+#usr/include/asm/unistd-common.h
+#usr/include/asm/unistd-eabi.h
+#usr/include/asm/unistd-oabi.h
 #usr/include/asm/unistd.h
 #usr/include/drm
+#usr/include/drm/amdgpu_drm.h
+#usr/include/drm/armada_drm.h
 #usr/include/drm/drm.h
 #usr/include/drm/drm_fourcc.h
 #usr/include/drm/drm_mode.h
 #usr/include/drm/drm_sarea.h
+#usr/include/drm/etnaviv_drm.h
 #usr/include/drm/exynos_drm.h
 #usr/include/drm/i810_drm.h
 #usr/include/drm/i915_drm.h
 #usr/include/drm/mga_drm.h
 #usr/include/drm/msm_drm.h
 #usr/include/drm/nouveau_drm.h
+#usr/include/drm/omap_drm.h
 #usr/include/drm/qxl_drm.h
 #usr/include/drm/r128_drm.h
 #usr/include/drm/radeon_drm.h
 #usr/include/drm/savage_drm.h
 #usr/include/drm/sis_drm.h
 #usr/include/drm/tegra_drm.h
+#usr/include/drm/vc4_drm.h
+#usr/include/drm/vgem_drm.h
 #usr/include/drm/via_drm.h
+#usr/include/drm/virtgpu_drm.h
 #usr/include/drm/vmwgfx_drm.h
 #usr/include/linux
 #usr/include/linux/acct.h
@@ -95,8 +106,12 @@
 #usr/include/linux/affs_hardblocks.h
 #usr/include/linux/agpgart.h
 #usr/include/linux/aio_abi.h
+#usr/include/linux/am437x-vpfe.h
+#usr/include/linux/android
+#usr/include/linux/android/binder.h
 #usr/include/linux/apm_bios.h
 #usr/include/linux/arcfb.h
+#usr/include/linux/aspeed-lpc-ctrl.h
 #usr/include/linux/atalk.h
 #usr/include/linux/atm.h
 #usr/include/linux/atm_eni.h
@@ -117,20 +132,29 @@
 #usr/include/linux/atmsap.h
 #usr/include/linux/atmsvc.h
 #usr/include/linux/audit.h
+#usr/include/linux/auto_dev-ioctl.h
 #usr/include/linux/auto_fs.h
 #usr/include/linux/auto_fs4.h
 #usr/include/linux/auxvec.h
 #usr/include/linux/ax25.h
 #usr/include/linux/b1lli.h
+#usr/include/linux/batman_adv.h
 #usr/include/linux/baycom.h
+#usr/include/linux/bcache.h
 #usr/include/linux/bcm933xx_hcs.h
 #usr/include/linux/bfs_fs.h
 #usr/include/linux/binfmts.h
 #usr/include/linux/blkpg.h
 #usr/include/linux/blktrace_api.h
+#usr/include/linux/blkzoned.h
+#usr/include/linux/bpf.h
+#usr/include/linux/bpf_common.h
+#usr/include/linux/bpf_perf_event.h
 #usr/include/linux/bpqether.h
 #usr/include/linux/bsg.h
+#usr/include/linux/bt-bmc.h
 #usr/include/linux/btrfs.h
+#usr/include/linux/btrfs_tree.h
 #usr/include/linux/byteorder
 #usr/include/linux/byteorder/big_endian.h
 #usr/include/linux/byteorder/little_endian.h
@@ -144,13 +168,18 @@
 #usr/include/linux/can/gw.h
 #usr/include/linux/can/netlink.h
 #usr/include/linux/can/raw.h
+#usr/include/linux/can/vxcan.h
 #usr/include/linux/capability.h
 #usr/include/linux/capi.h
 #usr/include/linux/cciss_defs.h
 #usr/include/linux/cciss_ioctl.h
 #usr/include/linux/cdrom.h
+#usr/include/linux/cec-funcs.h
+#usr/include/linux/cec.h
 #usr/include/linux/cgroupstats.h
 #usr/include/linux/chio.h
+#usr/include/linux/cifs
+#usr/include/linux/cifs/cifs_mount.h
 #usr/include/linux/cm4000_cs.h
 #usr/include/linux/cn_proc.h
 #usr/include/linux/coda.h
@@ -158,12 +187,15 @@
 #usr/include/linux/coff.h
 #usr/include/linux/connector.h
 #usr/include/linux/const.h
+#usr/include/linux/coresight-stm.h
 #usr/include/linux/cramfs_fs.h
+#usr/include/linux/cryptouser.h
 #usr/include/linux/cuda.h
 #usr/include/linux/cyclades.h
 #usr/include/linux/cycx_cfm.h
 #usr/include/linux/dcbnl.h
 #usr/include/linux/dccp.h
+#usr/include/linux/devlink.h
 #usr/include/linux/dlm.h
 #usr/include/linux/dlm_device.h
 #usr/include/linux/dlm_netlink.h
@@ -171,6 +203,7 @@
 #usr/include/linux/dlmconstants.h
 #usr/include/linux/dm-ioctl.h
 #usr/include/linux/dm-log-userspace.h
+#usr/include/linux/dma-buf.h
 #usr/include/linux/dn.h
 #usr/include/linux/dqblk_xfs.h
 #usr/include/linux/dvb
@@ -205,15 +238,23 @@
 #usr/include/linux/firewire-cdev.h
 #usr/include/linux/firewire-constants.h
 #usr/include/linux/flat.h
+#usr/include/linux/fou.h
 #usr/include/linux/fs.h
 #usr/include/linux/fsl_hypervisor.h
+#usr/include/linux/fsmap.h
 #usr/include/linux/fuse.h
 #usr/include/linux/futex.h
 #usr/include/linux/gameport.h
 #usr/include/linux/gen_stats.h
 #usr/include/linux/genetlink.h
+#usr/include/linux/genwqe
+#usr/include/linux/genwqe/genwqe_card.h
 #usr/include/linux/gfs2_ondisk.h
 #usr/include/linux/gigaset_dev.h
+#usr/include/linux/gpio.h
+#usr/include/linux/gsmmux.h
+#usr/include/linux/gtp.h
+#usr/include/linux/hash_info.h
 #usr/include/linux/hdlc
 #usr/include/linux/hdlc.h
 #usr/include/linux/hdlc/ioctl.h
@@ -224,8 +265,11 @@
 #usr/include/linux/hidraw.h
 #usr/include/linux/hpet.h
 #usr/include/linux/hsi
+#usr/include/linux/hsi/cs-protocol.h
 #usr/include/linux/hsi/hsi_char.h
+#usr/include/linux/hsr_netlink.h
 #usr/include/linux/hw_breakpoint.h
+#usr/include/linux/hyperv.h
 #usr/include/linux/hysdn_if.h
 #usr/include/linux/i2c-dev.h
 #usr/include/linux/i2c.h
@@ -251,6 +295,7 @@
 #usr/include/linux/if_infiniband.h
 #usr/include/linux/if_link.h
 #usr/include/linux/if_ltalk.h
+#usr/include/linux/if_macsec.h
 #usr/include/linux/if_packet.h
 #usr/include/linux/if_phonet.h
 #usr/include/linux/if_plip.h
@@ -263,12 +308,18 @@
 #usr/include/linux/if_tunnel.h
 #usr/include/linux/if_vlan.h
 #usr/include/linux/if_x25.h
+#usr/include/linux/ife.h
 #usr/include/linux/igmp.h
+#usr/include/linux/iio
+#usr/include/linux/iio/events.h
+#usr/include/linux/iio/types.h
+#usr/include/linux/ila.h
 #usr/include/linux/in.h
 #usr/include/linux/in6.h
 #usr/include/linux/in_route.h
 #usr/include/linux/inet_diag.h
 #usr/include/linux/inotify.h
+#usr/include/linux/input-event-codes.h
 #usr/include/linux/input.h
 #usr/include/linux/ioctl.h
 #usr/include/linux/ip.h
@@ -295,6 +346,9 @@
 #usr/include/linux/ixjuser.h
 #usr/include/linux/jffs2.h
 #usr/include/linux/joystick.h
+#usr/include/linux/kcm.h
+#usr/include/linux/kcmp.h
+#usr/include/linux/kcov.h
 #usr/include/linux/kd.h
 #usr/include/linux/kdev_t.h
 #usr/include/linux/kernel-page-flags.h
@@ -303,21 +357,29 @@
 #usr/include/linux/kexec.h
 #usr/include/linux/keyboard.h
 #usr/include/linux/keyctl.h
+#usr/include/linux/kfd_ioctl.h
 #usr/include/linux/kvm.h
 #usr/include/linux/kvm_para.h
 #usr/include/linux/l2tp.h
 #usr/include/linux/libc-compat.h
+#usr/include/linux/lightnvm.h
 #usr/include/linux/limits.h
+#usr/include/linux/lirc.h
 #usr/include/linux/llc.h
 #usr/include/linux/loop.h
 #usr/include/linux/lp.h
+#usr/include/linux/lwtunnel.h
 #usr/include/linux/magic.h
 #usr/include/linux/major.h
 #usr/include/linux/map_to_7segment.h
 #usr/include/linux/matroxfb.h
+#usr/include/linux/max2175.h
 #usr/include/linux/mdio.h
+#usr/include/linux/media-bus-format.h
 #usr/include/linux/media.h
 #usr/include/linux/mei.h
+#usr/include/linux/membarrier.h
+#usr/include/linux/memfd.h
 #usr/include/linux/mempolicy.h
 #usr/include/linux/meye.h
 #usr/include/linux/mic_common.h
@@ -328,6 +390,9 @@
 #usr/include/linux/mmc
 #usr/include/linux/mmc/ioctl.h
 #usr/include/linux/mmtimer.h
+#usr/include/linux/module.h
+#usr/include/linux/mpls.h
+#usr/include/linux/mpls_iptunnel.h
 #usr/include/linux/mqueue.h
 #usr/include/linux/mroute.h
 #usr/include/linux/mroute6.h
@@ -335,14 +400,17 @@
 #usr/include/linux/msg.h
 #usr/include/linux/mtio.h
 #usr/include/linux/n_r3964.h
+#usr/include/linux/nbd-netlink.h
 #usr/include/linux/nbd.h
 #usr/include/linux/ncp.h
 #usr/include/linux/ncp_fs.h
 #usr/include/linux/ncp_mount.h
 #usr/include/linux/ncp_no.h
+#usr/include/linux/ndctl.h
 #usr/include/linux/neighbour.h
 #usr/include/linux/net.h
 #usr/include/linux/net_dropmon.h
+#usr/include/linux/net_namespace.h
 #usr/include/linux/net_tstamp.h
 #usr/include/linux/netconf.h
 #usr/include/linux/netdevice.h
@@ -358,6 +426,7 @@
 #usr/include/linux/netfilter/nf_conntrack_sctp.h
 #usr/include/linux/netfilter/nf_conntrack_tcp.h
 #usr/include/linux/netfilter/nf_conntrack_tuple_common.h
+#usr/include/linux/netfilter/nf_log.h
 #usr/include/linux/netfilter/nf_nat.h
 #usr/include/linux/netfilter/nf_tables.h
 #usr/include/linux/netfilter/nf_tables_compat.h
@@ -386,6 +455,7 @@
 #usr/include/linux/netfilter/xt_NFQUEUE.h
 #usr/include/linux/netfilter/xt_RATEEST.h
 #usr/include/linux/netfilter/xt_SECMARK.h
+#usr/include/linux/netfilter/xt_SYNPROXY.h
 #usr/include/linux/netfilter/xt_TCPMSS.h
 #usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
 #usr/include/linux/netfilter/xt_TEE.h
@@ -412,7 +482,6 @@
 #usr/include/linux/netfilter/xt_iprange.h
 #usr/include/linux/netfilter/xt_ipvs.h
 #usr/include/linux/netfilter/xt_l2tp.h
-#usr/include/linux/netfilter/xt_layer7.h
 #usr/include/linux/netfilter/xt_length.h
 #usr/include/linux/netfilter/xt_limit.h
 #usr/include/linux/netfilter/xt_mac.h
@@ -460,7 +529,6 @@
 #usr/include/linux/netfilter_bridge/ebt_pkttype.h
 #usr/include/linux/netfilter_bridge/ebt_redirect.h
 #usr/include/linux/netfilter_bridge/ebt_stp.h
-#usr/include/linux/netfilter_bridge/ebt_ulog.h
 #usr/include/linux/netfilter_bridge/ebt_vlan.h
 #usr/include/linux/netfilter_bridge/ebtables.h
 #usr/include/linux/netfilter_decnet.h
@@ -472,7 +540,6 @@
 #usr/include/linux/netfilter_ipv4/ipt_LOG.h
 #usr/include/linux/netfilter_ipv4/ipt_REJECT.h
 #usr/include/linux/netfilter_ipv4/ipt_TTL.h
-#usr/include/linux/netfilter_ipv4/ipt_ULOG.h
 #usr/include/linux/netfilter_ipv4/ipt_ah.h
 #usr/include/linux/netfilter_ipv4/ipt_ecn.h
 #usr/include/linux/netfilter_ipv4/ipt_ttl.h
@@ -509,9 +576,12 @@
 #usr/include/linux/nfsd/export.h
 #usr/include/linux/nfsd/nfsfh.h
 #usr/include/linux/nfsd/stats.h
+#usr/include/linux/nilfs2_api.h
+#usr/include/linux/nilfs2_ondisk.h
 #usr/include/linux/nl80211.h
+#usr/include/linux/nsfs.h
 #usr/include/linux/nubus.h
-#usr/include/linux/nvme.h
+#usr/include/linux/nvme_ioctl.h
 #usr/include/linux/nvram.h
 #usr/include/linux/omap3isp.h
 #usr/include/linux/omapfb.h
@@ -523,6 +593,7 @@
 #usr/include/linux/patchkey.h
 #usr/include/linux/pci.h
 #usr/include/linux/pci_regs.h
+#usr/include/linux/pcitest.h
 #usr/include/linux/perf_event.h
 #usr/include/linux/personality.h
 #usr/include/linux/pfkeyv2.h
@@ -534,17 +605,23 @@
 #usr/include/linux/pktcdvd.h
 #usr/include/linux/pmu.h
 #usr/include/linux/poll.h
+#usr/include/linux/posix_acl.h
+#usr/include/linux/posix_acl_xattr.h
 #usr/include/linux/posix_types.h
 #usr/include/linux/ppdev.h
 #usr/include/linux/ppp-comp.h
 #usr/include/linux/ppp-ioctl.h
 #usr/include/linux/ppp_defs.h
 #usr/include/linux/pps.h
+#usr/include/linux/pr.h
 #usr/include/linux/prctl.h
+#usr/include/linux/psample.h
+#usr/include/linux/psci.h
 #usr/include/linux/ptp_clock.h
 #usr/include/linux/ptrace.h
 #usr/include/linux/qnx4_fs.h
 #usr/include/linux/qnxtypes.h
+#usr/include/linux/qrtr.h
 #usr/include/linux/quota.h
 #usr/include/linux/radeonfb.h
 #usr/include/linux/raid
@@ -558,18 +635,31 @@
 #usr/include/linux/reiserfs_xattr.h
 #usr/include/linux/resource.h
 #usr/include/linux/rfkill.h
+#usr/include/linux/rio_cm_cdev.h
+#usr/include/linux/rio_mport_cdev.h
 #usr/include/linux/romfs_fs.h
 #usr/include/linux/rose.h
 #usr/include/linux/route.h
+#usr/include/linux/rpmsg.h
 #usr/include/linux/rtc.h
 #usr/include/linux/rtnetlink.h
+#usr/include/linux/rxrpc.h
 #usr/include/linux/scc.h
+#usr/include/linux/sched
 #usr/include/linux/sched.h
+#usr/include/linux/sched/types.h
+#usr/include/linux/scif_ioctl.h
 #usr/include/linux/screen_info.h
 #usr/include/linux/sctp.h
 #usr/include/linux/sdla.h
 #usr/include/linux/seccomp.h
 #usr/include/linux/securebits.h
+#usr/include/linux/sed-opal.h
+#usr/include/linux/seg6.h
+#usr/include/linux/seg6_genl.h
+#usr/include/linux/seg6_hmac.h
+#usr/include/linux/seg6_iptunnel.h
+#usr/include/linux/seg6_local.h
 #usr/include/linux/selinux_netlink.h
 #usr/include/linux/sem.h
 #usr/include/linux/serial.h
@@ -579,11 +669,13 @@
 #usr/include/linux/shm.h
 #usr/include/linux/signal.h
 #usr/include/linux/signalfd.h
+#usr/include/linux/smc.h
+#usr/include/linux/smc_diag.h
+#usr/include/linux/smiapp.h
 #usr/include/linux/snmp.h
 #usr/include/linux/sock_diag.h
 #usr/include/linux/socket.h
 #usr/include/linux/sockios.h
-#usr/include/linux/som.h
 #usr/include/linux/sonet.h
 #usr/include/linux/sonypi.h
 #usr/include/linux/sound.h
@@ -592,24 +684,35 @@
 #usr/include/linux/spi/spidev.h
 #usr/include/linux/stat.h
 #usr/include/linux/stddef.h
+#usr/include/linux/stm.h
 #usr/include/linux/string.h
 #usr/include/linux/sunrpc
 #usr/include/linux/sunrpc/debug.h
 #usr/include/linux/suspend_ioctls.h
 #usr/include/linux/swab.h
+#usr/include/linux/switchtec_ioctl.h
+#usr/include/linux/sync_file.h
 #usr/include/linux/synclink.h
 #usr/include/linux/sysctl.h
 #usr/include/linux/sysinfo.h
+#usr/include/linux/target_core_user.h
 #usr/include/linux/taskstats.h
 #usr/include/linux/tc_act
+#usr/include/linux/tc_act/tc_bpf.h
+#usr/include/linux/tc_act/tc_connmark.h
 #usr/include/linux/tc_act/tc_csum.h
 #usr/include/linux/tc_act/tc_defact.h
 #usr/include/linux/tc_act/tc_gact.h
+#usr/include/linux/tc_act/tc_ife.h
 #usr/include/linux/tc_act/tc_ipt.h
 #usr/include/linux/tc_act/tc_mirred.h
 #usr/include/linux/tc_act/tc_nat.h
 #usr/include/linux/tc_act/tc_pedit.h
+#usr/include/linux/tc_act/tc_sample.h
 #usr/include/linux/tc_act/tc_skbedit.h
+#usr/include/linux/tc_act/tc_skbmod.h
+#usr/include/linux/tc_act/tc_tunnel_key.h
+#usr/include/linux/tc_act/tc_vlan.h
 #usr/include/linux/tc_ematch
 #usr/include/linux/tc_ematch/tc_em_cmp.h
 #usr/include/linux/tc_ematch/tc_em_meta.h
@@ -617,14 +720,19 @@
 #usr/include/linux/tc_ematch/tc_em_text.h
 #usr/include/linux/tcp.h
 #usr/include/linux/tcp_metrics.h
+#usr/include/linux/tee.h
 #usr/include/linux/telephony.h
 #usr/include/linux/termios.h
+#usr/include/linux/thermal.h
 #usr/include/linux/time.h
+#usr/include/linux/timerfd.h
 #usr/include/linux/times.h
 #usr/include/linux/timex.h
 #usr/include/linux/tiocl.h
 #usr/include/linux/tipc.h
 #usr/include/linux/tipc_config.h
+#usr/include/linux/tipc_netlink.h
+#usr/include/linux/tls.h
 #usr/include/linux/toshiba.h
 #usr/include/linux/tty.h
 #usr/include/linux/tty_flags.h
@@ -634,6 +742,7 @@
 #usr/include/linux/uhid.h
 #usr/include/linux/uinput.h
 #usr/include/linux/uio.h
+#usr/include/linux/uleds.h
 #usr/include/linux/ultrasound.h
 #usr/include/linux/un.h
 #usr/include/linux/unistd.h
@@ -644,6 +753,7 @@
 #usr/include/linux/usb/cdc.h
 #usr/include/linux/usb/ch11.h
 #usr/include/linux/usb/ch9.h
+#usr/include/linux/usb/charger.h
 #usr/include/linux/usb/functionfs.h
 #usr/include/linux/usb/g_printer.h
 #usr/include/linux/usb/gadgetfs.h
@@ -651,6 +761,9 @@
 #usr/include/linux/usb/tmc.h
 #usr/include/linux/usb/video.h
 #usr/include/linux/usbdevice_fs.h
+#usr/include/linux/usbip.h
+#usr/include/linux/userfaultfd.h
+#usr/include/linux/userio.h
 #usr/include/linux/utime.h
 #usr/include/linux/utsname.h
 #usr/include/linux/uuid.h
@@ -663,6 +776,7 @@
 #usr/include/linux/version.h
 #usr/include/linux/veth.h
 #usr/include/linux/vfio.h
+#usr/include/linux/vfio_ccw.h
 #usr/include/linux/vhost.h
 #usr/include/linux/videodev2.h
 #usr/include/linux/virtio_9p.h
@@ -670,12 +784,22 @@
 #usr/include/linux/virtio_blk.h
 #usr/include/linux/virtio_config.h
 #usr/include/linux/virtio_console.h
+#usr/include/linux/virtio_crypto.h
+#usr/include/linux/virtio_gpu.h
 #usr/include/linux/virtio_ids.h
+#usr/include/linux/virtio_input.h
+#usr/include/linux/virtio_mmio.h
 #usr/include/linux/virtio_net.h
 #usr/include/linux/virtio_pci.h
 #usr/include/linux/virtio_ring.h
 #usr/include/linux/virtio_rng.h
+#usr/include/linux/virtio_scsi.h
+#usr/include/linux/virtio_types.h
+#usr/include/linux/virtio_vsock.h
+#usr/include/linux/vm_sockets.h
+#usr/include/linux/vsockmon.h
 #usr/include/linux/vt.h
+#usr/include/linux/vtpm_proxy.h
 #usr/include/linux/wait.h
 #usr/include/linux/wanrouter.h
 #usr/include/linux/watchdog.h
@@ -686,8 +810,11 @@
 #usr/include/linux/x25.h
 #usr/include/linux/xattr.h
 #usr/include/linux/xfrm.h
+#usr/include/linux/xilinx-v4l2-controls.h
 #usr/include/linux/zorro.h
 #usr/include/linux/zorro_ids.h
+#usr/include/misc
+#usr/include/misc/cxl.h
 #usr/include/mtd
 #usr/include/mtd/inftl-user.h
 #usr/include/mtd/mtd-abi.h
@@ -695,13 +822,31 @@
 #usr/include/mtd/nftl-user.h
 #usr/include/mtd/ubi-user.h
 #usr/include/rdma
+#usr/include/rdma/bnxt_re-abi.h
+#usr/include/rdma/cxgb3-abi.h
+#usr/include/rdma/cxgb4-abi.h
+#usr/include/rdma/hfi
+#usr/include/rdma/hfi/hfi1_ioctl.h
+#usr/include/rdma/hfi/hfi1_user.h
+#usr/include/rdma/hns-abi.h
 #usr/include/rdma/ib_user_cm.h
+#usr/include/rdma/ib_user_ioctl_verbs.h
 #usr/include/rdma/ib_user_mad.h
 #usr/include/rdma/ib_user_sa.h
 #usr/include/rdma/ib_user_verbs.h
+#usr/include/rdma/mlx4-abi.h
+#usr/include/rdma/mlx5-abi.h
+#usr/include/rdma/mthca-abi.h
+#usr/include/rdma/nes-abi.h
+#usr/include/rdma/ocrdma-abi.h
+#usr/include/rdma/qedr-abi.h
 #usr/include/rdma/rdma_netlink.h
 #usr/include/rdma/rdma_user_cm.h
+#usr/include/rdma/rdma_user_ioctl.h
+#usr/include/rdma/rdma_user_rxe.h
+#usr/include/rdma/vmw_pvrdma-abi.h
 #usr/include/scsi
+#usr/include/scsi/cxlflash_ioctl.h
 #usr/include/scsi/fc
 #usr/include/scsi/fc/fc_els.h
 #usr/include/scsi/fc/fc_fs.h
@@ -712,6 +857,7 @@
 #usr/include/scsi/scsi_netlink_fc.h
 #usr/include/sound
 #usr/include/sound/asequencer.h
+#usr/include/sound/asoc.h
 #usr/include/sound/asound.h
 #usr/include/sound/asound_fm.h
 #usr/include/sound/compress_offload.h
@@ -722,7 +868,9 @@
 #usr/include/sound/hdspm.h
 #usr/include/sound/sb16_csp.h
 #usr/include/sound/sfnt_info.h
-#usr/include/uapi
+#usr/include/sound/snd_sst_tokens.h
+#usr/include/sound/tlv.h
+#usr/include/sound/usb_stream.h
 #usr/include/video
 #usr/include/video/edid.h
 #usr/include/video/sisfb.h

config/rootfiles/common/armv5tel/linux-initrd-kirkwood

@@ -1,2 +1 @@
-#boot/initramfs-KVER-ipfire-kirkwood.img
-#boot/uInit-ipfire-kirkwood
+boot/uInit-KVER-ipfire-kirkwood

config/rootfiles/common/armv5tel/linux-initrd-multi

@@ -1,2 +1 @@
-#boot/initramfs-KVER-ipfire-multi.img
-#boot/uInit-ipfire-multi
+boot/uInit-KVER-ipfire-multi

config/rootfiles/common/armv5tel/rpi-firmware

@@ -4,7 +4,15 @@ boot/cmdline.txt
 boot/config.txt
 boot/fixup.dat
 boot/fixup_cd.dat
+boot/fixup_db.dat
 boot/fixup_x.dat
 boot/start.elf
 boot/start_cd.elf
+boot/start_db.elf
 boot/start_x.elf
+lib/firmware/brcm/brcmfmac43430-sdio.bin
+lib/firmware/brcm/brcmfmac43430-sdio.txt
+lib/firmware/brcm/brcmfmac43430a0-sdio.bin
+lib/firmware/brcm/brcmfmac43455-sdio.bin
+lib/firmware/brcm/brcmfmac43455-sdio.clm_blob
+lib/firmware/brcm/brcmfmac43455-sdio.txt

config/rootfiles/common/armv5tel/swconfig

@@ -1 +0,0 @@
-usr/bin/swconfig

config/rootfiles/common/armv5tel/u-boot

@@ -1,16 +1,28 @@
-#boot/MLO
-#boot/u-boot.img
+boot/MLO
+boot/boot.cmd
+boot/boot.mk
+boot/boot.scr
+boot/kernel.img
+boot/kernel7.img
+boot/kernel8-32.img
+boot/u-boot.img
 boot/uEnv.txt
-usr/bin/mkimage
+boot/uboot.env
 #usr/share/u-boot
 #usr/share/u-boot/banana_pi
 usr/share/u-boot/banana_pi/u-boot-sunxi-with-spl.bin
+#usr/share/u-boot/orangepi_pc
+usr/share/u-boot/orangepi_pc/u-boot-sunxi-with-spl.bin
+#usr/share/u-boot/orangepi_zero
+usr/share/u-boot/orangepi_zero/u-boot-sunxi-with-spl.bin
 #usr/share/u-boot/pandaboard
 usr/share/u-boot/pandaboard/MLO
 usr/share/u-boot/pandaboard/u-boot.img
-#usr/share/u-boot/wandboard_dl
-usr/share/u-boot/wandboard_dl/u-boot.imx
-#usr/share/u-boot/wandboard_quad
-usr/share/u-boot/wandboard_quad/u-boot.imx
-#usr/share/u-boot/wandboard_solo
-usr/share/u-boot/wandboard_solo/u-boot.imx
+#usr/share/u-boot/rpi
+usr/share/u-boot/rpi/kernel.img
+#usr/share/u-boot/rpi2
+usr/share/u-boot/rpi2/kernel7.img
+#usr/share/u-boot/rpi3
+usr/share/u-boot/rpi3/kernel8-32.img
+#usr/share/u-boot/wandboard
+usr/share/u-boot/wandboard/u-boot.imx

config/rootfiles/common/armv5tel/u-boot-kirkwood

@@ -0,0 +1,6 @@
+#usr/share/u-boot/dreamplug
+usr/share/u-boot/dreamplug/u-boot.kwb
+#usr/share/u-boot/iconnect
+usr/share/u-boot/iconnect/u-boot.kwb
+#usr/share/u-boot/icybox
+usr/share/u-boot/icybox/u-boot.kwb

config/rootfiles/common/armv5tel/u-boot-mkimage

@@ -0,0 +1 @@
+usr/bin/mkimage

config/rootfiles/common/ath10k-firmware

@@ -1,23 +0,0 @@
-lib/firmware/LICENSE.QualcommAtheros_ath10k
-#lib/firmware/ath10k
-#lib/firmware/ath10k/QCA6174
-#lib/firmware/ath10k/QCA6174/hw2.1
-lib/firmware/ath10k/QCA6174/hw2.1/board.bin
-lib/firmware/ath10k/QCA6174/hw2.1/firmware-5.bin
-lib/firmware/ath10k/QCA6174/hw2.1/notice_ath10k_firmware-5.txt
-#lib/firmware/ath10k/QCA6174/hw3.0
-lib/firmware/ath10k/QCA6174/hw3.0/board.bin
-lib/firmware/ath10k/QCA6174/hw3.0/firmware-4.bin
-lib/firmware/ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt
-#lib/firmware/ath10k/QCA988X
-#lib/firmware/ath10k/QCA988X/hw2.0
-lib/firmware/ath10k/QCA988X/hw2.0/board.bin
-lib/firmware/ath10k/QCA988X/hw2.0/firmware-4.bin
-lib/firmware/ath10k/QCA988X/hw2.0/firmware-5.bin
-lib/firmware/ath10k/QCA988X/hw2.0/notice_ath10k_firmware-4.txt
-lib/firmware/ath10k/QCA988X/hw2.0/notice_ath10k_firmware-5.txt
-#lib/firmware/ath10k/QCA99X0
-#lib/firmware/ath10k/QCA99X0/hw2.0
-lib/firmware/ath10k/QCA99X0/hw2.0/board.bin
-lib/firmware/ath10k/QCA99X0/hw2.0/firmware-5.bin
-lib/firmware/ath10k/QCA99X0/hw2.0/notice_ath10k_firmware-5.txt

config/rootfiles/common/i586/linux-headers

@@ -5,6 +5,7 @@
 #usr/include/asm-generic/errno-base.h
 #usr/include/asm-generic/errno.h
 #usr/include/asm-generic/fcntl.h
+#usr/include/asm-generic/hugetlb_encode.h
 #usr/include/asm-generic/int-l64.h
 #usr/include/asm-generic/int-ll64.h
 #usr/include/asm-generic/ioctl.h
@@ -46,6 +47,7 @@
 #usr/include/asm/errno.h
 #usr/include/asm/fcntl.h
 #usr/include/asm/hw_breakpoint.h
+#usr/include/asm/hwcap2.h
 #usr/include/asm/hyperv.h
 #usr/include/asm/ioctl.h
 #usr/include/asm/ioctls.h
@@ -53,11 +55,11 @@
 #usr/include/asm/ist.h
 #usr/include/asm/kvm.h
 #usr/include/asm/kvm_para.h
+#usr/include/asm/kvm_perf.h
 #usr/include/asm/ldt.h
 #usr/include/asm/mce.h
 #usr/include/asm/mman.h
 #usr/include/asm/msgbuf.h
-#usr/include/asm/msr-index.h
 #usr/include/asm/msr.h
 #usr/include/asm/mtrr.h
 #usr/include/asm/param.h
@@ -97,23 +99,30 @@
 #usr/include/asm/vmx.h
 #usr/include/asm/vsyscall.h
 #usr/include/drm
+#usr/include/drm/amdgpu_drm.h
+#usr/include/drm/armada_drm.h
 #usr/include/drm/drm.h
 #usr/include/drm/drm_fourcc.h
 #usr/include/drm/drm_mode.h
 #usr/include/drm/drm_sarea.h
+#usr/include/drm/etnaviv_drm.h
 #usr/include/drm/exynos_drm.h
 #usr/include/drm/i810_drm.h
 #usr/include/drm/i915_drm.h
 #usr/include/drm/mga_drm.h
 #usr/include/drm/msm_drm.h
 #usr/include/drm/nouveau_drm.h
+#usr/include/drm/omap_drm.h
 #usr/include/drm/qxl_drm.h
 #usr/include/drm/r128_drm.h
 #usr/include/drm/radeon_drm.h
 #usr/include/drm/savage_drm.h
 #usr/include/drm/sis_drm.h
 #usr/include/drm/tegra_drm.h
+#usr/include/drm/vc4_drm.h
+#usr/include/drm/vgem_drm.h
 #usr/include/drm/via_drm.h
+#usr/include/drm/virtgpu_drm.h
 #usr/include/drm/vmwgfx_drm.h
 #usr/include/linux
 #usr/include/linux/a.out.h
@@ -123,8 +132,12 @@
 #usr/include/linux/affs_hardblocks.h
 #usr/include/linux/agpgart.h
 #usr/include/linux/aio_abi.h
+#usr/include/linux/am437x-vpfe.h
+#usr/include/linux/android
+#usr/include/linux/android/binder.h
 #usr/include/linux/apm_bios.h
 #usr/include/linux/arcfb.h
+#usr/include/linux/aspeed-lpc-ctrl.h
 #usr/include/linux/atalk.h
 #usr/include/linux/atm.h
 #usr/include/linux/atm_eni.h
@@ -145,20 +158,29 @@
 #usr/include/linux/atmsap.h
 #usr/include/linux/atmsvc.h
 #usr/include/linux/audit.h
+#usr/include/linux/auto_dev-ioctl.h
 #usr/include/linux/auto_fs.h
 #usr/include/linux/auto_fs4.h
 #usr/include/linux/auxvec.h
 #usr/include/linux/ax25.h
 #usr/include/linux/b1lli.h
+#usr/include/linux/batman_adv.h
 #usr/include/linux/baycom.h
+#usr/include/linux/bcache.h
 #usr/include/linux/bcm933xx_hcs.h
 #usr/include/linux/bfs_fs.h
 #usr/include/linux/binfmts.h
 #usr/include/linux/blkpg.h
 #usr/include/linux/blktrace_api.h
+#usr/include/linux/blkzoned.h
+#usr/include/linux/bpf.h
+#usr/include/linux/bpf_common.h
+#usr/include/linux/bpf_perf_event.h
 #usr/include/linux/bpqether.h
 #usr/include/linux/bsg.h
+#usr/include/linux/bt-bmc.h
 #usr/include/linux/btrfs.h
+#usr/include/linux/btrfs_tree.h
 #usr/include/linux/byteorder
 #usr/include/linux/byteorder/big_endian.h
 #usr/include/linux/byteorder/little_endian.h
@@ -172,13 +194,18 @@
 #usr/include/linux/can/gw.h
 #usr/include/linux/can/netlink.h
 #usr/include/linux/can/raw.h
+#usr/include/linux/can/vxcan.h
 #usr/include/linux/capability.h
 #usr/include/linux/capi.h
 #usr/include/linux/cciss_defs.h
 #usr/include/linux/cciss_ioctl.h
 #usr/include/linux/cdrom.h
+#usr/include/linux/cec-funcs.h
+#usr/include/linux/cec.h
 #usr/include/linux/cgroupstats.h
 #usr/include/linux/chio.h
+#usr/include/linux/cifs
+#usr/include/linux/cifs/cifs_mount.h
 #usr/include/linux/cm4000_cs.h
 #usr/include/linux/cn_proc.h
 #usr/include/linux/coda.h
@@ -186,12 +213,15 @@
 #usr/include/linux/coff.h
 #usr/include/linux/connector.h
 #usr/include/linux/const.h
+#usr/include/linux/coresight-stm.h
 #usr/include/linux/cramfs_fs.h
+#usr/include/linux/cryptouser.h
 #usr/include/linux/cuda.h
 #usr/include/linux/cyclades.h
 #usr/include/linux/cycx_cfm.h
 #usr/include/linux/dcbnl.h
 #usr/include/linux/dccp.h
+#usr/include/linux/devlink.h
 #usr/include/linux/dlm.h
 #usr/include/linux/dlm_device.h
 #usr/include/linux/dlm_netlink.h
@@ -199,6 +229,7 @@
 #usr/include/linux/dlmconstants.h
 #usr/include/linux/dm-ioctl.h
 #usr/include/linux/dm-log-userspace.h
+#usr/include/linux/dma-buf.h
 #usr/include/linux/dn.h
 #usr/include/linux/dqblk_xfs.h
 #usr/include/linux/dvb
@@ -233,15 +264,23 @@
 #usr/include/linux/firewire-cdev.h
 #usr/include/linux/firewire-constants.h
 #usr/include/linux/flat.h
+#usr/include/linux/fou.h
 #usr/include/linux/fs.h
 #usr/include/linux/fsl_hypervisor.h
+#usr/include/linux/fsmap.h
 #usr/include/linux/fuse.h
 #usr/include/linux/futex.h
 #usr/include/linux/gameport.h
 #usr/include/linux/gen_stats.h
 #usr/include/linux/genetlink.h
+#usr/include/linux/genwqe
+#usr/include/linux/genwqe/genwqe_card.h
 #usr/include/linux/gfs2_ondisk.h
 #usr/include/linux/gigaset_dev.h
+#usr/include/linux/gpio.h
+#usr/include/linux/gsmmux.h
+#usr/include/linux/gtp.h
+#usr/include/linux/hash_info.h
 #usr/include/linux/hdlc
 #usr/include/linux/hdlc.h
 #usr/include/linux/hdlc/ioctl.h
@@ -252,8 +291,11 @@
 #usr/include/linux/hidraw.h
 #usr/include/linux/hpet.h
 #usr/include/linux/hsi
+#usr/include/linux/hsi/cs-protocol.h
 #usr/include/linux/hsi/hsi_char.h
+#usr/include/linux/hsr_netlink.h
 #usr/include/linux/hw_breakpoint.h
+#usr/include/linux/hyperv.h
 #usr/include/linux/hysdn_if.h
 #usr/include/linux/i2c-dev.h
 #usr/include/linux/i2c.h
@@ -279,6 +321,7 @@
 #usr/include/linux/if_infiniband.h
 #usr/include/linux/if_link.h
 #usr/include/linux/if_ltalk.h
+#usr/include/linux/if_macsec.h
 #usr/include/linux/if_packet.h
 #usr/include/linux/if_phonet.h
 #usr/include/linux/if_plip.h
@@ -291,12 +334,18 @@
 #usr/include/linux/if_tunnel.h
 #usr/include/linux/if_vlan.h
 #usr/include/linux/if_x25.h
+#usr/include/linux/ife.h
 #usr/include/linux/igmp.h
+#usr/include/linux/iio
+#usr/include/linux/iio/events.h
+#usr/include/linux/iio/types.h
+#usr/include/linux/ila.h
 #usr/include/linux/in.h
 #usr/include/linux/in6.h
 #usr/include/linux/in_route.h
 #usr/include/linux/inet_diag.h
 #usr/include/linux/inotify.h
+#usr/include/linux/input-event-codes.h
 #usr/include/linux/input.h
 #usr/include/linux/ioctl.h
 #usr/include/linux/ip.h
@@ -323,6 +372,9 @@
 #usr/include/linux/ixjuser.h
 #usr/include/linux/jffs2.h
 #usr/include/linux/joystick.h
+#usr/include/linux/kcm.h
+#usr/include/linux/kcmp.h
+#usr/include/linux/kcov.h
 #usr/include/linux/kd.h
 #usr/include/linux/kdev_t.h
 #usr/include/linux/kernel-page-flags.h
@@ -331,21 +383,29 @@
 #usr/include/linux/kexec.h
 #usr/include/linux/keyboard.h
 #usr/include/linux/keyctl.h
+#usr/include/linux/kfd_ioctl.h
 #usr/include/linux/kvm.h
 #usr/include/linux/kvm_para.h
 #usr/include/linux/l2tp.h
 #usr/include/linux/libc-compat.h
+#usr/include/linux/lightnvm.h
 #usr/include/linux/limits.h
+#usr/include/linux/lirc.h
 #usr/include/linux/llc.h
 #usr/include/linux/loop.h
 #usr/include/linux/lp.h
+#usr/include/linux/lwtunnel.h
 #usr/include/linux/magic.h
 #usr/include/linux/major.h
 #usr/include/linux/map_to_7segment.h
 #usr/include/linux/matroxfb.h
+#usr/include/linux/max2175.h
 #usr/include/linux/mdio.h
+#usr/include/linux/media-bus-format.h
 #usr/include/linux/media.h
 #usr/include/linux/mei.h
+#usr/include/linux/membarrier.h
+#usr/include/linux/memfd.h
 #usr/include/linux/mempolicy.h
 #usr/include/linux/meye.h
 #usr/include/linux/mic_common.h
@@ -356,6 +416,9 @@
 #usr/include/linux/mmc
 #usr/include/linux/mmc/ioctl.h
 #usr/include/linux/mmtimer.h
+#usr/include/linux/module.h
+#usr/include/linux/mpls.h
+#usr/include/linux/mpls_iptunnel.h
 #usr/include/linux/mqueue.h
 #usr/include/linux/mroute.h
 #usr/include/linux/mroute6.h
@@ -363,14 +426,17 @@
 #usr/include/linux/msg.h
 #usr/include/linux/mtio.h
 #usr/include/linux/n_r3964.h
+#usr/include/linux/nbd-netlink.h
 #usr/include/linux/nbd.h
 #usr/include/linux/ncp.h
 #usr/include/linux/ncp_fs.h
 #usr/include/linux/ncp_mount.h
 #usr/include/linux/ncp_no.h
+#usr/include/linux/ndctl.h
 #usr/include/linux/neighbour.h
 #usr/include/linux/net.h
 #usr/include/linux/net_dropmon.h
+#usr/include/linux/net_namespace.h
 #usr/include/linux/net_tstamp.h
 #usr/include/linux/netconf.h
 #usr/include/linux/netdevice.h
@@ -386,6 +452,7 @@
 #usr/include/linux/netfilter/nf_conntrack_sctp.h
 #usr/include/linux/netfilter/nf_conntrack_tcp.h
 #usr/include/linux/netfilter/nf_conntrack_tuple_common.h
+#usr/include/linux/netfilter/nf_log.h
 #usr/include/linux/netfilter/nf_nat.h
 #usr/include/linux/netfilter/nf_tables.h
 #usr/include/linux/netfilter/nf_tables_compat.h
@@ -414,6 +481,7 @@
 #usr/include/linux/netfilter/xt_NFQUEUE.h
 #usr/include/linux/netfilter/xt_RATEEST.h
 #usr/include/linux/netfilter/xt_SECMARK.h
+#usr/include/linux/netfilter/xt_SYNPROXY.h
 #usr/include/linux/netfilter/xt_TCPMSS.h
 #usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
 #usr/include/linux/netfilter/xt_TEE.h
@@ -440,7 +508,6 @@
 #usr/include/linux/netfilter/xt_iprange.h
 #usr/include/linux/netfilter/xt_ipvs.h
 #usr/include/linux/netfilter/xt_l2tp.h
-#usr/include/linux/netfilter/xt_layer7.h
 #usr/include/linux/netfilter/xt_length.h
 #usr/include/linux/netfilter/xt_limit.h
 #usr/include/linux/netfilter/xt_mac.h
@@ -488,7 +555,6 @@
 #usr/include/linux/netfilter_bridge/ebt_pkttype.h
 #usr/include/linux/netfilter_bridge/ebt_redirect.h
 #usr/include/linux/netfilter_bridge/ebt_stp.h
-#usr/include/linux/netfilter_bridge/ebt_ulog.h
 #usr/include/linux/netfilter_bridge/ebt_vlan.h
 #usr/include/linux/netfilter_bridge/ebtables.h
 #usr/include/linux/netfilter_decnet.h
@@ -500,7 +566,6 @@
 #usr/include/linux/netfilter_ipv4/ipt_LOG.h
 #usr/include/linux/netfilter_ipv4/ipt_REJECT.h
 #usr/include/linux/netfilter_ipv4/ipt_TTL.h
-#usr/include/linux/netfilter_ipv4/ipt_ULOG.h
 #usr/include/linux/netfilter_ipv4/ipt_ah.h
 #usr/include/linux/netfilter_ipv4/ipt_ecn.h
 #usr/include/linux/netfilter_ipv4/ipt_ttl.h
@@ -537,9 +602,12 @@
 #usr/include/linux/nfsd/export.h
 #usr/include/linux/nfsd/nfsfh.h
 #usr/include/linux/nfsd/stats.h
+#usr/include/linux/nilfs2_api.h
+#usr/include/linux/nilfs2_ondisk.h
 #usr/include/linux/nl80211.h
+#usr/include/linux/nsfs.h
 #usr/include/linux/nubus.h
-#usr/include/linux/nvme.h
+#usr/include/linux/nvme_ioctl.h
 #usr/include/linux/nvram.h
 #usr/include/linux/omap3isp.h
 #usr/include/linux/omapfb.h
@@ -551,6 +619,7 @@
 #usr/include/linux/patchkey.h
 #usr/include/linux/pci.h
 #usr/include/linux/pci_regs.h
+#usr/include/linux/pcitest.h
 #usr/include/linux/perf_event.h
 #usr/include/linux/personality.h
 #usr/include/linux/pfkeyv2.h
@@ -562,17 +631,23 @@
 #usr/include/linux/pktcdvd.h
 #usr/include/linux/pmu.h
 #usr/include/linux/poll.h
+#usr/include/linux/posix_acl.h
+#usr/include/linux/posix_acl_xattr.h
 #usr/include/linux/posix_types.h
 #usr/include/linux/ppdev.h
 #usr/include/linux/ppp-comp.h
 #usr/include/linux/ppp-ioctl.h
 #usr/include/linux/ppp_defs.h
 #usr/include/linux/pps.h
+#usr/include/linux/pr.h
 #usr/include/linux/prctl.h
+#usr/include/linux/psample.h
+#usr/include/linux/psci.h
 #usr/include/linux/ptp_clock.h
 #usr/include/linux/ptrace.h
 #usr/include/linux/qnx4_fs.h
 #usr/include/linux/qnxtypes.h
+#usr/include/linux/qrtr.h
 #usr/include/linux/quota.h
 #usr/include/linux/radeonfb.h
 #usr/include/linux/raid
@@ -586,18 +661,31 @@
 #usr/include/linux/reiserfs_xattr.h
 #usr/include/linux/resource.h
 #usr/include/linux/rfkill.h
+#usr/include/linux/rio_cm_cdev.h
+#usr/include/linux/rio_mport_cdev.h
 #usr/include/linux/romfs_fs.h
 #usr/include/linux/rose.h
 #usr/include/linux/route.h
+#usr/include/linux/rpmsg.h
 #usr/include/linux/rtc.h
 #usr/include/linux/rtnetlink.h
+#usr/include/linux/rxrpc.h
 #usr/include/linux/scc.h
+#usr/include/linux/sched
 #usr/include/linux/sched.h
+#usr/include/linux/sched/types.h
+#usr/include/linux/scif_ioctl.h
 #usr/include/linux/screen_info.h
 #usr/include/linux/sctp.h
 #usr/include/linux/sdla.h
 #usr/include/linux/seccomp.h
 #usr/include/linux/securebits.h
+#usr/include/linux/sed-opal.h
+#usr/include/linux/seg6.h
+#usr/include/linux/seg6_genl.h
+#usr/include/linux/seg6_hmac.h
+#usr/include/linux/seg6_iptunnel.h
+#usr/include/linux/seg6_local.h
 #usr/include/linux/selinux_netlink.h
 #usr/include/linux/sem.h
 #usr/include/linux/serial.h
@@ -607,11 +695,13 @@
 #usr/include/linux/shm.h
 #usr/include/linux/signal.h
 #usr/include/linux/signalfd.h
+#usr/include/linux/smc.h
+#usr/include/linux/smc_diag.h
+#usr/include/linux/smiapp.h
 #usr/include/linux/snmp.h
 #usr/include/linux/sock_diag.h
 #usr/include/linux/socket.h
 #usr/include/linux/sockios.h
-#usr/include/linux/som.h
 #usr/include/linux/sonet.h
 #usr/include/linux/sonypi.h
 #usr/include/linux/sound.h
@@ -620,24 +710,35 @@
 #usr/include/linux/spi/spidev.h
 #usr/include/linux/stat.h
 #usr/include/linux/stddef.h
+#usr/include/linux/stm.h
 #usr/include/linux/string.h
 #usr/include/linux/sunrpc
 #usr/include/linux/sunrpc/debug.h
 #usr/include/linux/suspend_ioctls.h
 #usr/include/linux/swab.h
+#usr/include/linux/switchtec_ioctl.h
+#usr/include/linux/sync_file.h
 #usr/include/linux/synclink.h
 #usr/include/linux/sysctl.h
 #usr/include/linux/sysinfo.h
+#usr/include/linux/target_core_user.h
 #usr/include/linux/taskstats.h
 #usr/include/linux/tc_act
+#usr/include/linux/tc_act/tc_bpf.h
+#usr/include/linux/tc_act/tc_connmark.h
 #usr/include/linux/tc_act/tc_csum.h
 #usr/include/linux/tc_act/tc_defact.h
 #usr/include/linux/tc_act/tc_gact.h
+#usr/include/linux/tc_act/tc_ife.h
 #usr/include/linux/tc_act/tc_ipt.h
 #usr/include/linux/tc_act/tc_mirred.h
 #usr/include/linux/tc_act/tc_nat.h
 #usr/include/linux/tc_act/tc_pedit.h
+#usr/include/linux/tc_act/tc_sample.h
 #usr/include/linux/tc_act/tc_skbedit.h
+#usr/include/linux/tc_act/tc_skbmod.h
+#usr/include/linux/tc_act/tc_tunnel_key.h
+#usr/include/linux/tc_act/tc_vlan.h
 #usr/include/linux/tc_ematch
 #usr/include/linux/tc_ematch/tc_em_cmp.h
 #usr/include/linux/tc_ematch/tc_em_meta.h
@@ -645,14 +746,19 @@
 #usr/include/linux/tc_ematch/tc_em_text.h
 #usr/include/linux/tcp.h
 #usr/include/linux/tcp_metrics.h
+#usr/include/linux/tee.h
 #usr/include/linux/telephony.h
 #usr/include/linux/termios.h
+#usr/include/linux/thermal.h
 #usr/include/linux/time.h
+#usr/include/linux/timerfd.h
 #usr/include/linux/times.h
 #usr/include/linux/timex.h
 #usr/include/linux/tiocl.h
 #usr/include/linux/tipc.h
 #usr/include/linux/tipc_config.h
+#usr/include/linux/tipc_netlink.h
+#usr/include/linux/tls.h
 #usr/include/linux/toshiba.h
 #usr/include/linux/tty.h
 #usr/include/linux/tty_flags.h
@@ -662,6 +768,7 @@
 #usr/include/linux/uhid.h
 #usr/include/linux/uinput.h
 #usr/include/linux/uio.h
+#usr/include/linux/uleds.h
 #usr/include/linux/ultrasound.h
 #usr/include/linux/un.h
 #usr/include/linux/unistd.h
@@ -672,6 +779,7 @@
 #usr/include/linux/usb/cdc.h
 #usr/include/linux/usb/ch11.h
 #usr/include/linux/usb/ch9.h
+#usr/include/linux/usb/charger.h
 #usr/include/linux/usb/functionfs.h
 #usr/include/linux/usb/g_printer.h
 #usr/include/linux/usb/gadgetfs.h
@@ -679,6 +787,9 @@
 #usr/include/linux/usb/tmc.h
 #usr/include/linux/usb/video.h
 #usr/include/linux/usbdevice_fs.h
+#usr/include/linux/usbip.h
+#usr/include/linux/userfaultfd.h
+#usr/include/linux/userio.h
 #usr/include/linux/utime.h
 #usr/include/linux/utsname.h
 #usr/include/linux/uuid.h
@@ -691,6 +802,7 @@
 #usr/include/linux/version.h
 #usr/include/linux/veth.h
 #usr/include/linux/vfio.h
+#usr/include/linux/vfio_ccw.h
 #usr/include/linux/vhost.h
 #usr/include/linux/videodev2.h
 #usr/include/linux/virtio_9p.h
@@ -698,12 +810,22 @@
 #usr/include/linux/virtio_blk.h
 #usr/include/linux/virtio_config.h
 #usr/include/linux/virtio_console.h
+#usr/include/linux/virtio_crypto.h
+#usr/include/linux/virtio_gpu.h
 #usr/include/linux/virtio_ids.h
+#usr/include/linux/virtio_input.h
+#usr/include/linux/virtio_mmio.h
 #usr/include/linux/virtio_net.h
 #usr/include/linux/virtio_pci.h
 #usr/include/linux/virtio_ring.h
 #usr/include/linux/virtio_rng.h
+#usr/include/linux/virtio_scsi.h
+#usr/include/linux/virtio_types.h
+#usr/include/linux/virtio_vsock.h
+#usr/include/linux/vm_sockets.h
+#usr/include/linux/vsockmon.h
 #usr/include/linux/vt.h
+#usr/include/linux/vtpm_proxy.h
 #usr/include/linux/wait.h
 #usr/include/linux/wanrouter.h
 #usr/include/linux/watchdog.h
@@ -714,8 +836,11 @@
 #usr/include/linux/x25.h
 #usr/include/linux/xattr.h
 #usr/include/linux/xfrm.h
+#usr/include/linux/xilinx-v4l2-controls.h
 #usr/include/linux/zorro.h
 #usr/include/linux/zorro_ids.h
+#usr/include/misc
+#usr/include/misc/cxl.h
 #usr/include/mtd
 #usr/include/mtd/inftl-user.h
 #usr/include/mtd/mtd-abi.h
@@ -723,13 +848,31 @@
 #usr/include/mtd/nftl-user.h
 #usr/include/mtd/ubi-user.h
 #usr/include/rdma
+#usr/include/rdma/bnxt_re-abi.h
+#usr/include/rdma/cxgb3-abi.h
+#usr/include/rdma/cxgb4-abi.h
+#usr/include/rdma/hfi
+#usr/include/rdma/hfi/hfi1_ioctl.h
+#usr/include/rdma/hfi/hfi1_user.h
+#usr/include/rdma/hns-abi.h
 #usr/include/rdma/ib_user_cm.h
+#usr/include/rdma/ib_user_ioctl_verbs.h
 #usr/include/rdma/ib_user_mad.h
 #usr/include/rdma/ib_user_sa.h
 #usr/include/rdma/ib_user_verbs.h
+#usr/include/rdma/mlx4-abi.h
+#usr/include/rdma/mlx5-abi.h
+#usr/include/rdma/mthca-abi.h
+#usr/include/rdma/nes-abi.h
+#usr/include/rdma/ocrdma-abi.h
+#usr/include/rdma/qedr-abi.h
 #usr/include/rdma/rdma_netlink.h
 #usr/include/rdma/rdma_user_cm.h
+#usr/include/rdma/rdma_user_ioctl.h
+#usr/include/rdma/rdma_user_rxe.h
+#usr/include/rdma/vmw_pvrdma-abi.h
 #usr/include/scsi
+#usr/include/scsi/cxlflash_ioctl.h
 #usr/include/scsi/fc
 #usr/include/scsi/fc/fc_els.h
 #usr/include/scsi/fc/fc_fs.h
@@ -740,6 +883,7 @@
 #usr/include/scsi/scsi_netlink_fc.h
 #usr/include/sound
 #usr/include/sound/asequencer.h
+#usr/include/sound/asoc.h
 #usr/include/sound/asound.h
 #usr/include/sound/asound_fm.h
 #usr/include/sound/compress_offload.h
@@ -750,7 +894,9 @@
 #usr/include/sound/hdspm.h
 #usr/include/sound/sb16_csp.h
 #usr/include/sound/sfnt_info.h
-#usr/include/uapi
+#usr/include/sound/snd_sst_tokens.h
+#usr/include/sound/tlv.h
+#usr/include/sound/usb_stream.h
 #usr/include/video
 #usr/include/video/edid.h
 #usr/include/video/sisfb.h

config/rootfiles/common/i586/linux-initrd

@@ -1 +1 @@
-#boot/initramfs-KVER-ipfire.img
+boot/initramfs-KVER-ipfire.img

config/rootfiles/common/mt7601u-firmware

@@ -1 +0,0 @@
-lib/firmware/mt7601u.bin

config/rootfiles/common/openssl

@@ -83,6 +83,7 @@ usr/bin/openssl
 #usr/include/openssl/x509_vfy.h
 #usr/include/openssl/x509v3.h
 #usr/lib/engines-1.1
+usr/lib/engines-1.1/afalg.so
 usr/lib/engines-1.1/capi.so
 usr/lib/engines-1.1/padlock.so
 #usr/lib/libcrypto.a

config/rootfiles/common/x86_64/acpid

@@ -1,17 +0,0 @@
-etc/acpi
-etc/acpi/actions
-etc/acpi/actions/power.sh
-etc/acpi/events
-etc/acpi/events/power
-usr/bin/acpi_listen
-usr/sbin/acpid
-#usr/sbin/kacpimon
-#usr/share/doc/acpid-2.0.26
-#usr/share/doc/acpid-2.0.26/COPYING
-#usr/share/doc/acpid-2.0.26/Changelog
-#usr/share/doc/acpid-2.0.26/README
-#usr/share/doc/acpid-2.0.26/TESTPLAN
-#usr/share/doc/acpid-2.0.26/TODO
-#usr/share/man/man8/acpi_listen.8
-#usr/share/man/man8/acpid.8
-#usr/share/man/man8/kacpimon.8

config/rootfiles/common/x86_64/linux-headers

@@ -5,6 +5,7 @@
 #usr/include/asm-generic/errno-base.h
 #usr/include/asm-generic/errno.h
 #usr/include/asm-generic/fcntl.h
+#usr/include/asm-generic/hugetlb_encode.h
 #usr/include/asm-generic/int-l64.h
 #usr/include/asm-generic/int-ll64.h
 #usr/include/asm-generic/ioctl.h
@@ -46,6 +47,7 @@
 #usr/include/asm/errno.h
 #usr/include/asm/fcntl.h
 #usr/include/asm/hw_breakpoint.h
+#usr/include/asm/hwcap2.h
 #usr/include/asm/hyperv.h
 #usr/include/asm/ioctl.h
 #usr/include/asm/ioctls.h
@@ -53,11 +55,11 @@
 #usr/include/asm/ist.h
 #usr/include/asm/kvm.h
 #usr/include/asm/kvm_para.h
+#usr/include/asm/kvm_perf.h
 #usr/include/asm/ldt.h
 #usr/include/asm/mce.h
 #usr/include/asm/mman.h
 #usr/include/asm/msgbuf.h
-#usr/include/asm/msr-index.h
 #usr/include/asm/msr.h
 #usr/include/asm/mtrr.h
 #usr/include/asm/param.h
@@ -97,23 +99,30 @@
 #usr/include/asm/vmx.h
 #usr/include/asm/vsyscall.h
 #usr/include/drm
+#usr/include/drm/amdgpu_drm.h
+#usr/include/drm/armada_drm.h
 #usr/include/drm/drm.h
 #usr/include/drm/drm_fourcc.h
 #usr/include/drm/drm_mode.h
 #usr/include/drm/drm_sarea.h
+#usr/include/drm/etnaviv_drm.h
 #usr/include/drm/exynos_drm.h
 #usr/include/drm/i810_drm.h
 #usr/include/drm/i915_drm.h
 #usr/include/drm/mga_drm.h
 #usr/include/drm/msm_drm.h
 #usr/include/drm/nouveau_drm.h
+#usr/include/drm/omap_drm.h
 #usr/include/drm/qxl_drm.h
 #usr/include/drm/r128_drm.h
 #usr/include/drm/radeon_drm.h
 #usr/include/drm/savage_drm.h
 #usr/include/drm/sis_drm.h
 #usr/include/drm/tegra_drm.h
+#usr/include/drm/vc4_drm.h
+#usr/include/drm/vgem_drm.h
 #usr/include/drm/via_drm.h
+#usr/include/drm/virtgpu_drm.h
 #usr/include/drm/vmwgfx_drm.h
 #usr/include/linux
 #usr/include/linux/a.out.h
@@ -123,8 +132,12 @@
 #usr/include/linux/affs_hardblocks.h
 #usr/include/linux/agpgart.h
 #usr/include/linux/aio_abi.h
+#usr/include/linux/am437x-vpfe.h
+#usr/include/linux/android
+#usr/include/linux/android/binder.h
 #usr/include/linux/apm_bios.h
 #usr/include/linux/arcfb.h
+#usr/include/linux/aspeed-lpc-ctrl.h
 #usr/include/linux/atalk.h
 #usr/include/linux/atm.h
 #usr/include/linux/atm_eni.h
@@ -145,20 +158,29 @@
 #usr/include/linux/atmsap.h
 #usr/include/linux/atmsvc.h
 #usr/include/linux/audit.h
+#usr/include/linux/auto_dev-ioctl.h
 #usr/include/linux/auto_fs.h
 #usr/include/linux/auto_fs4.h
 #usr/include/linux/auxvec.h
 #usr/include/linux/ax25.h
 #usr/include/linux/b1lli.h
+#usr/include/linux/batman_adv.h
 #usr/include/linux/baycom.h
+#usr/include/linux/bcache.h
 #usr/include/linux/bcm933xx_hcs.h
 #usr/include/linux/bfs_fs.h
 #usr/include/linux/binfmts.h
 #usr/include/linux/blkpg.h
 #usr/include/linux/blktrace_api.h
+#usr/include/linux/blkzoned.h
+#usr/include/linux/bpf.h
+#usr/include/linux/bpf_common.h
+#usr/include/linux/bpf_perf_event.h
 #usr/include/linux/bpqether.h
 #usr/include/linux/bsg.h
+#usr/include/linux/bt-bmc.h
 #usr/include/linux/btrfs.h
+#usr/include/linux/btrfs_tree.h
 #usr/include/linux/byteorder
 #usr/include/linux/byteorder/big_endian.h
 #usr/include/linux/byteorder/little_endian.h
@@ -172,13 +194,18 @@
 #usr/include/linux/can/gw.h
 #usr/include/linux/can/netlink.h
 #usr/include/linux/can/raw.h
+#usr/include/linux/can/vxcan.h
 #usr/include/linux/capability.h
 #usr/include/linux/capi.h
 #usr/include/linux/cciss_defs.h
 #usr/include/linux/cciss_ioctl.h
 #usr/include/linux/cdrom.h
+#usr/include/linux/cec-funcs.h
+#usr/include/linux/cec.h
 #usr/include/linux/cgroupstats.h
 #usr/include/linux/chio.h
+#usr/include/linux/cifs
+#usr/include/linux/cifs/cifs_mount.h
 #usr/include/linux/cm4000_cs.h
 #usr/include/linux/cn_proc.h
 #usr/include/linux/coda.h
@@ -186,12 +213,15 @@
 #usr/include/linux/coff.h
 #usr/include/linux/connector.h
 #usr/include/linux/const.h
+#usr/include/linux/coresight-stm.h
 #usr/include/linux/cramfs_fs.h
+#usr/include/linux/cryptouser.h
 #usr/include/linux/cuda.h
 #usr/include/linux/cyclades.h
 #usr/include/linux/cycx_cfm.h
 #usr/include/linux/dcbnl.h
 #usr/include/linux/dccp.h
+#usr/include/linux/devlink.h
 #usr/include/linux/dlm.h
 #usr/include/linux/dlm_device.h
 #usr/include/linux/dlm_netlink.h
@@ -199,6 +229,7 @@
 #usr/include/linux/dlmconstants.h
 #usr/include/linux/dm-ioctl.h
 #usr/include/linux/dm-log-userspace.h
+#usr/include/linux/dma-buf.h
 #usr/include/linux/dn.h
 #usr/include/linux/dqblk_xfs.h
 #usr/include/linux/dvb
@@ -233,15 +264,23 @@
 #usr/include/linux/firewire-cdev.h
 #usr/include/linux/firewire-constants.h
 #usr/include/linux/flat.h
+#usr/include/linux/fou.h
 #usr/include/linux/fs.h
 #usr/include/linux/fsl_hypervisor.h
+#usr/include/linux/fsmap.h
 #usr/include/linux/fuse.h
 #usr/include/linux/futex.h
 #usr/include/linux/gameport.h
 #usr/include/linux/gen_stats.h
 #usr/include/linux/genetlink.h
+#usr/include/linux/genwqe
+#usr/include/linux/genwqe/genwqe_card.h
 #usr/include/linux/gfs2_ondisk.h
 #usr/include/linux/gigaset_dev.h
+#usr/include/linux/gpio.h
+#usr/include/linux/gsmmux.h
+#usr/include/linux/gtp.h
+#usr/include/linux/hash_info.h
 #usr/include/linux/hdlc
 #usr/include/linux/hdlc.h
 #usr/include/linux/hdlc/ioctl.h
@@ -252,8 +291,11 @@
 #usr/include/linux/hidraw.h
 #usr/include/linux/hpet.h
 #usr/include/linux/hsi
+#usr/include/linux/hsi/cs-protocol.h
 #usr/include/linux/hsi/hsi_char.h
+#usr/include/linux/hsr_netlink.h
 #usr/include/linux/hw_breakpoint.h
+#usr/include/linux/hyperv.h
 #usr/include/linux/hysdn_if.h
 #usr/include/linux/i2c-dev.h
 #usr/include/linux/i2c.h
@@ -279,6 +321,7 @@
 #usr/include/linux/if_infiniband.h
 #usr/include/linux/if_link.h
 #usr/include/linux/if_ltalk.h
+#usr/include/linux/if_macsec.h
 #usr/include/linux/if_packet.h
 #usr/include/linux/if_phonet.h
 #usr/include/linux/if_plip.h
@@ -291,12 +334,18 @@
 #usr/include/linux/if_tunnel.h
 #usr/include/linux/if_vlan.h
 #usr/include/linux/if_x25.h
+#usr/include/linux/ife.h
 #usr/include/linux/igmp.h
+#usr/include/linux/iio
+#usr/include/linux/iio/events.h
+#usr/include/linux/iio/types.h
+#usr/include/linux/ila.h
 #usr/include/linux/in.h
 #usr/include/linux/in6.h
 #usr/include/linux/in_route.h
 #usr/include/linux/inet_diag.h
 #usr/include/linux/inotify.h
+#usr/include/linux/input-event-codes.h
 #usr/include/linux/input.h
 #usr/include/linux/ioctl.h
 #usr/include/linux/ip.h
@@ -323,6 +372,9 @@
 #usr/include/linux/ixjuser.h
 #usr/include/linux/jffs2.h
 #usr/include/linux/joystick.h
+#usr/include/linux/kcm.h
+#usr/include/linux/kcmp.h
+#usr/include/linux/kcov.h
 #usr/include/linux/kd.h
 #usr/include/linux/kdev_t.h
 #usr/include/linux/kernel-page-flags.h
@@ -331,21 +383,29 @@
 #usr/include/linux/kexec.h
 #usr/include/linux/keyboard.h
 #usr/include/linux/keyctl.h
+#usr/include/linux/kfd_ioctl.h
 #usr/include/linux/kvm.h
 #usr/include/linux/kvm_para.h
 #usr/include/linux/l2tp.h
 #usr/include/linux/libc-compat.h
+#usr/include/linux/lightnvm.h
 #usr/include/linux/limits.h
+#usr/include/linux/lirc.h
 #usr/include/linux/llc.h
 #usr/include/linux/loop.h
 #usr/include/linux/lp.h
+#usr/include/linux/lwtunnel.h
 #usr/include/linux/magic.h
 #usr/include/linux/major.h
 #usr/include/linux/map_to_7segment.h
 #usr/include/linux/matroxfb.h
+#usr/include/linux/max2175.h
 #usr/include/linux/mdio.h
+#usr/include/linux/media-bus-format.h
 #usr/include/linux/media.h
 #usr/include/linux/mei.h
+#usr/include/linux/membarrier.h
+#usr/include/linux/memfd.h
 #usr/include/linux/mempolicy.h
 #usr/include/linux/meye.h
 #usr/include/linux/mic_common.h
@@ -356,6 +416,9 @@
 #usr/include/linux/mmc
 #usr/include/linux/mmc/ioctl.h
 #usr/include/linux/mmtimer.h
+#usr/include/linux/module.h
+#usr/include/linux/mpls.h
+#usr/include/linux/mpls_iptunnel.h
 #usr/include/linux/mqueue.h
 #usr/include/linux/mroute.h
 #usr/include/linux/mroute6.h
@@ -363,14 +426,17 @@
 #usr/include/linux/msg.h
 #usr/include/linux/mtio.h
 #usr/include/linux/n_r3964.h
+#usr/include/linux/nbd-netlink.h
 #usr/include/linux/nbd.h
 #usr/include/linux/ncp.h
 #usr/include/linux/ncp_fs.h
 #usr/include/linux/ncp_mount.h
 #usr/include/linux/ncp_no.h
+#usr/include/linux/ndctl.h
 #usr/include/linux/neighbour.h
 #usr/include/linux/net.h
 #usr/include/linux/net_dropmon.h
+#usr/include/linux/net_namespace.h
 #usr/include/linux/net_tstamp.h
 #usr/include/linux/netconf.h
 #usr/include/linux/netdevice.h
@@ -386,6 +452,7 @@
 #usr/include/linux/netfilter/nf_conntrack_sctp.h
 #usr/include/linux/netfilter/nf_conntrack_tcp.h
 #usr/include/linux/netfilter/nf_conntrack_tuple_common.h
+#usr/include/linux/netfilter/nf_log.h
 #usr/include/linux/netfilter/nf_nat.h
 #usr/include/linux/netfilter/nf_tables.h
 #usr/include/linux/netfilter/nf_tables_compat.h
@@ -414,6 +481,7 @@
 #usr/include/linux/netfilter/xt_NFQUEUE.h
 #usr/include/linux/netfilter/xt_RATEEST.h
 #usr/include/linux/netfilter/xt_SECMARK.h
+#usr/include/linux/netfilter/xt_SYNPROXY.h
 #usr/include/linux/netfilter/xt_TCPMSS.h
 #usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
 #usr/include/linux/netfilter/xt_TEE.h
@@ -440,7 +508,6 @@
 #usr/include/linux/netfilter/xt_iprange.h
 #usr/include/linux/netfilter/xt_ipvs.h
 #usr/include/linux/netfilter/xt_l2tp.h
-#usr/include/linux/netfilter/xt_layer7.h
 #usr/include/linux/netfilter/xt_length.h
 #usr/include/linux/netfilter/xt_limit.h
 #usr/include/linux/netfilter/xt_mac.h
@@ -488,7 +555,6 @@
 #usr/include/linux/netfilter_bridge/ebt_pkttype.h
 #usr/include/linux/netfilter_bridge/ebt_redirect.h
 #usr/include/linux/netfilter_bridge/ebt_stp.h
-#usr/include/linux/netfilter_bridge/ebt_ulog.h
 #usr/include/linux/netfilter_bridge/ebt_vlan.h
 #usr/include/linux/netfilter_bridge/ebtables.h
 #usr/include/linux/netfilter_decnet.h
@@ -500,7 +566,6 @@
 #usr/include/linux/netfilter_ipv4/ipt_LOG.h
 #usr/include/linux/netfilter_ipv4/ipt_REJECT.h
 #usr/include/linux/netfilter_ipv4/ipt_TTL.h
-#usr/include/linux/netfilter_ipv4/ipt_ULOG.h
 #usr/include/linux/netfilter_ipv4/ipt_ah.h
 #usr/include/linux/netfilter_ipv4/ipt_ecn.h
 #usr/include/linux/netfilter_ipv4/ipt_ttl.h
@@ -537,9 +602,12 @@
 #usr/include/linux/nfsd/export.h
 #usr/include/linux/nfsd/nfsfh.h
 #usr/include/linux/nfsd/stats.h
+#usr/include/linux/nilfs2_api.h
+#usr/include/linux/nilfs2_ondisk.h
 #usr/include/linux/nl80211.h
+#usr/include/linux/nsfs.h
 #usr/include/linux/nubus.h
-#usr/include/linux/nvme.h
+#usr/include/linux/nvme_ioctl.h
 #usr/include/linux/nvram.h
 #usr/include/linux/omap3isp.h
 #usr/include/linux/omapfb.h
@@ -551,6 +619,7 @@
 #usr/include/linux/patchkey.h
 #usr/include/linux/pci.h
 #usr/include/linux/pci_regs.h
+#usr/include/linux/pcitest.h
 #usr/include/linux/perf_event.h
 #usr/include/linux/personality.h
 #usr/include/linux/pfkeyv2.h
@@ -562,17 +631,23 @@
 #usr/include/linux/pktcdvd.h
 #usr/include/linux/pmu.h
 #usr/include/linux/poll.h
+#usr/include/linux/posix_acl.h
+#usr/include/linux/posix_acl_xattr.h
 #usr/include/linux/posix_types.h
 #usr/include/linux/ppdev.h
 #usr/include/linux/ppp-comp.h
 #usr/include/linux/ppp-ioctl.h
 #usr/include/linux/ppp_defs.h
 #usr/include/linux/pps.h
+#usr/include/linux/pr.h
 #usr/include/linux/prctl.h
+#usr/include/linux/psample.h
+#usr/include/linux/psci.h
 #usr/include/linux/ptp_clock.h
 #usr/include/linux/ptrace.h
 #usr/include/linux/qnx4_fs.h
 #usr/include/linux/qnxtypes.h
+#usr/include/linux/qrtr.h
 #usr/include/linux/quota.h
 #usr/include/linux/radeonfb.h
 #usr/include/linux/raid
@@ -586,18 +661,31 @@
 #usr/include/linux/reiserfs_xattr.h
 #usr/include/linux/resource.h
 #usr/include/linux/rfkill.h
+#usr/include/linux/rio_cm_cdev.h
+#usr/include/linux/rio_mport_cdev.h
 #usr/include/linux/romfs_fs.h
 #usr/include/linux/rose.h
 #usr/include/linux/route.h
+#usr/include/linux/rpmsg.h
 #usr/include/linux/rtc.h
 #usr/include/linux/rtnetlink.h
+#usr/include/linux/rxrpc.h
 #usr/include/linux/scc.h
+#usr/include/linux/sched
 #usr/include/linux/sched.h
+#usr/include/linux/sched/types.h
+#usr/include/linux/scif_ioctl.h
 #usr/include/linux/screen_info.h
 #usr/include/linux/sctp.h
 #usr/include/linux/sdla.h
 #usr/include/linux/seccomp.h
 #usr/include/linux/securebits.h
+#usr/include/linux/sed-opal.h
+#usr/include/linux/seg6.h
+#usr/include/linux/seg6_genl.h
+#usr/include/linux/seg6_hmac.h
+#usr/include/linux/seg6_iptunnel.h
+#usr/include/linux/seg6_local.h
 #usr/include/linux/selinux_netlink.h
 #usr/include/linux/sem.h
 #usr/include/linux/serial.h
@@ -607,11 +695,13 @@
 #usr/include/linux/shm.h
 #usr/include/linux/signal.h
 #usr/include/linux/signalfd.h
+#usr/include/linux/smc.h
+#usr/include/linux/smc_diag.h
+#usr/include/linux/smiapp.h
 #usr/include/linux/snmp.h
 #usr/include/linux/sock_diag.h
 #usr/include/linux/socket.h
 #usr/include/linux/sockios.h
-#usr/include/linux/som.h
 #usr/include/linux/sonet.h
 #usr/include/linux/sonypi.h
 #usr/include/linux/sound.h
@@ -620,24 +710,35 @@
 #usr/include/linux/spi/spidev.h
 #usr/include/linux/stat.h
 #usr/include/linux/stddef.h
+#usr/include/linux/stm.h
 #usr/include/linux/string.h
 #usr/include/linux/sunrpc
 #usr/include/linux/sunrpc/debug.h
 #usr/include/linux/suspend_ioctls.h
 #usr/include/linux/swab.h
+#usr/include/linux/switchtec_ioctl.h
+#usr/include/linux/sync_file.h
 #usr/include/linux/synclink.h
 #usr/include/linux/sysctl.h
 #usr/include/linux/sysinfo.h
+#usr/include/linux/target_core_user.h
 #usr/include/linux/taskstats.h
 #usr/include/linux/tc_act
+#usr/include/linux/tc_act/tc_bpf.h
+#usr/include/linux/tc_act/tc_connmark.h
 #usr/include/linux/tc_act/tc_csum.h
 #usr/include/linux/tc_act/tc_defact.h
 #usr/include/linux/tc_act/tc_gact.h
+#usr/include/linux/tc_act/tc_ife.h
 #usr/include/linux/tc_act/tc_ipt.h
 #usr/include/linux/tc_act/tc_mirred.h
 #usr/include/linux/tc_act/tc_nat.h
 #usr/include/linux/tc_act/tc_pedit.h
+#usr/include/linux/tc_act/tc_sample.h
 #usr/include/linux/tc_act/tc_skbedit.h
+#usr/include/linux/tc_act/tc_skbmod.h
+#usr/include/linux/tc_act/tc_tunnel_key.h
+#usr/include/linux/tc_act/tc_vlan.h
 #usr/include/linux/tc_ematch
 #usr/include/linux/tc_ematch/tc_em_cmp.h
 #usr/include/linux/tc_ematch/tc_em_meta.h
@@ -645,14 +746,19 @@
 #usr/include/linux/tc_ematch/tc_em_text.h
 #usr/include/linux/tcp.h
 #usr/include/linux/tcp_metrics.h
+#usr/include/linux/tee.h
 #usr/include/linux/telephony.h
 #usr/include/linux/termios.h
+#usr/include/linux/thermal.h
 #usr/include/linux/time.h
+#usr/include/linux/timerfd.h
 #usr/include/linux/times.h
 #usr/include/linux/timex.h
 #usr/include/linux/tiocl.h
 #usr/include/linux/tipc.h
 #usr/include/linux/tipc_config.h
+#usr/include/linux/tipc_netlink.h
+#usr/include/linux/tls.h
 #usr/include/linux/toshiba.h
 #usr/include/linux/tty.h
 #usr/include/linux/tty_flags.h
@@ -662,6 +768,7 @@
 #usr/include/linux/uhid.h
 #usr/include/linux/uinput.h
 #usr/include/linux/uio.h
+#usr/include/linux/uleds.h
 #usr/include/linux/ultrasound.h
 #usr/include/linux/un.h
 #usr/include/linux/unistd.h
@@ -672,6 +779,7 @@
 #usr/include/linux/usb/cdc.h
 #usr/include/linux/usb/ch11.h
 #usr/include/linux/usb/ch9.h
+#usr/include/linux/usb/charger.h
 #usr/include/linux/usb/functionfs.h
 #usr/include/linux/usb/g_printer.h
 #usr/include/linux/usb/gadgetfs.h
@@ -679,6 +787,9 @@
 #usr/include/linux/usb/tmc.h
 #usr/include/linux/usb/video.h
 #usr/include/linux/usbdevice_fs.h
+#usr/include/linux/usbip.h
+#usr/include/linux/userfaultfd.h
+#usr/include/linux/userio.h
 #usr/include/linux/utime.h
 #usr/include/linux/utsname.h
 #usr/include/linux/uuid.h
@@ -691,6 +802,7 @@
 #usr/include/linux/version.h
 #usr/include/linux/veth.h
 #usr/include/linux/vfio.h
+#usr/include/linux/vfio_ccw.h
 #usr/include/linux/vhost.h
 #usr/include/linux/videodev2.h
 #usr/include/linux/virtio_9p.h
@@ -698,12 +810,22 @@
 #usr/include/linux/virtio_blk.h
 #usr/include/linux/virtio_config.h
 #usr/include/linux/virtio_console.h
+#usr/include/linux/virtio_crypto.h
+#usr/include/linux/virtio_gpu.h
 #usr/include/linux/virtio_ids.h
+#usr/include/linux/virtio_input.h
+#usr/include/linux/virtio_mmio.h
 #usr/include/linux/virtio_net.h
 #usr/include/linux/virtio_pci.h
 #usr/include/linux/virtio_ring.h
 #usr/include/linux/virtio_rng.h
+#usr/include/linux/virtio_scsi.h
+#usr/include/linux/virtio_types.h
+#usr/include/linux/virtio_vsock.h
+#usr/include/linux/vm_sockets.h
+#usr/include/linux/vsockmon.h
 #usr/include/linux/vt.h
+#usr/include/linux/vtpm_proxy.h
 #usr/include/linux/wait.h
 #usr/include/linux/wanrouter.h
 #usr/include/linux/watchdog.h
@@ -714,8 +836,11 @@
 #usr/include/linux/x25.h
 #usr/include/linux/xattr.h
 #usr/include/linux/xfrm.h
+#usr/include/linux/xilinx-v4l2-controls.h
 #usr/include/linux/zorro.h
 #usr/include/linux/zorro_ids.h
+#usr/include/misc
+#usr/include/misc/cxl.h
 #usr/include/mtd
 #usr/include/mtd/inftl-user.h
 #usr/include/mtd/mtd-abi.h
@@ -723,13 +848,31 @@
 #usr/include/mtd/nftl-user.h
 #usr/include/mtd/ubi-user.h
 #usr/include/rdma
+#usr/include/rdma/bnxt_re-abi.h
+#usr/include/rdma/cxgb3-abi.h
+#usr/include/rdma/cxgb4-abi.h
+#usr/include/rdma/hfi
+#usr/include/rdma/hfi/hfi1_ioctl.h
+#usr/include/rdma/hfi/hfi1_user.h
+#usr/include/rdma/hns-abi.h
 #usr/include/rdma/ib_user_cm.h
+#usr/include/rdma/ib_user_ioctl_verbs.h
 #usr/include/rdma/ib_user_mad.h
 #usr/include/rdma/ib_user_sa.h
 #usr/include/rdma/ib_user_verbs.h
+#usr/include/rdma/mlx4-abi.h
+#usr/include/rdma/mlx5-abi.h
+#usr/include/rdma/mthca-abi.h
+#usr/include/rdma/nes-abi.h
+#usr/include/rdma/ocrdma-abi.h
+#usr/include/rdma/qedr-abi.h
 #usr/include/rdma/rdma_netlink.h
 #usr/include/rdma/rdma_user_cm.h
+#usr/include/rdma/rdma_user_ioctl.h
+#usr/include/rdma/rdma_user_rxe.h
+#usr/include/rdma/vmw_pvrdma-abi.h
 #usr/include/scsi
+#usr/include/scsi/cxlflash_ioctl.h
 #usr/include/scsi/fc
 #usr/include/scsi/fc/fc_els.h
 #usr/include/scsi/fc/fc_fs.h
@@ -740,6 +883,7 @@
 #usr/include/scsi/scsi_netlink_fc.h
 #usr/include/sound
 #usr/include/sound/asequencer.h
+#usr/include/sound/asoc.h
 #usr/include/sound/asound.h
 #usr/include/sound/asound_fm.h
 #usr/include/sound/compress_offload.h
@@ -750,7 +894,9 @@
 #usr/include/sound/hdspm.h
 #usr/include/sound/sb16_csp.h
 #usr/include/sound/sfnt_info.h
-#usr/include/uapi
+#usr/include/sound/snd_sst_tokens.h
+#usr/include/sound/tlv.h
+#usr/include/sound/usb_stream.h
 #usr/include/video
 #usr/include/video/edid.h
 #usr/include/video/sisfb.h

config/rootfiles/common/x86_64/linux-initrd

@@ -1 +1 @@
-#boot/initramfs-KVER-ipfire.img
+boot/initramfs-KVER-ipfire.img

config/rootfiles/common/xr819-firmware

@@ -0,0 +1,4 @@
+#lib/firmware/xr819
+lib/firmware/xr819/boot_xr819.bin
+lib/firmware/xr819/fw_xr819.bin
+lib/firmware/xr819/sdd_xr819.bin

config/rootfiles/common/xtables-addons

@@ -2,7 +2,7 @@ lib/xtables/libxt_ACCOUNT.so
 lib/xtables/libxt_CHAOS.so
 lib/xtables/libxt_DELUDE.so
 lib/xtables/libxt_DHCPMAC.so
-lib/xtables/libxt_DNETMAP.so
+#lib/xtables/libxt_DNETMAP.so
 lib/xtables/libxt_ECHO.so
 lib/xtables/libxt_IPMARK.so
 lib/xtables/libxt_LOGMARK.so

config/rootfiles/oldcore/120/update.sh

@@ -83,15 +83,15 @@ done
 /etc/init.d/apache restart
 /etc/init.d/unbound restart
 
+# Regenerate IPsec configuration
+sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi
+if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
+	/etc/init.d/ipsec restart
+fi
+
 # Remove deprecated SSH configuration option
 sed -e "/UsePrivilegeSeparation/d" -i /etc/ssh/sshd_config
 
-# Remove any pakfire keys stored in /
-rm -rfv /.gnupg
-
-# Move old pakfire keystore into new place
-mv -v /root/.gnupg /opt/pakfire/etc/.gnupg
-
 # Import new Pakfire key
 /etc/init.d/pakfire start
 

config/u-boot/boot.cmd

@@ -0,0 +1,66 @@
+if test ${boot_dev} = ""; then
+	setenv boot_dev mmc;
+	setenv root_dev /dev/mmcblk0p3;
+fi;
+
+if test ${boot_part} = ""; then
+	setenv boot_part 0:1;
+fi;
+
+if test ${soc} = "kirkwood"; then
+	setenv kernel_type kirkwood;
+else
+	setenv kernel_type multi;
+fi;
+
+# Import uEnv txt...
+if fatload ${boot_dev} ${boot_part} ${kernel_addr_r} uEnv.txt; then
+	echo Load uEnv.txt...;
+	env import -t ${kernel_addr_r} ${filesize};
+	if test "${uenvcmd}" = ""; then
+		echo ...;
+	else
+		echo Boot with uEnv.txt...;
+		run uenvcmd;
+	fi;
+fi;
+
+# for compatiblity reasons set DTBSUNXI if we run on sunxi
+if test "${board}" = "sunxi"; then
+	setenv fdtfile ${DTBSUNXI};
+fi;
+
+# Check if serial console is enabled
+if test "${SERIAL-CONSOLE}" = "ON"; then
+	if test ${console} = ""; then
+		if test "${board}" = "rpi"; then
+			if test "${fdtfile}" = "bcm2837-rpi-3-b.dtb"; then
+				setenv console ttyS1,115200n8;
+			else
+				setenv console ttyAMA0,115200n8;
+			fi;
+		else
+			setenv console ttyS0,115200n8;
+		fi;
+	fi
+	echo Set console to ${console};
+	setenv bootargs console=${console} root=${root_dev} rootwait;
+else
+	echo Set console to tty1 ;
+	setenv bootargs console=tty1 root=${root_dev} rootwait;
+fi;
+
+setenv fdt_high ffffffff;
+fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER}-ipfire-${kernel_type};
+fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}-ipfire-${kernel_type}/${fdtfile};
+setenv ramdisk_addr ${ramdisk_addr_r}
+if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}-ipfire-${kernel_type}; then
+	echo Ramdisk loaded...;
+else
+	echo Ramdisk not loaded...;
+	setenv ramdisk_addr -;
+fi ;
+bootz ${kernel_addr_r} ${ramdisk_addr} ${fdt_addr_r};
+
+# Recompile with:
+# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr 

config/u-boot/boot.mk

@@ -0,0 +1,2 @@
+#!/bin/bash
+mkimage -C none -A arm -T script -d boot.cmd boot.scr 

config/u-boot/uEnv.txt

@@ -1,5 +1,3 @@
 KVER=xxxKVERxxx
-DTBSUNXI=sun7i-a20-bananapi.dtb
-uenvcmd=if test "$board" = "panda" ;then run bootpanda; else run bootsunxi; fi;
-bootpanda=setenv initrd_high 90000000; fatload mmc 0:1 0x82000000 zImage-ipfire-multi; fatload mmc 0:1 ${fdtaddr} dtb-${KVER}-ipfire-multi/${fdtfile};                                                 setenv bootargs video=800x600 console=tty1 rootwait smsc95xx.macaddr=$usbethaddr root=/dev/mmcblk0p3; bootz 0x82000000 - ${fdtaddr};
-bootsunxi=setenv fdt_high ffffffff;    fatload mmc 0:1 0x46000000 zImage-ipfire-multi; fatload mmc 0:1 0x49000000 dtb-${KVER}-ipfire-multi/${DTBSUNXI}; fatload mmc 0:1 0x49100000 uInit-ipfire-multi; setenv bootargs console=ttyS0,115200n8 rootwait root=/dev/mmcblk0p3 rootwait;                         bootz 0x46000000 0x49100000 0x49000000;
+DTBSUNXI=sun8i-h2-plus-ipfire-nano.dtb
+SERIAL-CONSOLE=ON

config/xtables-addons/mconfig

@@ -4,7 +4,7 @@ build_ACCOUNT=m
 build_CHAOS=m
 build_DELUDE=m
 build_DHCPMAC=m
-build_DNETMAP=m
+# build_DNETMAP=m
 build_ECHO=m
 build_IPMARK=m
 build_LOGMARK=m

lfs/acpid

@@ -31,7 +31,6 @@ DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-SUP_ARCH   = x86_64 i586
 
 ###############################################################################
 # Top-level Rules

lfs/crda

@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.13
+VER        = 3.18
 
 THISAPP    = crda-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 66b1b0417c1ad19f0009a5c0c0c1aebc
+$(DL_FILE)_MD5 = 0431fef3067bf503dfb464069f06163a
 
 install : $(TARGET)
 

lfs/dhcpcd

@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2015  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2017  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 6.7.1
+VER        = 6.11.5
 
 THISAPP    = dhcpcd-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ffb716b0e9327968e7200d519e1d4c0d
+$(DL_FILE)_MD5 = 2465624b62c1154f0e89dc69c42c849b
 
 install : $(TARGET)
 
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix="" --sysconfdir=/var/ipfire/dhcpc \
 			--dbdir=/var/ipfire/dhcpc \
 			--libexecdir=/var/ipfire/dhcpc \
@@ -77,6 +77,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 
+	rm -rf /usr/share/dhcpcd
+
 	ln -sf /etc/rc.d/init.d/networking/dhcpcd.exe \
 		$(CONFIG_ROOT)/dhcpc/dhcpcd-hooks/70-dhcpcd.exe
 	rm -f $(CONFIG_ROOT)/dhcpc/dhcpcd-hooks/20-resolv.conf

lfs/flash-images

@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2017  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -33,11 +33,7 @@ DEVICE     = $(shell losetup -f)
 PART_BOOT  = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p1
 PART_ROOT  = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p3
 
-ifeq "$(SCON)" "1"
-	IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).1gb-ext4-scon.$(BUILD_ARCH)-full-core$(CORE).img.gz
-else
-	IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).1gb-ext4.$(BUILD_ARCH)-full-core$(CORE).img.gz
-endif
+IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).2gb-ext4.$(BUILD_ARCH)-full-core$(CORE).img.gz
 
 FSTAB_FMT = UUID=%s %-8s %-4s %-10s %d %d\n
 
@@ -74,10 +70,10 @@ else
  PART_TYPE = L
 endif
 
-# /boot:  64MB - OFFSET
-# /    : 850MB
-S_BOOT := $(shell echo $$(( 131072 - $(S_OFFSET) )))
-S_ROOT := 1740800
+# /boot:  100MB - OFFSET
+# /    : 1200 MB
+S_BOOT := $(shell echo $$(( 204800 - $(S_OFFSET) )))
+S_ROOT := 2477600
 
 PADDING = 100 # MB
 
@@ -121,15 +117,6 @@ endif
 ifeq "$(BUILD_PLATFORM)" "arm"
 	cp -v /boot/MLO $(MNThdd)/boot/
 	cp -v /boot/u-boot.img $(MNThdd)/boot/
-	cp -v /boot/zImage-ipfire-multi $(MNThdd)/boot/
-	cp -v /boot/uInit-ipfire-multi $(MNThdd)/boot/
-	cp -v /boot/uImage-ipfire-kirkwood $(MNThdd)/boot/
-	cp -v /boot/uInit-ipfire-kirkwood $(MNThdd)/boot/
-	cp -v /boot/uEnv.txt $(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
@@ -145,22 +132,6 @@ endif
 	echo "HOSTNAME=$(SNAME)" >> $(MNThdd)/var/ipfire/main/settings
 	echo "THEME=ipfire" >> $(MNThdd)/var/ipfire/main/settings
 
-ifeq "$(SCON)" "1"
-	# Enable serial console
-	sed -i -e "s|1:2345:respawn:|#1:2345:respawn:|g" $(MNThdd)/etc/inittab
-	sed -i -e "s|2:2345:respawn:|#2:2345:respawn:|g" $(MNThdd)/etc/inittab
-	sed -i -e "s|3:2345:respawn:|#3:2345:respawn:|g" $(MNThdd)/etc/inittab
-	sed -i -e "s|4:2345:respawn:|#4:2345:respawn:|g" $(MNThdd)/etc/inittab
-	sed -i -e "s|5:2345:respawn:|#5:2345:respawn:|g" $(MNThdd)/etc/inittab
-	sed -i -e "s|6:2345:respawn:|#6:2345:respawn:|g" $(MNThdd)/etc/inittab
-	sed -i -e "s|#7:2345:respawn:|7:2345:respawn:|g" $(MNThdd)/etc/inittab
-
-ifeq "$(BUILD_PLATFORM)" "arm"
-	sed -i -e "s| console=tty1 | console=ttyAMA0,115200n8 |g" $(MNThdd)/boot/cmdline.txt
-	sed -i -e "s| console=tty1 | console=ttyO2,115200n8 |g" $(MNThdd)/boot/uEnv.txt
-endif
-endif
-
 	-touch $(MNThdd)/lib/modules/$(KVER)-ipfire/modules.dep
 	mkdir $(MNThdd)/proc
 	mount --bind /proc $(MNThdd)/proc
@@ -176,13 +147,17 @@ endif
 		"auto" "defaults" 1 1 >> $(MNThdd)/etc/fstab
 
 ifeq "$(BOOTLOADER)" "grub"
-ifeq "$(SCON)" "1"
-	# Enable serial console on GRUB
-	echo "GRUB_TERMINAL=\"serial\"" >> $(MNThdd)/etc/default/grub
-	echo "GRUB_SERIAL_COMMAND=\"serial --unit=0 --speed=115200\"" >> $(MNThdd)/etc/default/grub
+	# backup defaults file
+	cp $(MNThdd)/etc/default/grub $(MNThdd)/etc/default/grub.backup
 
-	sed -i -e "s|panic=10|& console=ttyS0,115200n8|g" $(MNThdd)/etc/default/grub
-endif
+	# Enable also serial console on GRUB
+	echo "GRUB_TERMINAL=\"serial console\"" >> $(MNThdd)/etc/default/grub
+	echo "GRUB_SERIAL_COMMAND=\"serial --unit=0 --speed=115200\"" >> $(MNThdd)/etc/default/grub
+	echo "GRUB_TIMEOUT=-1" >> $(MNThdd)/etc/default/grub
+
+	# Add additional entry for Serial console
+	cp $(DIR_SRC)/config/flash-images/grub/11_linux_scon \
+			$(MNThdd)/etc/grub.d/
 
 	# Create configuration
 	mkdir -pv $(MNThdd)/boot/grub
@@ -196,6 +171,10 @@ endif
 	# Install GRUB
 	grub-install --force --recheck --no-floppy --target=i386-pc \
 		--root-directory=$(MNThdd) $(DEVICE)
+
+	# restore orginal defaults
+	mv -f $(MNThdd)/etc/default/grub.backup $(MNThdd)/etc/default/grub
+	rm -f $(MNThdd)/etc/grub.d/11_linux_scon
 endif
 
 	# Set ramdisk mode to automatic
@@ -230,8 +209,8 @@ endif
 	dd if=/dev/zero bs=1M count=$(PADDING) >> $(IMG)
 
 ifeq "$(BUILD_PLATFORM)" "arm"
-	# Install u-boot for LeMaker Banana Pi into image 8KB
-	dd if=/usr/share/u-boot/banana_pi/u-boot-sunxi-with-spl.bin of=$(IMG) bs=1K seek=8 conv=notrunc
+	# Install u-boot for Orangepi Zero/Nanopi DUO into image 8KB
+	dd if=/usr/share/u-boot/orangepi_zero/u-boot-sunxi-with-spl.bin of=$(IMG) bs=1K seek=8 conv=notrunc
 endif
 
 	# Compress Image

lfs/flex

@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2016 IPFire Team  <info@ipfire.org>                      #
+# Copyright (C) 2007-2018 IPFire Team  <info@ipfire.org>                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -35,6 +35,10 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
+  EXTRA_CONFIG = --prefix=/usr --disable-nls
+  EXTRA_MAKE = 
+  EXTRA_INSTALL = 
+
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
 endif

lfs/grub

@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2015  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.00
+VER        = 2.02
 
 THISAPP    = grub-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -46,7 +46,7 @@ objects = $(DL_FILE) \
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 unifont-7.0.03.pcf.gz = $(DL_FROM)/unifont-7.0.03.pcf.gz
 
-$(DL_FILE)_MD5 = a1043102fbc7bcedbf53e7ee3d17ab91
+$(DL_FILE)_MD5 = 8a4a2a95aac551fb0fba860ceabfa1d3
 unifont-7.0.03.pcf.gz_MD5 = f6903ac8c1caeeb30c1e9a2975028401
 
 install : $(TARGET)
@@ -77,10 +77,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-2.00_disable_vga_fallback.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub2-remove-gets.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-2.00_ignore_missing_symtab.patch
+
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-2.02_disable_vga_fallback.patch
+
 	cd $(DIR_APP) && \
 		./configure \
 			--prefix=/usr \

lfs/initscripts

@@ -196,15 +196,13 @@ $(TARGET) :
 		ln -sf any /etc/rc.d/init.d/networking/$$i; \
 	done
 
-	# ARM does not need acpid, intel no swconfig
+	# intel intel no swconfig
 ifeq "$(BUILD_PLATFORM)" "arm"
-	rm -vf /etc/rc.d/init.d/acpid
 	ln -sf ../init.d/swconfig    /etc/rc.d/rcsysinit.d/S73swconfig
 else
 	rm -vf /etc/rc.d/init.d/swconfig
+endif
 	ln -sf ../init.d/acpid       /etc/rc.d/rc3.d/S12acpid
 	ln -sf ../init.d/acpid       /etc/rc.d/rc0.d/K87acpid
 	ln -sf ../init.d/acpid       /etc/rc.d/rc6.d/K87acpid
-endif
-
 	@$(POSTBUILD)

lfs/iw

@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.14
+VER        = 4.14
 
 THISAPP    = iw-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 66e41053f6fc0781b683b5b688442de6
+$(DL_FILE)_MD5 = 9e6bb70ae4f19283e921fc59c6079556
 
 install : $(TARGET)
 

lfs/linux

@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2017  IPFire Team <info@ipfire.org>                      #
+# Copyright (C) 2007-2018  IPFire Team <info@ipfire.org>                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,11 +24,8 @@
 
 include Config
 
-VER         = 3.14.79
-RPI_PATCHES = 3.14.79-grsec-ipfire1
-A7M_PATCHES = 3.14.79-grsec-ipfire1
-GRS_PATCHES = grsecurity-3.1ipfire-3.14.79-v1.patch.xz
-
+VER         = 4.14.39
+ARM_PATCHES = 4.14.39-ipfire0
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -65,31 +62,21 @@ endif
 ifeq "$(KCFG)" ""
 LASTKERNEL=1
 endif
-ifeq "$(KCFG)" "-kirkwood"
+ifeq "$(KCFG)" "-multi"
 LASTKERNEL=1
 endif
 
-# The buildsystem does not correctly detect if our compiler supports plugins
-export DISABLE_PAX_PLUGINS=y
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 objects =$(DL_FILE) \
-	rpi-patches-$(RPI_PATCHES).patch.xz \
-	arm7-multi-patches-$(A7M_PATCHES).patch.xz \
-	$(GRS_PATCHES)
-
+	arm-multi-patches-$(ARM_PATCHES).patch.xz
 
 $(DL_FILE)					= $(URL_IPFIRE)/$(DL_FILE)
-rpi-patches-$(RPI_PATCHES).patch.xz		= $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
-arm7-multi-patches-$(A7M_PATCHES).patch.xz	= $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz
-$(GRS_PATCHES)					= $(URL_IPFIRE)/$(GRS_PATCHES)
+arm-multi-patches-$(ARM_PATCHES).patch.xz	= $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
 
-$(DL_FILE)_MD5					= ec5b09d8ad2ebf92e6f51a727a338559
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5		= a02a7fd54c642c1e3578a00ed22f54f8
-arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5	= 6c3b11e51caa278dbeacd1e23c2b171b
-$(GRS_PATCHES)_MD5				= 7fe448b53558082395f68c5db94af1a7
+$(DL_FILE)_MD5					= cbb2a17f13f12e4dfe1ed20a23d53ef4
+arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5	= ae7091bb79bad05c8394c8bacc48dd60
 
 install : $(TARGET)
 
@@ -125,122 +112,44 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	ln -svf linux-$(VER) $(DIR_SRC)/linux
 
 	# Linux Intermediate Queueing Device
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-imq.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14-imq.diff
 
 	# Layer7-patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14-layer7-filter.patch
-
-ifneq "$(KCFG)" "-headers"
-	# Grsecurity-patches
-	cd $(DIR_APP) && xz -c -d $(DIR_DL)/$(GRS_PATCHES) | patch -Np1
-	cd $(DIR_APP) && rm localversion-grsec
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.7-disable-compat_vdso.patch
-endif
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14-layer7.patch
 
 	# DVB Patches
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-dvbsky.patch
 	cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pll.patch
 
 	# Wlan Patches
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-drivers-3.8.3-ath_ignore_eeprom_regdomain.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-iwlwifi-noibss_only_on_radar_chan.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.37-rt2800usb_add_dlink_dwa137_usbid.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.55-rt2800usb-change_queue_warn_to_debug.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.25_rt2x00_fix_bss_bcn_num.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.25-rt5592_no_special_txop_init.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.39-add_libertas_uap.patch
-
-	# mISDN Patches
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mISDN_hfc-s_add_id.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-hfcusb-reportl1down.patch
+#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/backports-4.2.6-1_ath10k_remove_logspam.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8-ath_ignore_eeprom_regd.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8-iwlwifi-noibss_only_on_radar_chan.patch
+#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8-rt2x00usb_suppress_queue_warnings.patch
+#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.39-add_libertas_uap.patch
 
 	# Add LED trigger
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-ledtrig_netdev.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.16-ledtrig_netdev.patch
+
+	# Fix igb and e1000e crash
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14.1-igb-e1000e_fix_lock_at_update_stats.patch
 
 	# cs5535audio spams syslog if no ac97 was present (geos router)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.30_cs5535audio_fix_logspam_on_geos.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8_cs5535audio_fix_logspam_on_geos.patch
 
 	# Add PC Engines APU led support
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14-apu_leds.patch
-
-	# Add APU2 SoC ID to k10temp
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.65-k10temp_add_16H_M30H_id.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8-apu_leds.patch
 
 	# Fix uevent PHYSDEVDRIVER
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.33_ipg-fix-driver-name.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs7830-fix-driver-name.patch
-
-	# r8169 L23 patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.32-r8169_disable_L23.patch
-
-	# update the queued trim blacklist from kernel 4.2rc1
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.43_new_qtrim_blacklist.patch
-
-	# remove eMMC EXT_CSD revision check to use newer eMMC modules
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.79_mmc_remove_EXT_CSD_revision_check.patch
-
-	# Hyper-V patches
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0001-Drivers-net-hyperv-Get-rid-of-the-rndis_filter_packe.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0002-Drivers-net-hyperv-Cleanup-the-receive-path.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0003-Drivers-net-hyperv-Cleanup-the-netvsc-receive-callba.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0004-hyperv-Add-latest-NetVSP-versions-to-auto-negotiatio.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0005-Drivers-net-hyperv-Enable-scatter-gather-I-O.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0006-Drivers-net-hyperv-Cleanup-the-send-path.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0007-Drivers-net-hyperv-Enable-offloads-on-the-host.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0008-Drivers-net-hyperv-Enable-receive-side-IP-checksum-o.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0009-Drivers-net-hyperv-Enable-send-side-checksum-offload.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0010-Drivers-net-hyperv-Enable-large-send-offload.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0011-hyperv-Change-the-receive-buffer-size-for-legacy-hos.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0012-Drivers-net-hyperv-Allocate-memory-for-all-possible-.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0013-Drivers-net-hyperv-Negotiate-suitable-ndis-version-f.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0014-Drivers-net-hyperv-Address-UDP-checksum-issues.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0015-hyperv-Properly-handle-checksum-offload.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0016-hyperv-Add-support-for-virtual-Receive-Side-Scaling-.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0017-hyperv-Remove-recv_pkt_list-and-lock.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0018-hyperv-Simplify-the-send_completion-variables.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0019-hyperv-Enable-sendbuf-mechanism-on-the-send-path.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0020-Add-support-for-netvsc-build-without-CONFIG_SYSFS-fl.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0021-hyperv-Add-hash-value-into-RNDIS-Per-packet-info.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0022-hyperv-fix-apparent-cut-n-paste-error-in-send-path-t.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0023-hyperv-Fix-error-return-code-in-netvsc_init_buf.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0024-hyperv-Fix-a-bug-in-netvsc_send.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0025-Drivers-hv-vmbus-Support-per-channel-driver-state.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-hyperv_Mark_the_Hyoer-V_TSC_as_unstable.patch
-
-ifneq "$(KCFG)" "-headers"
-	# fix AES-NI 192 and 256 bits / grsec is needed for this patch version
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0100-crypto-aesni-Add-support-for-192-256-bit-keys-to-AES.patch
-endif
-
-	# fix CVE-2016-5195 (Dirty COW)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0110-mm-remove-gup_flags-FOLL_WRITE-games-from-__get_user.patch
-
-	# fix empty symbol crc's
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-genksyms_fix_typeof_handling.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-2.6.32.27_mcs7830-fix-driver-name.patch
 
 ifeq "$(KCFG)" "-kirkwood"
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.10-mv_cesa_disable_failing_hmac_sha1.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-kirkwood_legacy_boot.patch
+#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.10-mv_cesa_disable_failing_hmac_sha1.patch
 endif
 
 ifeq "$(KCFG)" "-multi"
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10-smsc95xx-add_mac_addr_param.patch
-
-	# Apply Arm7-multiarch kernel patches.
-	cd $(DIR_APP) && xzcat $(DIR_DL)/arm7-multi-patches-$(A7M_PATCHES).patch.xz | patch -Np1
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/arm-multi-grsec-compile-fixes.patch
-
-	# Install switch api userspace header
-	cd $(DIR_APP) && install -v -m644 include/uapi/linux/switch.h /usr/include/linux/
-
+	# Apply Arm-multiarch kernel patches.
+	cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1
 endif
-
-ifeq "$(KCFG)" "-rpi"
-	# Apply Raspberry Pi kernel patches.
-	cd $(DIR_APP) && xzcat $(DIR_DL)/rpi-patches-$(RPI_PATCHES).patch.xz | patch -Np1
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-3.14.79-rpi-suspend-not-inline.patch
-endif
-
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-3.14.79-amba-fix.patch
 
 ifeq "$(KCFG)" "-headers"
@@ -262,30 +171,22 @@ else
 	cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ -$(VERSUFIX)/' Makefile
 
 ifeq "$(KCFG)" "-kirkwood"
-	cd $(DIR_APP) && make $(MAKETUNING) uImage modules
-	cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
-	cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/uImage-$(VERSUFIX)
+	cd $(DIR_APP) && make $(MAKETUNING) zImage modules
+	cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
+#	cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/uImage-$(VERSUFIX)
 else
 ifeq "$(KCFG)" "-multi"
 	cd $(DIR_APP) && make $(MAKETUNING) zImage modules
 	cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
-	cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/zImage-$(VERSUFIX)
-else
-ifeq "$(KCFG)" "-rpi"
-	cd $(DIR_APP) && make $(MAKETUNING) zImage modules
-	cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
-	cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/kernel.img
 else
 	cd $(DIR_APP) && make $(MAKETUNING) bzImage modules
 	cd $(DIR_APP) && cp -v arch/$(KERNEL_ARCH)/boot/bzImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
 endif
-endif
 endif
 
 	cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-$(VERSUFIX)
 	cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-$(VERSUFIX)
 	cd $(DIR_APP) && make $(MAKETUNING) modules_install
-	cd $(DIR_APP) && make $(MAKETUNING) firmware_install
 
 ifeq "$(BUILD_PLATFORM)" "arm"
 	cd $(DIR_APP) && make $(MAKETUNING) dtbs
@@ -299,24 +200,19 @@ ifeq "$(LASTKERNEL)" "1"
 	# Only do this once
 	cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/
 
-	# Blacklist matroxfb_base
-	echo "blacklist matroxfb_base" >> /etc/modprobe.d/framebuffer.conf
+	# disable drm by install drm to /bin/false because i915 ignore blacklisting
+	echo install drm /bin/false > /etc/modprobe.d/framebuffer.conf
+
 	# Blacklist old framebuffer modules
-	for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/video -name *fb.ko); do \
+	for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/video/fbdev/ -name *.ko); do \
 		echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer.conf ; \
 	done
 	# Blacklist new drm framebuffer modules
-	for f in $$(ls -1 /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/gpu/drm/*/*.ko); do \
+	for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/gpu/drm -name *.ko); do \
 		echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer.conf ; \
-	done
+	done	
 	sed -i -e "s|.ko||g" /etc/modprobe.d/framebuffer.conf
 
-	# Blacklist isdn modules
-	for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn -name *.ko); do \
-		echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/isdn.conf ; \
-	done
-	sed -i -e "s|.ko||g" /etc/modprobe.d/isdn.conf
-
 	# Disable ipv6 at runtime
 	echo "options ipv6 disable_ipv6=1" > /etc/modprobe.d/ipv6.conf
 endif

lfs/linux-firmware

@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2015  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2017  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 78535e8
+VER        = 5d98692
 
 THISAPP    = linux-firmware-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a4cafb924fbcaeb34d1b464be0e4d089
+$(DL_FILE)_MD5 = a9e561b3070508614fdaf3386aaa6745
 
 install : $(TARGET)
 

lfs/linux-initrd

@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2014  IPFire Team <info@ipfire.org>                      #
+# Copyright (C) 2007-2018  IPFire Team <info@ipfire.org>                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -65,11 +65,14 @@ ifneq "$(KCFG)" "-pae"
 	dracut --force --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)
+#	cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(VERSUFIX)
+	cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(KVER)-$(VERSUFIX)
+	cd /boot && rm initramfs-$(KVER)-$(VERSUFIX).img
 endif
 
 ifeq "$(KCFG)" "-multi"
-	cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(VERSUFIX)
+	cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(KVER)-$(VERSUFIX)
+	cd /boot && rm initramfs-$(KVER)-$(VERSUFIX).img
 endif
 
 endif

lfs/mt7601u-firmware

@@ -1,72 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2017  IPFire Team  <info@ipfire.org>                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 20160319
-
-THISAPP    = mt7601u-firmware-$(VER)
-DL_FILE    = $(THISAPP).tar.xz
-DL_FROM    = $(URL_IPFIRE)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 3bfc6e63ceac64521f1de40ae93613d4
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-	@$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@cd /lib/firmware && tar axf $(DIR_DL)/$(DL_FILE)
-	@$(POSTBUILD)

lfs/net-tools

@@ -72,6 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/net-tools-1.60-no-hostname.patch
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-gcc34-3.patch
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-kernel_headers-3.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-iphdr-redef.patch
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-mii_ioctl-1.patch
 	cd $(DIR_APP) && yes "" | make config
 	cd $(DIR_APP) && sed -i	-e 's|HAVE_IP_TOOLS 0|HAVE_IP_TOOLS 1|g' \

lfs/ppp

@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2014   IPFire Team   <info@ipfire.org>                   #
+# Copyright (C) 2007-2017   IPFire Team   <info@ipfire.org>                   #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -78,6 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/0013-everywhere-O_CLOEXEC-harder.patch
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/ppp-2.4.6-increase-max-padi-attempts.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/ppp-2.4.7-headers_4.9.patch
 	cd $(DIR_APP) && sed -i -e "s+/etc/ppp/connect-errors+/var/log/connect-errors+" pppd/pathnames.h
 	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
 	cd $(DIR_APP) && make $(MAKETUNING) CC="gcc" RPM_OPT_FLAGS="$(CFLAGS)"

lfs/rpi-firmware

@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2014  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = cd50136
+VER        = 20180316
 THISAPP    = rpi-firmware-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = fced022c0e646affae0d5d5543f59054
+$(DL_FILE)_MD5 = e09ff543280f6138d12ea334d550fbd6
 
 install : $(TARGET)
 

lfs/u-boot

@@ -24,13 +24,13 @@
 
 include Config
 
-VER        = 2014.04
+VER        = 2018.03
 
 THISAPP    = u-boot-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)-$(MKIMAGE)
 SUP_ARCH   = armv5tel
 
 ###############################################################################
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6d2116d1385a66e9a59742caa9d62a54
+$(DL_FILE)_MD5 = 02922bdf0ee003fe25bfc32749ffdeab
 
 install : $(TARGET)
 
@@ -75,15 +75,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/U-Boot-v2-fs-fat-read-fix-fat16-ls-read-issue.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot-support-gcc-6.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot-c99-inline-fix.patch
-
-	cd $(DIR_APP)/include/linux && ln -s compiler-gcc6.h compiler-gcc7.h
-
+ifneq "$(MKIMAGE)" "1"
 	# Pandaboard
 	-mkdir -pv /usr/share/u-boot/pandaboard
 	cd $(DIR_APP) && make CROSS_COMPILE="" omap4_panda_config
+	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" Pandaboard - IPFire.org"!' .config
 	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
 	cd $(DIR_APP) && install -v -m 644 MLO u-boot.img \
 		/usr/share/u-boot/pandaboard
@@ -91,49 +87,93 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && install MLO /boot/
 	cd $(DIR_APP) && install u-boot.img /boot/
 	cd $(DIR_APP) && make distclean
+	
 
-	# Wandboard Quad
-	-mkdir -pv /usr/share/u-boot/wandboard_quad
-	cd $(DIR_APP) && make CROSS_COMPILE="" wandboard_quad_config
+	# Wandboard
+	-mkdir -pv /usr/share/u-boot/wandboard
+	cd $(DIR_APP) && make CROSS_COMPILE="" wandboard_config
+	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" Wandboard - IPFire.org"!' .config
 	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
+	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" u-boot.imx
 	cd $(DIR_APP) && install -v -m 644 u-boot.imx \
-		/usr/share/u-boot/wandboard_quad
+		/usr/share/u-boot/wandboard
 	cd $(DIR_APP) && make distclean
 
-	# Wandboard Dual
-	-mkdir -pv /usr/share/u-boot/wandboard_dl
-	cd $(DIR_APP) && make CROSS_COMPILE="" wandboard_dl_config
+	# Raspberry Pi
+	-mkdir -pv /usr/share/u-boot/rpi
+	cd $(DIR_APP) && make CROSS_COMPILE="" rpi_config
+	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" RPi1 - IPFire.org"!' .config
 	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
-	cd $(DIR_APP) && install -v -m 644 u-boot.imx \
-		/usr/share/u-boot/wandboard_dl
+	cd $(DIR_APP) && install -v -m 644 u-boot.bin \
+		/usr/share/u-boot/rpi/kernel.img
+	# Install rpi u-boot as default rpi kernel
+	cd $(DIR_APP) && install u-boot.bin /boot/kernel.img
 	cd $(DIR_APP) && make distclean
 
-	# Wandboard Solo
-	-mkdir -pv /usr/share/u-boot/wandboard_solo
-	cd $(DIR_APP) && make CROSS_COMPILE="" wandboard_solo_config
+	# Raspberry Pi 2
+	-mkdir -pv /usr/share/u-boot/rpi2
+	cd $(DIR_APP) && make CROSS_COMPILE="" rpi_2_config
+	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" RPi2 - IPFire.org"!' .config
 	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
-	cd $(DIR_APP) && install -v -m 644 u-boot.imx \
-		/usr/share/u-boot/wandboard_solo
+	cd $(DIR_APP) && install -v -m 644 u-boot.bin \
+		/usr/share/u-boot/rpi2/kernel7.img
+	# Install rpi2 u-boot as default rpi kernel7
+	cd $(DIR_APP) && install u-boot.bin /boot/kernel7.img
+	cd $(DIR_APP) && make distclean
+
+	# Raspberry Pi 3
+	-mkdir -pv /usr/share/u-boot/rpi3
+	cd $(DIR_APP) && make CROSS_COMPILE="" rpi_3_32b_config
+	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" RPi3 - IPFire.org"!' .config
+	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
+	cd $(DIR_APP) && install -v -m 644 u-boot.bin \
+		/usr/share/u-boot/rpi3/kernel8-32.img
+	# Install rpi2 u-boot as default rpi kernel8-32
+	cd $(DIR_APP) && install u-boot.bin /boot/kernel8-32.img
+	cd $(DIR_APP) && make distclean
+
+	# Orange Pi Zero
+	-mkdir -pv /usr/share/u-boot/orangepi_zero
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/sunxi/orangepi-zero-add-macs.diff
+	cd $(DIR_APP) && make CROSS_COMPILE="" orangepi_zero_config
+	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" OrangePi Zero/IPFire Nano - IPFire.org"!' .config
+	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
+	cd $(DIR_APP) && install -v -m 644 u-boot-sunxi-with-spl.bin \
+		/usr/share/u-boot/orangepi_zero
+	cd $(DIR_APP) && make distclean
+
+	# Orange Pi PC
+	-mkdir -pv /usr/share/u-boot/orangepi_pc
+	cd $(DIR_APP) && make CROSS_COMPILE="" orangepi_pc_config
+	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" OrangePi PC - IPFire.org"!' .config
+	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
+	cd $(DIR_APP) && install -v -m 644 u-boot-sunxi-with-spl.bin \
+		/usr/share/u-boot/orangepi_pc
 	cd $(DIR_APP) && make distclean
 
 	# LeMaker Banana Pi
 	-mkdir -pv /usr/share/u-boot/banana_pi
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/sunxi/001-uboot-sunxi-509d96d4f1f602d62d36db660973249e16f9d088.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/sunxi/002-uboot-jwrdegoede-psci-support.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/sunxi/003-uboot-fix-gmac-not-working-reliable-on-bananapi.patch
 	cd $(DIR_APP) && make CROSS_COMPILE="" Bananapi_config
+	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" BananaPi - IPFire.org"!' .config
 	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
 	cd $(DIR_APP) && install -v -m 644 u-boot-sunxi-with-spl.bin \
 		/usr/share/u-boot/banana_pi
+	cd $(DIR_APP) && make distclean
 
-	# mkimage
-	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" tools
-	cd $(DIR_APP) && install -v -m 755 tools/mkimage /usr/bin
-
-	# config (uEnv.txt)
+	# create an empty 128 KB File for the u-boot env
+	dd if=/dev/zero of=/boot/uboot.env bs=1K count=128
+	
+	# config (uEnv.txt and boot.*)
 	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
 
+else
+	# mkimage
+	cd $(DIR_APP) && make CROSS_COMPILE="" omap4_panda_config
+	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" tools
+	cd $(DIR_APP) && install -v -m 755 tools/mkimage /usr/bin
+endif
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)

lfs/u-boot-kirkwood

@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2015  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,13 +24,13 @@
 
 include Config
 
-VER        = 001
+VER        = 2018.03
 
-THISAPP    = swconfig-$(VER)
-DL_FILE    = $(THISAPP).tar.xz
+THISAPP    = u-boot-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)-kirkwood
 SUP_ARCH   = armv5tel
 
 ###############################################################################
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c35919a05fc82b3f8b311da8dfc2cd3e
+$(DL_FILE)_MD5 = 02922bdf0ee003fe25bfc32749ffdeab
 
 install : $(TARGET)
 
@@ -64,6 +64,9 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) :
 $(subst %,%_MD5,$(objects)) :
 	@$(MD5)
 
+dist: 
+	@$(PAK)
+
 ###############################################################################
 # Installation Details
 ###############################################################################
@@ -71,7 +74,42 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && install -v -m755 swconfig /usr/bin/
+
+	# Dreamplug
+	-mkdir -pv /usr/share/u-boot/dreamplug
+	cd $(DIR_APP) && make CROSS_COMPILE="" dreamplug_config
+	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" Globalscale Dreamplug - IPFire.org"!' .config
+	cd $(DIR_APP) && sed -i -e 's!^# CONFIG_CMD_BOOTZ is not set!CONFIG_CMD_BOOTZ=y!' .config
+	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
+	cd $(DIR_APP) && install -v -m 644 u-boot.kwb \
+		/usr/share/u-boot/dreamplug
+	cd $(DIR_APP) && make distclean
+
+	# ICY-Box 6x20
+	-mkdir -pv /usr/share/u-boot/icybox
+	cd $(DIR_APP) && make CROSS_COMPILE="" ib62x0_config
+	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" Raidsonic ICY-Box 62x0 - IPFire.org"!' .config
+	cd $(DIR_APP) && sed -i -e 's!^# CONFIG_CMD_BOOTZ is not set!CONFIG_CMD_BOOTZ=y!' .config
+	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
+	cd $(DIR_APP) && install -v -m 644 u-boot.kwb \
+		/usr/share/u-boot/icybox
+	cd $(DIR_APP) && make distclean
+
+	# Iomega Iconnect
+	-mkdir -pv /usr/share/u-boot/iconnect
+	# Fix crash at env save because this uboot is larger than 512KB
+	cd $(DIR_APP) && echo "#undef CONFIG_ENV_OFFSET" >> include/configs/iconnect.h
+	cd $(DIR_APP) && echo "#define CONFIG_ENV_OFFSET 0xC0000" >> include/configs/iconnect.h
+	cd $(DIR_APP) && make CROSS_COMPILE="" iconnect_config
+	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" Iomega iConnect - IPFire.org"!' .config
+	cd $(DIR_APP) && sed -i -e 's!^# CONFIG_CMD_BOOTZ is not set!CONFIG_CMD_BOOTZ=y!' .config
+	cd $(DIR_APP) && sed -i -e 's!^# CONFIG_HUSH_PARSER is not set!CONFIG_HUSH_PARSER=y!' .config
+	cd $(DIR_APP) && sed -i -e 's!^CONFIG_MTDPARTS_DEFAULT=.*!CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xC0000@0x0(uboot),0x40000@0xC0000(uboot_env),-@0x100000(rootfs)"!' .config
+	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
+	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" u-boot.kwb
+	cd $(DIR_APP) && install -v -m 644 u-boot.kwb \
+		/usr/share/u-boot/iconnect
+	cd $(DIR_APP) && make distclean
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)

lfs/udev

@@ -76,6 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && tar axf $(DIR_DL)/udev-lfs-$(VER)-1.tar.bz2
 
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-208_remove_systemd_log.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-208-fix_uint8_t.patch
 
 	rm -rf /lib/udev/devices
 	install -dv /lib/firmware

lfs/xr819-firmware

@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,9 +24,8 @@
 
 include Config
 
-VER        = 20160319
-
-THISAPP    = ath10k-firmware-$(VER)
+VER        = c01.08.0043
+THISAPP    = xr819-firmware-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -39,7 +38,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 207fc1b8a9b74392952d6662df0c03d3
+$(DL_FILE)_MD5 = b75463ca4649a5b11a5a18e8c8ff8908
 
 install : $(TARGET)
 
@@ -68,5 +67,6 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@cd /lib/firmware && tar axf $(DIR_DL)/$(DL_FILE)
+	mkdir -p /lib/firmware/xr819
+	@cd /lib/firmware/xr819 && tar axf $(DIR_DL)/$(DL_FILE)
 	@$(POSTBUILD)

lfs/xtables-addons

@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2014  IPFire Team <info@ipfire.org>                      #
+# Copyright (C) 2007-2017  IPFire Team <info@ipfire.org>                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -27,7 +27,7 @@ include Config
 VERSUFIX = ipfire$(KCFG)
 MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/extra/
 
-VER        = 2.6
+VER        = 2.13
 
 THISAPP    = xtables-addons-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 087835ba7e564481b6fd398692268340
+$(DL_FILE)_MD5 = be20b0b9c4b001b364431a836e361d33
 
 install : $(TARGET)
 

make.sh

@@ -144,14 +144,14 @@ configure_build() {
 			BUILDTARGET="${build_arch}-unknown-linux-gnu"
 			CROSSTARGET="${build_arch}-cross-linux-gnu"
 			BUILD_PLATFORM="x86"
-			CFLAGS_ARCH="-m64 -mtune=generic"
+			CFLAGS_ARCH="-m64 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic"
 			;;
 
 		i586)
 			BUILDTARGET="${build_arch}-pc-linux-gnu"
 			CROSSTARGET="${build_arch}-cross-linux-gnu"
 			BUILD_PLATFORM="x86"
-			CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer"
+			CFLAGS_ARCH="-march=i586 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic -fomit-frame-pointer"
 			;;
 
 		aarch64)
@@ -1044,13 +1044,12 @@ buildipfire() {
   lfsmake2 unzip
   lfsmake2 which
   lfsmake2 linux-firmware
-  lfsmake2 ath10k-firmware
   lfsmake2 dvb-firmwares
-  lfsmake2 mt7601u-firmware
+  lfsmake2 xr819-firmware
   lfsmake2 zd1211-firmware
   lfsmake2 rpi-firmware
   lfsmake2 bc
-  lfsmake2 u-boot
+  lfsmake2 u-boot MKIMAGE=1
   lfsmake2 cpio
   lfsmake2 mdadm
   lfsmake2 dracut
@@ -1065,61 +1064,57 @@ buildipfire() {
   lfsmake2 libnetfilter_cthelper
   lfsmake2 libnetfilter_cttimeout
   lfsmake2 iptables
+  lfsmake2 screen
+  lfsmake2 elfutils
 
   case "${BUILD_ARCH}" in
 	x86_64)
 		lfsmake2 linux			KCFG=""
-		lfsmake2 backports			KCFG=""
-		lfsmake2 e1000e			KCFG=""
-		lfsmake2 igb				KCFG=""
-		lfsmake2 ixgbe			KCFG=""
+#		lfsmake2 backports			KCFG=""
+#		lfsmake2 e1000e			KCFG=""
+#		lfsmake2 igb				KCFG=""
+#		lfsmake2 ixgbe			KCFG=""
 		lfsmake2 xtables-addons		KCFG=""
 		lfsmake2 linux-initrd			KCFG=""
 		;;
 	i586)
 		# x86-pae (Native and new XEN) kernel build
 		lfsmake2 linux			KCFG="-pae"
-		lfsmake2 backports			KCFG="-pae"
-		lfsmake2 e1000e			KCFG="-pae"
-		lfsmake2 igb				KCFG="-pae"
-		lfsmake2 ixgbe			KCFG="-pae"
+#		lfsmake2 backports			KCFG="-pae"
+#		lfsmake2 e1000e			KCFG="-pae"
+#		lfsmake2 igb				KCFG="-pae"
+#		lfsmake2 ixgbe			KCFG="-pae"
 		lfsmake2 xtables-addons		KCFG="-pae"
 		lfsmake2 linux-initrd			KCFG="-pae"
 
 		# x86 kernel build
 		lfsmake2 linux			KCFG=""
-		lfsmake2 backports			KCFG=""
-		lfsmake2 e1000e			KCFG=""
-		lfsmake2 igb				KCFG=""
-		lfsmake2 ixgbe			KCFG=""
+#		lfsmake2 backports			KCFG=""
+#		lfsmake2 e1000e			KCFG=""
+#		lfsmake2 igb				KCFG=""
+#		lfsmake2 ixgbe			KCFG=""
 		lfsmake2 xtables-addons		KCFG=""
 		lfsmake2 linux-initrd			KCFG=""
 		;;
 
 	armv5tel)
-		# arm-rpi (Raspberry Pi) kernel build
-		lfsmake2 linux			KCFG="-rpi"
-		lfsmake2 backports			KCFG="-rpi"
-		lfsmake2 xtables-addons		KCFG="-rpi"
-		lfsmake2 linux-initrd			KCFG="-rpi"
+		# arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
+		lfsmake2 linux			KCFG="-kirkwood"
+#		lfsmake2 backports			KCFG="-kirkwood"
+#		lfsmake2 e1000e			KCFG="-kirkwood"
+#		lfsmake2 igb				KCFG="-kirkwood"
+#		lfsmake2 ixgbe			KCFG="-kirkwood"
+		lfsmake2 xtables-addons		KCFG="-kirkwood"
+		lfsmake2 linux-initrd			KCFG="-kirkwood"
 
 		# arm multi platform (Panda, Wandboard ...) kernel build
 		lfsmake2 linux			KCFG="-multi"
-		lfsmake2 backports			KCFG="-multi"
-		lfsmake2 e1000e			KCFG="-multi"
-		lfsmake2 igb				KCFG="-multi"
-		lfsmake2 ixgbe			KCFG="-multi"
+#		lfsmake2 backports			KCFG="-multi"
+#		lfsmake2 e1000e			KCFG="-multi"
+#		lfsmake2 igb				KCFG="-multi"
+#		lfsmake2 ixgbe			KCFG="-multi"
 		lfsmake2 xtables-addons		KCFG="-multi"
 		lfsmake2 linux-initrd			KCFG="-multi"
-
-		# arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
-		lfsmake2 linux			KCFG="-kirkwood"
-		lfsmake2 backports			KCFG="-kirkwood"
-		lfsmake2 e1000e			KCFG="-kirkwood"
-		lfsmake2 igb				KCFG="-kirkwood"
-		lfsmake2 ixgbe			KCFG="-kirkwood"
-		lfsmake2 xtables-addons		KCFG="-kirkwood"
-		lfsmake2 linux-initrd			KCFG="-kirkwood"
 		;;
   esac
   lfsmake2 xtables-addons			USPACE="1"
@@ -1302,7 +1297,7 @@ buildipfire() {
   lfsmake2 mc
   lfsmake2 wget
   lfsmake2 bridge-utils
-  lfsmake2 screen
+#  lfsmake2 screen
   lfsmake2 smartmontools
   lfsmake2 htop
   lfsmake2 chkconfig
@@ -1434,6 +1429,8 @@ buildipfire() {
   lfsmake2 powertop
   lfsmake2 parted
   lfsmake2 swig
+  lfsmake2 u-boot
+  lfsmake2 u-boot-kirkwood
   lfsmake2 python-typing
   lfsmake2 python-m2crypto
   lfsmake2 wireless-regdb
@@ -1464,7 +1461,6 @@ buildipfire() {
   lfsmake2 sendEmail
   lfsmake2 sysbench
   lfsmake2 strace
-  lfsmake2 elfutils
   lfsmake2 ltrace
   lfsmake2 ipfire-netboot
   lfsmake2 lcdproc
@@ -1493,7 +1489,6 @@ buildipfire() {
   lfsmake2 pigz
   lfsmake2 tmux
   lfsmake2 perl-Text-CSV_XS
-  lfsmake2 swconfig
   lfsmake2 haproxy
   lfsmake2 ipset
   lfsmake2 lua
@@ -1560,7 +1555,6 @@ buildpackages() {
   modprobe loop 2>/dev/null
   if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ] || [ -e "/dev/loop-control" ]); then
 	lfsmake2 flash-images
-	lfsmake2 flash-images SCON=1
   fi
 
   mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1

src/initscripts/system/acpid

@@ -9,15 +9,11 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
-# Test if ACPI is present
-if [ ! -d /proc/acpi ]; then
-	exit 0
-fi
-
 case "${1}" in
 	start)
 		boot_mesg "Starting ACPI daemon..."
-		loadproc /usr/sbin/acpid
+		loadproc /usr/sbin/acpid > /dev/null 2>&1
+		echo_ok;
 		;;
 
 	stop)

src/initscripts/system/firstsetup

@@ -5,24 +5,17 @@ if [ -e /var/ipfire/main/firstsetup_ok ]; then
 	exit 0;
 fi
 
-# Edit the serial console entry at /etc/inittab matching to console parameter.
-ser_console() {
-	while test x"$1" != x
-	do
-		case $1 in
-			console=*)
-				scon=${1##console=};
-				sed -i -e "s|^7:2345:respawn:/sbin/agetty.*|7:2345:respawn:/sbin/agetty ${scon%%,*}|g" /etc/inittab
-				shift
-			;;
-			*)
-				shift
-			;;
-		esac
-	done
-}
-cmdline=`cat /proc/cmdline`
-ser_console $cmdline
+# disable consoles if tty are not present
+openvt -f -w -- /bin/sh -c echo > /dev/null 2>&1
+if [ ! "${?}" == "0" ]; then
+	# Disable console on tty2-6
+	sed -i -e "s|2:2345:respawn:|#2:2345:respawn:|g" /etc/inittab
+	sed -i -e "s|3:2345:respawn:|#3:2345:respawn:|g" /etc/inittab
+	sed -i -e "s|4:2345:respawn:|#4:2345:respawn:|g" etc/inittab
+	sed -i -e "s|5:2345:respawn:|#5:2345:respawn:|g" /etc/inittab
+	sed -i -e "s|6:2345:respawn:|#6:2345:respawn:|g" /etc/inittab
+fi
+
 # reload inittab
 /sbin/init q
 #

src/initscripts/system/leds

@@ -78,8 +78,8 @@ case "${1}" in
 		setup_netdev_trigger geos:3 ${RED_DEV} tx
 
 		# Dreamplug
-		setup_netdev_trigger dreamplug:green:wlan ${GREEN_DEV} tx rx
-		setup_netdev_trigger dreamplug:blue:wlanap ${BLUE_DEV} tx rx
+		setup_netdev_trigger dreamplug:green:wifi ${GREEN_DEV} tx rx
+		setup_netdev_trigger dreamplug:green:wifi_ap ${BLUE_DEV} tx rx
 		setup_netdev_trigger dreamplug:blue:bluetooth ${RED_DEV} tx rx
 
 		# Iomega iConnect start
@@ -122,8 +122,8 @@ case "${1}" in
 		disable_led_trigger geos:3
 
 		# Dreamplug
-		disable_led_trigger dreamplug:green:wlan
-		disable_led_trigger dreamplug:blue:wlanap
+		disable_led_trigger dreamplug:green:wifi
+		disable_led_trigger dreamplug:green:wifi_ap
 		disable_led_trigger dreamplug:blue:bluetooth
 
 		# Iomega iConnect stop (heartbeat will leave on)

src/initscripts/system/partresize

@@ -18,6 +18,7 @@
 case "${1}" in
 	start)
 		if [ -e "/.partresize" ]; then
+
 			boot_mesg "Mounting root file system in read/write mode ..."
 			mount -o remount,rw / > /dev/null
 			evaluate_retval
@@ -28,6 +29,21 @@ case "${1}" in
 			(exit ${failed})
 			evaluate_retval
 
+			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
+					# 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
+					sed -i -e "s|panic=10|& console=ttyS0,115200n8|g" /etc/default/grub
+				fi
+				/usr/local/bin/update-bootloader
+			fi
+			umount /boot > /dev/null
+
+			sleep 30
+
 			# Detect device
 			mount | while read -r dev tmp1 mountpoint tmp2; do
 				[ "${dev}" = "rootfs" ] && continue

src/installer/main.c

@@ -820,15 +820,6 @@ int main(int argc, char *argv[]) {
 		fclose(f);
 
 		replace(DESTINATION_MOUNT_PATH "/etc/default/grub", "panic=10", "panic=10 console=ttyS0,115200n8");
-
-		/* inittab */
-		replace("/harddisk/etc/inittab", "1:2345:respawn:", "#1:2345:respawn:");
-		replace("/harddisk/etc/inittab", "2:2345:respawn:", "#2:2345:respawn:");
-		replace("/harddisk/etc/inittab", "3:2345:respawn:", "#3:2345:respawn:");
-		replace("/harddisk/etc/inittab", "4:2345:respawn:", "#4:2345:respawn:");
-		replace("/harddisk/etc/inittab", "5:2345:respawn:", "#5:2345:respawn:");
-		replace("/harddisk/etc/inittab", "6:2345:respawn:", "#6:2345:respawn:");
-		replace("/harddisk/etc/inittab", "#7:2345:respawn:", "7:2345:respawn:");
 	}
 
 	/* novga */

src/patches/0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch

@@ -1,45 +0,0 @@
-From 88c9657960a6c5d3673a25c266781e876c181add Mon Sep 17 00:00:00 2001
-From: Hector Marco-Gisbert <hecmargi@upv.es>
-Date: Fri, 13 Nov 2015 16:21:09 +0100
-Subject: [PATCH] Fix security issue when reading username and password
-
-  This patch fixes two integer underflows at:
-    * grub-core/lib/crypto.c
-    * grub-core/normal/auth.c
-
-Signed-off-by: Hector Marco-Gisbert <hecmargi@upv.es>
-Signed-off-by: Ismael Ripoll-Ripoll <iripoll@disca.upv.es>
----
- grub-core/lib/crypto.c  | 2 +-
- grub-core/normal/auth.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c
-index 010e550..524a3d8 100644
---- a/grub-core/lib/crypto.c
-+++ b/grub-core/lib/crypto.c
-@@ -456,7 +456,7 @@ grub_password_get (char buf[], unsigned buf_size)
- 	  break;
- 	}
- 
--      if (key == '\b')
-+      if (key == '\b' && cur_len)
- 	{
- 	  cur_len--;
- 	  continue;
-diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c
-index c6bd96e..5782ec5 100644
---- a/grub-core/normal/auth.c
-+++ b/grub-core/normal/auth.c
-@@ -172,7 +172,7 @@ grub_username_get (char buf[], unsigned buf_size)
- 	  break;
- 	}
- 
--      if (key == '\b')
-+      if (key == '\b' && cur_len)
- 	{
- 	  cur_len--;
- 	  grub_printf ("\b");
--- 
-1.9.1
-

src/patches/U-Boot-v2-fs-fat-read-fix-fat16-ls-read-issue.patch

@@ -1,128 +0,0 @@
-diff --git a/fs/fat/fat.c b/fs/fat/fat.c
-index 04a51db..bccc3e3 100644
---- a/fs/fat/fat.c
-+++ b/fs/fat/fat.c
-@@ -823,8 +823,11 @@ int do_fat_read_at(const char *filename, loff_t pos, void *buffer,
- 	int ret = -1;
- 	int firsttime;
- 	__u32 root_cluster = 0;
-+	__u32 read_blk;
- 	int rootdir_size = 0;
--	int j;
-+	int buffer_blk_cnt;
-+	int do_read;
-+	__u8 *dir_ptr;
- 
- 	if (read_bootsectandvi(&bs, &volinfo, &mydata->fatsize)) {
- 		debug("Error: reading boot sector\n");
-@@ -909,24 +912,54 @@ int do_fat_read_at(const char *filename, loff_t pos, void *buffer,
- 		isdir = 1;
- 	}
- 
--	j = 0;
-+	buffer_blk_cnt = 0;
-+	firsttime = 1;
- 	while (1) {
- 		int i;
- 
--		if (j == 0) {
--			debug("FAT read sect=%d, clust_size=%d, DIRENTSPERBLOCK=%zd\n",
--				cursect, mydata->clust_size, DIRENTSPERBLOCK);
-+		if (mydata->fatsize == 32 || firsttime) {
-+			dir_ptr = do_fat_read_at_block;
-+			firsttime = 0;
-+		} else {
-+			/**
-+			 * FAT16 sector buffer modification:
-+			 * Each loop, the second buffered block is moved to
-+			 * the buffer begin, and two next sectors are read
-+			 * next to the previously moved one. So the sector
-+			 * buffer keeps always 3 sectors for fat16.
-+			 * And the current sector is the buffer second sector
-+			 * beside the "firsttime" read, when it is the first one.
-+			 *
-+			 * PREFETCH_BLOCKS is 2 for FAT16 == loop[0:1]
-+			 * n = computed root dir sector
-+			 * loop |  cursect-1  | cursect    | cursect+1  |
-+			 *   0  |  sector n+0 | sector n+1 | none       |
-+			 *   1  |  none       | sector n+0 | sector n+1 |
-+			 *   0  |  sector n+1 | sector n+2 | sector n+3 |
-+			 *   1  |  sector n+3 | ...
-+			*/
-+			dir_ptr = (do_fat_read_at_block + mydata->sect_size);
-+			memcpy(do_fat_read_at_block, dir_ptr, mydata->sect_size);
-+		}
-+
-+		do_read = 1;
-+
-+		if (mydata->fatsize == 32 && buffer_blk_cnt)
-+			do_read = 0;
-+
-+		if (do_read) {
-+			read_blk = (mydata->fatsize == 32) ?
-+				    mydata->clust_size : PREFETCH_BLOCKS;
-+
-+			debug("FAT read(sect=%d, cnt:%d), clust_size=%d, DIRENTSPERBLOCK=%zd\n",
-+				cursect, read_blk, mydata->clust_size, DIRENTSPERBLOCK);
- 
--			if (disk_read(cursect,
--					(mydata->fatsize == 32) ?
--					(mydata->clust_size) :
--					PREFETCH_BLOCKS,
--					do_fat_read_at_block) < 0) {
-+			if (disk_read(cursect, read_blk, dir_ptr) < 0) {
- 				debug("Error: reading rootdir block\n");
- 				goto exit;
- 			}
- 
--			dentptr = (dir_entry *) do_fat_read_at_block;
-+			dentptr = (dir_entry *)dir_ptr;
- 		}
- 
- 		for (i = 0; i < DIRENTSPERBLOCK; i++) {
-@@ -951,7 +984,7 @@ int do_fat_read_at(const char *filename, loff_t pos, void *buffer,
- 
- 					get_vfatname(mydata,
- 						     root_cluster,
--						     do_fat_read_at_block,
-+						     dir_ptr,
- 						     dentptr, l_name);
- 
- 					if (dols == LS_ROOT) {
-@@ -1062,7 +1095,7 @@ int do_fat_read_at(const char *filename, loff_t pos, void *buffer,
- 
- 			goto rootdir_done;	/* We got a match */
- 		}
--		debug("END LOOP: j=%d   clust_size=%d\n", j,
-+		debug("END LOOP: buffer_blk_cnt=%d   clust_size=%d\n", buffer_blk_cnt,
- 		       mydata->clust_size);
- 
- 		/*
-@@ -1070,10 +1103,10 @@ int do_fat_read_at(const char *filename, loff_t pos, void *buffer,
- 		 * root directory clusters when a cluster has been
- 		 * completely processed.
- 		 */
--		++j;
-+		++buffer_blk_cnt;
- 		int rootdir_end = 0;
- 		if (mydata->fatsize == 32) {
--			if (j == mydata->clust_size) {
-+			if (buffer_blk_cnt == mydata->clust_size) {
- 				int nxtsect = 0;
- 				int nxt_clust = 0;
- 
-@@ -1086,11 +1119,11 @@ int do_fat_read_at(const char *filename, loff_t pos, void *buffer,
- 				root_cluster = nxt_clust;
- 
- 				cursect = nxtsect;
--				j = 0;
-+				buffer_blk_cnt = 0;
- 			}
- 		} else {
--			if (j == PREFETCH_BLOCKS)
--				j = 0;
-+			if (buffer_blk_cnt == PREFETCH_BLOCKS)
-+				buffer_blk_cnt = 0;
- 
- 			rootdir_end = (++cursect - mydata->rootdir_sect >=
- 				       rootdir_size);

src/patches/backports/backports-linux-upstream-1.patch

@@ -1,60 +0,0 @@
-From 5bb6f6e1d44aa91323857715dfddb63337f8307b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn@mork.no>
-Date: Sun, 3 Jul 2016 22:24:50 +0200
-Subject: cdc_ncm: workaround for EM7455 "silent" data interface
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-[ Upstream commit c086e7096170390594c425114d98172bc9aceb8a ]
-
-Several Lenovo users have reported problems with their Sierra
-Wireless EM7455 modem. The driver has loaded successfully and
-the MBIM management channel has appeared to work, including
-establishing a connection to the mobile network. But no frames
-have been received over the data interface.
-
-The problem affects all EM7455 and MC7455, and is assumed to
-affect other modems based on the same Qualcomm chipset and
-baseband firmware.
-
-Testing narrowed the problem down to what seems to be a
-firmware timing bug during initialization. Adding a short sleep
-while probing is sufficient to make the problem disappear.
-Experiments have shown that 1-2 ms is too little to have any
-effect, while 10-20 ms is enough to reliably succeed.
-
-Reported-by: Stefan Armbruster <ml001@armbruster-it.de>
-Reported-by: Ralph Plawetzki <ralph@purejava.org>
-Reported-by: Andreas Fett <andreas.fett@secunet.com>
-Reported-by: Rasmus Lerdorf <rasmus@lerdorf.com>
-Reported-by: Samo Ratnik <samo.ratnik@gmail.com>
-Reported-and-tested-by: Aleksander Morgado <aleksander@aleksander.es>
-Signed-off-by: Bjørn Mork <bjorn@mork.no>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/usb/cdc_ncm.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
-index c663722..584504e 100644
---- a/drivers/net/usb/cdc_ncm.c
-+++ b/drivers/net/usb/cdc_ncm.c
-@@ -438,6 +438,13 @@ advance:
- 	if (cdc_ncm_setup(dev))
- 		goto error2;
- 
-+	/* Some firmwares need a pause here or they will silently fail
-+	 * to set up the interface properly.  This value was decided
-+	 * empirically on a Sierra Wireless MC7455 running 02.08.02.00
-+	 * firmware.
-+	 */
-+	usleep_range(10000, 20000);
-+
- 	/* configure data interface */
- 	temp = usb_set_interface(dev->udev, iface_no, data_altsetting);
- 	if (temp) {
--- 
-cgit v0.12
-

src/patches/backports/backports-linux-upstream-2.patch

@@ -1,43 +0,0 @@
-From d6b8a68ac7b6d2e241f8d34b769c98a1793d9124 Mon Sep 17 00:00:00 2001
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Wed, 20 Apr 2016 23:23:08 +0100
-Subject: atl2: Disable unimplemented scatter/gather feature
-
-[ Upstream commit f43bfaeddc79effbf3d0fcb53ca477cca66f3db8 ]
-
-atl2 includes NETIF_F_SG in hw_features even though it has no support
-for non-linear skbs.  This bug was originally harmless since the
-driver does not claim to implement checksum offload and that used to
-be a requirement for SG.
-
-Now that SG and checksum offload are independent features, if you
-explicitly enable SG *and* use one of the rare protocols that can use
-SG without checkusm offload, this potentially leaks sensitive
-information (before you notice that it just isn't working).  Therefore
-this obscure bug has been designated CVE-2016-2117.
-
-Reported-by: Justin Yackoski <jyackoski@crypto-nite.com>
-Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-Fixes: ec5f06156423 ("net: Kill link between CSUM and SG features.")
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/ethernet/atheros/atlx/atl2.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
-index 265ce1b..96fe542 100644
---- a/drivers/net/ethernet/atheros/atlx/atl2.c
-+++ b/drivers/net/ethernet/atheros/atlx/atl2.c
-@@ -1413,7 +1413,7 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
- 
- 	err = -EIO;
- 
--	netdev->hw_features = NETIF_F_SG | NETIF_F_HW_VLAN_CTAG_RX;
-+	netdev->hw_features = NETIF_F_HW_VLAN_CTAG_RX;
- 	netdev->features |= (NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX);
- 
- 	/* Init PHY as early as possible due to power saving issue  */
--- 
-cgit v0.12
-

src/patches/backports/backports-linux-upstream-3.patch

@@ -1,53 +0,0 @@
-From fc70a4a5cb616bf390cee03390265045de5cf06a Mon Sep 17 00:00:00 2001
-From: Feng Tang <feng.tang@intel.com>
-Date: Fri, 24 Jun 2016 15:26:05 +0800
-Subject: net: alx: Work around the DMA RX overflow issue
-
-[ Upstream commit 881d0327db37ad917a367c77aff1afa1ee41e0a9 ]
-
-Note: This is a verified backported patch for stable 4.4 kernel, and it
-could also be applied to 4.3/4.2/4.1/3.18/3.16
-
-There is a problem with alx devices, that the network link will be
-lost in 1-5 minutes after the device is up.
-
->From debugging without datasheet, we found the error always
-happen when the DMA RX address is set to 0x....fc0, which is very
-likely to be a HW/silicon problem.
-
-This patch will apply rx skb with 64 bytes longer space, and if the
-allocated skb has a 0x...fc0 address, it will use skb_resever(skb, 64)
-to advance the address, so that the RX overflow can be avoided.
-
-Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=70761
-Signed-off-by: Feng Tang <feng.tang@intel.com>
-Suggested-by: Eric Dumazet <edumazet@google.com>
-Tested-by: Ole Lukoie <olelukoie@mail.ru>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/ethernet/atheros/alx/main.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c
-index 3e1d7d2..7585960 100644
---- a/drivers/net/ethernet/atheros/alx/main.c
-+++ b/drivers/net/ethernet/atheros/alx/main.c
-@@ -86,9 +86,14 @@ static int alx_refill_rx_ring(struct alx_priv *alx, gfp_t gfp)
- 	while (!cur_buf->skb && next != rxq->read_idx) {
- 		struct alx_rfd *rfd = &rxq->rfd[cur];
- 
--		skb = __netdev_alloc_skb(alx->dev, alx->rxbuf_size, gfp);
-+		skb = __netdev_alloc_skb(alx->dev, alx->rxbuf_size + 64, gfp);
- 		if (!skb)
- 			break;
-+
-+		/* Workround for the HW RX DMA overflow issue */
-+		if (((unsigned long)skb->data & 0xfff) == 0xfc0)
-+			skb_reserve(skb, 64);
-+
- 		dma = dma_map_single(&alx->hw.pdev->dev,
- 				     skb->data, alx->rxbuf_size,
- 				     DMA_FROM_DEVICE);
--- 
-cgit v0.12
-

src/patches/grub-2.00_disable_vga_fallback.patch

@@ -1,15 +0,0 @@
-We have to remove the vga fallback because this not work on bay-trail and other
-new intel onboard graphics.
-
-diff -Naur grub-2.00.org/grub-core/video/i386/pc/vga.c grub-2.00/grub-core/video/i386/pc/vga.c
---- grub-2.00.org/grub-core/video/i386/pc/vga.c	2012-06-06 23:21:02.000000000 +0200
-+++ grub-2.00/grub-core/video/i386/pc/vga.c	2014-09-05 21:41:04.790870375 +0200
-@@ -122,7 +122,7 @@
- {
-   grub_err_t err;
- 
--  if ((width && width != VGA_WIDTH) || (height && height != VGA_HEIGHT))
-+//  if ((width && width != VGA_WIDTH) || (height && height != VGA_HEIGHT))
-     return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "no matching mode found");
- 
-   framebuffer.temporary_buffer = grub_malloc (VGA_HEIGHT * VGA_WIDTH);

src/patches/grub-2.00_ignore_missing_symtab.patch

@@ -1,40 +0,0 @@
-diff -Naur grub-2.00.org/grub-core/kern/dl.c grub-2.00/grub-core/kern/dl.c
---- grub-2.00.org/grub-core/kern/dl.c	2012-06-22 17:26:38.000000000 +0200
-+++ grub-2.00/grub-core/kern/dl.c	2017-07-05 10:45:25.501645684 +0200
-@@ -354,8 +354,11 @@
-     if (s->sh_type == SHT_SYMTAB)
-       break;
- 
-+  /* Module without symbol table may still be used to pull in dependencies.
-+     We verify at build time that such modules do not contain any relocations
-+     that may reference symbol table. */
-   if (i == e->e_shnum)
--    return grub_error (GRUB_ERR_BAD_MODULE, N_("no symbol table"));
-+     return GRUB_ERR_NONE;
- 
- #ifdef GRUB_MODULES_MACHINE_READONLY
-   mod->symtab = grub_malloc (s->sh_size);
-diff -Naur grub-2.00.org/grub-core/kern/i386/dl.c grub-2.00/grub-core/kern/i386/dl.c
---- grub-2.00.org/grub-core/kern/i386/dl.c	2012-02-26 12:14:21.000000000 +0100
-+++ grub-2.00/grub-core/kern/i386/dl.c	2017-07-05 17:01:43.333955065 +0200
-@@ -55,7 +55,7 @@
-       break;
- 
-   if (i == e->e_shnum)
--    return grub_error (GRUB_ERR_BAD_MODULE, N_("no symbol table"));
-+    return GRUB_ERR_NONE;
- 
-   entsize = s->sh_entsize;
- 
-diff -Naur grub-2.00.org/grub-core/kern/x86_64/dl.c grub-2.00/grub-core/kern/x86_64/dl.c
---- grub-2.00.org/grub-core/kern/x86_64/dl.c	2012-02-26 12:14:56.000000000 +0100
-+++ grub-2.00/grub-core/kern/x86_64/dl.c	2017-07-05 17:02:23.374574458 +0200
-@@ -55,7 +55,7 @@
-       break;
- 
-   if (i == e->e_shnum)
--    return grub_error (GRUB_ERR_BAD_MODULE, N_("no symbol table"));
-+    return GRUB_ERR_NONE;
- 
-   entsize = s->sh_entsize;
- 

src/patches/grub-2.02_disable_vga_fallback.patch

@@ -0,0 +1,15 @@
+We have to remove the vga fallback because this not work on bay-trail and other
+new intel onboard graphics.
+
+diff -Naur grub-2.02.org/grub-core/video/i386/pc/vga.c grub-2.02/grub-core/video/i386/pc/vga.c
+--- grub-2.02.org/grub-core/video/i386/pc/vga.c	2015-05-21 17:50:29.000000000 +0200
++++ grub-2.02/grub-core/video/i386/pc/vga.c	2018-04-15 22:24:41.686842878 +0200
+@@ -122,7 +122,7 @@
+ {
+   grub_err_t err;
+ 
+-  if ((width && width != VGA_WIDTH) || (height && height != 350 && height != 480))
++//  if ((width && width != VGA_WIDTH) || (height && height != 350 && height != 480))
+     return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "no matching mode found");
+ 
+   vga_height = height ? : 480;

src/patches/grub2-remove-gets.patch

@@ -1,21 +0,0 @@
-ISO C11 removes the specification of gets() from the C language, eglibc 2.16+ removed it
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Upstream-Status: Pending
-Index: grub-1.99/grub-core/gnulib/stdio.in.h
-===================================================================
---- grub-1.99.orig/grub-core/gnulib/stdio.in.h	2010-12-01 06:45:43.000000000 -0800
-+++ grub-1.99/grub-core/gnulib/stdio.in.h	2012-07-04 12:25:02.057099107 -0700
-@@ -140,8 +140,10 @@
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
-+#if defined gets
- #undef gets
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@

src/patches/linux-3.10.30_cs5535audio_fix_logspam_on_geos.patch

@@ -1,27 +0,0 @@
-diff -Naur linux-3.10.30.org/sound/pci/cs5535audio/cs5535audio.c linux-3.10.30/sound/pci/cs5535audio/cs5535audio.c
---- linux-3.10.30.org/sound/pci/cs5535audio/cs5535audio.c	2014-02-13 22:48:15.000000000 +0100
-+++ linux-3.10.30/sound/pci/cs5535audio/cs5535audio.c	2014-02-15 12:45:49.545688703 +0100
-@@ -83,8 +83,8 @@
- 			break;
- 		udelay(1);
- 	} while (--timeout);
--	if (!timeout)
--		snd_printk(KERN_ERR "Failure writing to cs5535 codec\n");
-+//	if (!timeout)
-+//		snd_printk(KERN_ERR "Failure writing to cs5535 codec\n");
- }
- 
- static unsigned short snd_cs5535audio_codec_read(struct cs5535audio *cs5535au,
-@@ -108,9 +108,9 @@
- 			break;
- 		udelay(1);
- 	} while (--timeout);
--	if (!timeout)
--		snd_printk(KERN_ERR "Failure reading codec reg 0x%x,"
--					"Last value=0x%x\n", reg, val);
-+//	if (!timeout)
-+//		snd_printk(KERN_ERR "Failure reading codec reg 0x%x,"
-+//					"Last value=0x%x\n", reg, val);
- 
- 	return (unsigned short) val;
- }

src/patches/linux-3.10.37-rt2800usb_add_dlink_dwa137_usbid.patch

@@ -1,11 +0,0 @@
-diff -Naur linux-3.10.37.org/drivers/net/wireless/rt2x00/rt2800usb.c linux-3.10.37/drivers/net/wireless/rt2x00/rt2800usb.c
---- linux-3.10.37.org/drivers/net/wireless/rt2x00/rt2800usb.c	2014-04-14 15:42:31.000000000 +0200
-+++ linux-3.10.37/drivers/net/wireless/rt2x00/rt2800usb.c	2014-04-25 10:25:12.796630526 +0200
-@@ -1175,6 +1175,7 @@
- 	/* Belkin */
- 	{ USB_DEVICE(0x050d, 0x945b) },
- 	/* D-Link */
-+	{ USB_DEVICE(0x2001, 0x3317) },
- 	{ USB_DEVICE(0x2001, 0x3c17) },
- 	/* Panasonic */
- 	{ USB_DEVICE(0x083a, 0xb511) },

src/patches/linux-3.10.55-rt2800usb-change_queue_warn_to_debug.patch

@@ -1,30 +0,0 @@
-diff -Naur linux-3.10.55.org/drivers/net/wireless/rt2x00/rt2800usb.c linux-3.10.55/drivers/net/wireless/rt2x00/rt2800usb.c
---- linux-3.10.55.org/drivers/net/wireless/rt2x00/rt2800usb.c	2014-09-17 18:04:18.000000000 +0200
-+++ linux-3.10.55/drivers/net/wireless/rt2x00/rt2800usb.c	2014-10-05 19:25:25.070972490 +0200
-@@ -128,7 +128,7 @@
- 
- 	tout = time_after(jiffies, entry->last_action + msecs_to_jiffies(100));
- 	if (unlikely(tout))
--		rt2x00_warn(entry->queue->rt2x00dev,
-+		rt2x00_dbg(entry->queue->rt2x00dev,
- 			    "TX status timeout for entry %d in queue %d\n",
- 			    entry->entry_idx, entry->queue->qid);
- 	return tout;
-@@ -569,7 +569,7 @@
- 		queue = rt2x00queue_get_tx_queue(rt2x00dev, qid);
- 
- 		if (unlikely(rt2x00queue_empty(queue))) {
--			rt2x00_warn(rt2x00dev, "Got TX status for an empty queue %u, dropping\n",
-+			rt2x00_dbg(rt2x00dev, "Got TX status for an empty queue %u, dropping\n",
- 				    qid);
- 			break;
- 		}
-@@ -578,7 +578,7 @@
- 
- 		if (unlikely(test_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags) ||
- 			     !test_bit(ENTRY_DATA_STATUS_PENDING, &entry->flags))) {
--			rt2x00_warn(rt2x00dev, "Data pending for entry %u in queue %u\n",
-+			rt2x00_dbg(rt2x00dev, "Data pending for entry %u in queue %u\n",
- 				    entry->entry_idx, qid);
- 			break;
- 		}

src/patches/linux-3.14.25-rt5592_no_special_txop_init.patch

@@ -1,13 +0,0 @@
-diff -Naur linux-3.14.25.org/drivers/net/wireless/rt2x00/rt2800lib.c linux-3.14.25/drivers/net/wireless/rt2x00/rt2800lib.c
---- linux-3.14.25.org/drivers/net/wireless/rt2x00/rt2800lib.c	2014-11-21 18:23:44.000000000 +0100
-+++ linux-3.14.25/drivers/net/wireless/rt2x00/rt2800lib.c	2014-12-03 11:30:58.813355413 +0100
-@@ -4847,7 +4847,8 @@
- 	rt2x00_set_field32(&reg, TXOP_CTRL_CFG_EXT_CWMIN, 0);
- 	rt2800_register_write(rt2x00dev, TXOP_CTRL_CFG, reg);
- 
--	reg = rt2x00_rt(rt2x00dev, RT5592) ? 0x00000082 : 0x00000002;
-+//	reg = rt2x00_rt(rt2x00dev, RT5592) ? 0x00000082 : 0x00000002;
-+	reg = 0x00000002;
- 	rt2800_register_write(rt2x00dev, TXOP_HLDR_ET, reg);
- 
- 	rt2800_register_read(rt2x00dev, TX_RTS_CFG, &reg);

src/patches/linux-3.14.25_rt2x00_fix_bss_bcn_num.patch

@@ -1,12 +0,0 @@
-diff -Naur linux-3.14.25.org/drivers/net/wireless/rt2x00/rt2800lib.c linux-3.14.25/drivers/net/wireless/rt2x00/rt2800lib.c
---- linux-3.14.25.org/drivers/net/wireless/rt2x00/rt2800lib.c	2014-12-03 11:30:58.000000000 +0100
-+++ linux-3.14.25/drivers/net/wireless/rt2x00/rt2800lib.c	2014-12-03 12:15:45.743454351 +0100
-@@ -1557,7 +1557,7 @@
- 		if (!is_zero_ether_addr((const u8 *)conf->bssid)) {
- 			reg = le32_to_cpu(conf->bssid[1]);
- 			rt2x00_set_field32(&reg, MAC_BSSID_DW1_BSS_ID_MASK, 3);
--			rt2x00_set_field32(&reg, MAC_BSSID_DW1_BSS_BCN_NUM, 7);
-+			rt2x00_set_field32(&reg, MAC_BSSID_DW1_BSS_BCN_NUM, 0);
- 			conf->bssid[1] = cpu_to_le32(reg);
- 		}
- 

src/patches/linux-3.14.32-r8169_disable_L23.patch

@@ -1,100 +0,0 @@
-From 77e3b7f055f824e4d6587faa73bd4aacd0c307e8 Mon Sep 17 00:00:00 2001
-From: hayeswang <hayeswang@realtek.com>
-Date: Wed, 9 Jul 2014 14:52:51 +0800
-Subject: [PATCH] r8169: disable L23
-
-For RTL8411, RTL8111G, RTL8402, RTL8105, and RTL8106, disable the feature
-of entering the L2/L3 link state of the PCIe. When the nic starts the process
-of entering the L2/L3 link state and the PCI reset occurs before the work
-is finished, the work would be queued and continue after the next the PCI
-reset occurs. This causes the device stays in L2/L3 link state, and the system
-couldn't find the device.
-
-Signed-off-by: Hayes Wang <hayeswang@realtek.com>
-Acked-by: Francois Romieu <romieu@fr.zoreil.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- drivers/net/ethernet/realtek/r8169.c | 25 +++++++++++++++++++++++++
- 1 file changed, 25 insertions(+)
-
-diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
-index 3ff7bc3..b94f658 100644
---- a/drivers/net/ethernet/realtek/r8169.c
-+++ b/drivers/net/ethernet/realtek/r8169.c
-@@ -538,6 +538,7 @@ enum rtl_register_content {
- 	MagicPacket	= (1 << 5),	/* Wake up when receives a Magic Packet */
- 	LinkUp		= (1 << 4),	/* Wake up when the cable connection is re-established */
- 	Jumbo_En0	= (1 << 2),	/* 8168 only. Reserved in the 8168b */
-+	Rdy_to_L23	= (1 << 1),	/* L23 Enable */
- 	Beacon_en	= (1 << 0),	/* 8168 only. Reserved in the 8168b */
- 
- 	/* Config4 register */
-@@ -4897,6 +4898,21 @@ static void rtl_enable_clock_request(struct pci_dev *pdev)
- 				 PCI_EXP_LNKCTL_CLKREQ_EN);
- }
- 
-+static void rtl_pcie_state_l2l3_enable(struct rtl8169_private *tp, bool enable)
-+{
-+	void __iomem *ioaddr = tp->mmio_addr;
-+	u8 data;
-+
-+	data = RTL_R8(Config3);
-+
-+	if (enable)
-+		data |= Rdy_to_L23;
-+	else
-+		data &= ~Rdy_to_L23;
-+
-+	RTL_W8(Config3, data);
-+}
-+
- #define R8168_CPCMD_QUIRK_MASK (\
- 	EnableBist | \
- 	Mac_dbgo_oe | \
-@@ -5246,6 +5262,7 @@ static void rtl_hw_start_8411(struct rtl8169_private *tp)
- 	};
- 
- 	rtl_hw_start_8168f(tp);
-+	rtl_pcie_state_l2l3_enable(tp, false);
- 
- 	rtl_ephy_init(tp, e_info_8168f_1, ARRAY_SIZE(e_info_8168f_1));
- 
-@@ -5284,6 +5301,8 @@ static void rtl_hw_start_8168g_1(struct rtl8169_private *tp)
- 
- 	rtl_w1w0_eri(tp, 0x2fc, ERIAR_MASK_0001, 0x01, 0x06, ERIAR_EXGMAC);
- 	rtl_w1w0_eri(tp, 0x1b0, ERIAR_MASK_0011, 0x0000, 0x1000, ERIAR_EXGMAC);
-+
-+	rtl_pcie_state_l2l3_enable(tp, false);
- }
- 
- static void rtl_hw_start_8168g_2(struct rtl8169_private *tp)
-@@ -5536,6 +5555,8 @@ static void rtl_hw_start_8105e_1(struct rtl8169_private *tp)
- 	RTL_W8(DLLPR, RTL_R8(DLLPR) | PFM_EN);
- 
- 	rtl_ephy_init(tp, e_info_8105e_1, ARRAY_SIZE(e_info_8105e_1));
-+
-+	rtl_pcie_state_l2l3_enable(tp, false);
- }
- 
- static void rtl_hw_start_8105e_2(struct rtl8169_private *tp)
-@@ -5571,6 +5592,8 @@ static void rtl_hw_start_8402(struct rtl8169_private *tp)
- 	rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);
- 	rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);
- 	rtl_w1w0_eri(tp, 0x0d4, ERIAR_MASK_0011, 0x0e00, 0xff00, ERIAR_EXGMAC);
-+
-+	rtl_pcie_state_l2l3_enable(tp, false);
- }
- 
- static void rtl_hw_start_8106(struct rtl8169_private *tp)
-@@ -5583,6 +5606,8 @@ static void rtl_hw_start_8106(struct rtl8169_private *tp)
- 	RTL_W32(MISC, (RTL_R32(MISC) | DISABLE_LAN_EN) & ~EARLY_TALLY_EN);
- 	RTL_W8(MCU, RTL_R8(MCU) | EN_NDP | EN_OOB_RESET);
- 	RTL_W8(DLLPR, RTL_R8(DLLPR) & ~PFM_EN);
-+
-+	rtl_pcie_state_l2l3_enable(tp, false);
- }
- 
- static void rtl_hw_start_8101(struct net_device *dev)
--- 
-1.8.5.2
-

src/patches/linux-3.14.43_SuperSSpeed_NOTRIM.patch

@@ -1,47 +0,0 @@
-diff -Naur linux-3.14.43.org/drivers/ata/libata-core.c linux-3.14.43/drivers/ata/libata-core.c
---- linux-3.14.43.org/drivers/ata/libata-core.c	2015-05-17 18:54:01.000000000 +0200
-+++ linux-3.14.43/drivers/ata/libata-core.c	2015-07-11 19:15:01.450041507 +0200
-@@ -4229,6 +4229,9 @@
- 	{ "Micron_M550*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },
- 	{ "Crucial_CT*M550SSD*",	NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },
- 
-+	/* devices that don't properly handle TRIM commands */
-+	{ "SuperSSpeed S238*",		NULL,	ATA_HORKAGE_NOTRIM, },
-+
- 	/*
- 	 * Some WD SATA-I drives spin up and down erratically when the link
- 	 * is put into the slumber mode.  We don't have full list of the
-diff -Naur linux-3.14.43.org/drivers/ata/libata-scsi.c linux-3.14.43/drivers/ata/libata-scsi.c
---- linux-3.14.43.org/drivers/ata/libata-scsi.c	2015-05-17 18:54:01.000000000 +0200
-+++ linux-3.14.43/drivers/ata/libata-scsi.c	2015-07-11 20:47:22.570021716 +0200
-@@ -2510,11 +2513,15 @@
- 		rbuf[14] = (lowest_aligned >> 8) & 0x3f;
- 		rbuf[15] = lowest_aligned;
- 
--		if (ata_id_has_trim(args->id)) {
--			rbuf[14] |= 0x80; /* TPE */
- 
--			if (ata_id_has_zero_after_trim(args->id))
--				rbuf[14] |= 0x40; /* TPRZ */
-+
-+		if (!(dev->horkage & ATA_HORKAGE_NOTRIM)) { 
-+			if (ata_id_has_trim(args->id)) {
-+				rbuf[14] |= 0x80; /* TPE */
-+
-+				if (ata_id_has_zero_after_trim(args->id))
-+					rbuf[14] |= 0x40; /* TPRZ */
-+			}
- 		}
- 	}
- 
-diff -Naur linux-3.14.43.org/include/linux/libata.h linux-3.14.43/include/linux/libata.h
---- linux-3.14.43.org/include/linux/libata.h	2015-05-17 18:54:01.000000000 +0200
-+++ linux-3.14.43/include/linux/libata.h	2015-07-11 19:13:03.190682173 +0200
-@@ -421,6 +421,7 @@
- 	ATA_HORKAGE_NO_NCQ_TRIM	= (1 << 19),	/* don't use queued TRIM */
- 	ATA_HORKAGE_NOLPM	= (1 << 20),	/* don't use LPM */
- 	ATA_HORKAGE_WD_BROKEN_LPM = (1 << 21),	/* some WDs have broken LPM */
-+	ATA_HORKAGE_NOTRIM	= (1 << 22),	/* don't use TRIM */
- 
- 	 /* DMA mask for user DMA control: User visible values; DO NOT
- 	    renumber */

src/patches/linux-3.14.43_new_qtrim_blacklist.patch

@@ -1,18 +0,0 @@
-diff -Naur linux-3.14.43.org/drivers/ata/libata-core.c linux-3.14.43/drivers/ata/libata-core.c
---- linux-3.14.43.org/drivers/ata/libata-core.c	2015-07-13 17:58:28.126607225 +0200
-+++ linux-3.14.43/drivers/ata/libata-core.c	2015-07-13 18:06:07.430782102 +0200
-@@ -4225,9 +4225,11 @@
- 
- 	/* devices that don't properly handle queued TRIM commands */
- 	{ "Micron_M500*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },
--	{ "Crucial_CT???M500SSD*",	NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },
--	{ "Micron_M550*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },
--	{ "Crucial_CT*M550SSD*",	NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },
-+	{ "Crucial_CT*M500*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },
-+	{ "Micron_M5[15]0*",		"MU01",	ATA_HORKAGE_NO_NCQ_TRIM, },
-+	{ "Crucial_CT*M550*",		"MU01",	ATA_HORKAGE_NO_NCQ_TRIM, },
-+	{ "Crucial_CT*MX100*",		"MU01",	ATA_HORKAGE_NO_NCQ_TRIM, },
-+	{ "Samsung SSD 8*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },
- 
- 	/* devices that don't properly handle TRIM commands */
- 	{ "SuperSSpeed S238*",		NULL,	ATA_HORKAGE_NOTRIM, },

src/patches/linux-3.14.65-k10temp_add_16H_M30H_id.patch

@@ -1,12 +0,0 @@
-diff -Naur linux-3.14.65.org/drivers/hwmon/k10temp.c linux-3.14.65/drivers/hwmon/k10temp.c
---- linux-3.14.65.org/drivers/hwmon/k10temp.c	2016-03-16 16:42:30.000000000 +0100
-+++ linux-3.14.65/drivers/hwmon/k10temp.c	2016-03-25 15:52:21.920190727 +0100
-@@ -212,6 +212,8 @@
- 	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) },
- 	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M30H_NB_F3) },
- 	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) },
-+//	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F3) },
-+	{ PCI_VDEVICE(AMD, 0x1583) },
- 	{}
- };
- MODULE_DEVICE_TABLE(pci, k10temp_id_table);

src/patches/linux-3.14.77-gsrec_tcp_input_access_once_rw.patch

@@ -1,18 +0,0 @@
-diff -Naur linux-3.14.77.org/net/ipv4/tcp_input.c linux-3.14.77/net/ipv4/tcp_input.c
---- linux-3.14.77.org/net/ipv4/tcp_input.c	2016-08-21 19:58:45.000000000 +0200
-+++ linux-3.14.77/net/ipv4/tcp_input.c	2016-08-21 21:11:24.336757369 +0200
-@@ -3299,12 +3299,12 @@
- 		u32 half = (sysctl_tcp_challenge_ack_limit + 1) >> 1;
- 
- 		challenge_timestamp = now;
--		ACCESS_ONCE(challenge_count) = half +
-+		ACCESS_ONCE_RW(challenge_count) = half +
- 				  prandom_u32_max(sysctl_tcp_challenge_ack_limit);
- 	}
- 	count = ACCESS_ONCE(challenge_count);
- 	if (count > 0) {
--		ACCESS_ONCE(challenge_count) = count - 1;
-+		ACCESS_ONCE_RW(challenge_count) = count - 1;
- 		NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPCHALLENGEACK);
- 		tcp_send_ack(sk);
- 	}

src/patches/linux-3.14.79_mmc_remove_EXT_CSD_revision_check.patch

@@ -1,16 +0,0 @@
-diff -Naur linux-3.14.79.org/drivers/mmc/core/mmc.c linux-3.14.79/drivers/mmc/core/mmc.c
---- linux-3.14.79.org/drivers/mmc/core/mmc.c	2016-09-11 10:00:18.000000000 +0200
-+++ linux-3.14.79/drivers/mmc/core/mmc.c	2017-01-19 18:15:07.940781595 +0100
-@@ -297,12 +297,6 @@
- 	}
- 
- 	card->ext_csd.rev = ext_csd[EXT_CSD_REV];
--	if (card->ext_csd.rev > 7) {
--		pr_err("%s: unrecognised EXT_CSD revision %d\n",
--			mmc_hostname(card->host), card->ext_csd.rev);
--		err = -EINVAL;
--		goto out;
--	}
- 
- 	card->ext_csd.raw_sectors[0] = ext_csd[EXT_CSD_SEC_CNT + 0];
- 	card->ext_csd.raw_sectors[1] = ext_csd[EXT_CSD_SEC_CNT + 1];

src/patches/linux-3.2.33_ipg-fix-driver-name.patch

@@ -1,15 +0,0 @@
-Patch by Arne Fitzenreiter <arne_f@ipfire.org>
-Fix PHYSDEVDRIVER from "Sundance IPG ..." to the modulname (ipg)
-
-diff -Naur linux-3.2.33.org/drivers/net/ethernet/icplus/ipg.c linux-3.2.33/drivers/net/ethernet/icplus/ipg.c
---- linux-3.2.33.org/drivers/net/ethernet/icplus/ipg.c	2012-10-31 00:27:11.000000000 +0100
-+++ linux-3.2.33/drivers/net/ethernet/icplus/ipg.c	2012-11-05 20:02:36.529101528 +0100
-@@ -2304,7 +2304,7 @@
- }
- 
- static struct pci_driver ipg_pci_driver = {
--	.name		= IPG_DRIVER_NAME,
-+	.name		= DRV_NAME,
- 	.id_table	= ipg_pci_tbl,
- 	.probe		= ipg_probe,
- 	.remove		= __devexit_p(ipg_remove),

src/patches/linux-3.7-disable-compat_vdso.patch

@@ -1,46 +0,0 @@
-No need to wrap vdso calls as gentoo does not use any version of 
-glibc <=2.3.3
----
-From: Gordon Malm <gengor@gentoo.org>
-From: Kerin Millar <kerframil@gmail.com>
-From: Jory A. Pratt	<anarchy@gentoo.org>
-
-COMPAT_VDSO is inappropriate for any modern Hardened Gentoo system. It
-conflicts with various parts of PaX, crashing the system if enabled
-while PaX's NOEXEC or UDEREF features are active. Moreover, it prevents
-a number of important PaX options from appearing in the configuration
-menu, including all PaX NOEXEC implementations. Unfortunately, the
-reason for the disappearance of these PaX configuration options is
-often far from obvious to inexperienced users.
-
-Therefore, we disable the COMPAT_VDSO menu entry entirely. However,
-COMPAT_VDSO operation can still be enabled via bootparam and sysctl
-interfaces. Consequently, we must also disable the ability to select
-COMPAT_VDSO operation at boot or runtime. Here we patch the kernel so
-that selecting COMPAT_VDSO operation at boot/runtime has no effect if
-conflicting PaX options are enabled, leaving VDSO_ENABLED operation
-intact.
-
-Closes bug: http://bugs.gentoo.org/show_bug.cgi?id=210138
-
-diff -urp a/arch/x86/Kconfig b/arch/x86/Kconfig
---- a/arch/x86/Kconfig	2009-07-31 01:36:57.323857684 +0100
-+++ b/arch/x86/Kconfig	2009-07-31 01:51:39.395749681 +0100
-@@ -1651,17 +1651,8 @@
- 
- config COMPAT_VDSO
- 	def_bool n
--	prompt "Compat VDSO support"
- 	depends on X86_32 || IA32_EMULATION
- 	depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
--	---help---
--	  Map the 32-bit VDSO to the predictable old-style address too.
--
--	  Say N here if you are running a sufficiently recent glibc
--	  version (2.3.3 or later), to remove the high-mapped
--	  VDSO mapping and to exclusively use the randomized VDSO.
--
--	  If unsure, say Y.
- 
- config CMDLINE_BOOL
- 	bool "Built-in kernel command line"

src/patches/linux-hyperv_Mark_the_Hyoer-V_TSC_as_unstable.patch

@@ -1,47 +0,0 @@
-From 88c9281a9fba67636ab26c1fd6afbc78a632374f Mon Sep 17 00:00:00 2001
-From: Vitaly Kuznetsov <vkuznets@redhat.com>
-Date: Wed, 19 Aug 2015 09:54:24 -0700
-Subject: x86/hyperv: Mark the Hyper-V TSC as unstable
-
-The Hyper-V top-level functional specification states, that
-"algorithms should be resilient to sudden jumps forward or
-backward in the TSC value", this means that we should consider
-TSC as unstable. In some cases tsc tests are able to detect the
-instability, it was detected in 543 out of 646 boots in my
-testing:
-
- Measured 6277 cycles TSC warp between CPUs, turning off TSC clock.
- tsc: Marking TSC unstable due to check_tsc_sync_source failed
-
-This is, however, just a heuristic. On Hyper-V platform there
-are two good clocksources: MSR-based hyperv_clocksource and
-recently introduced TSC page.
-
-Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
-Cc: Haiyang Zhang <haiyangz@microsoft.com>
-Cc: K. Y. Srinivasan <kys@microsoft.com>
-Cc: Linus Torvalds <torvalds@linux-foundation.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: devel@linuxdriverproject.org
-Link: http://lkml.kernel.org/r/1440003264-9949-1-git-send-email-vkuznets@redhat.com
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
----
- arch/x86/kernel/cpu/mshyperv.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
-index aad4bd8..6fd023d 100644
---- a/arch/x86/kernel/cpu/mshyperv.c
-+++ b/arch/x86/kernel/cpu/mshyperv.c
-@@ -141,6 +141,7 @@ static void __init ms_hyperv_init_platform(void)
- 	no_timer_check = 1;
- #endif
- 
-+	mark_tsc_unstable("running on Hyper-V");
- }
- 
- const __refconst struct hypervisor_x86 x86_hyper_ms_hyperv = {
--- 
-cgit v0.12
-

src/patches/linux/0001-Drivers-net-hyperv-Get-rid-of-the-rndis_filter_packe.patch

@@ -1,129 +0,0 @@
-From f3f885fa684ff18fa4d223dc22b782f5e5d32560 Mon Sep 17 00:00:00 2001
-From: KY Srinivasan <kys@microsoft.com>
-Date: Sun, 16 Feb 2014 16:38:43 -0800
-Subject: [PATCH 01/25] Drivers: net: hyperv: Get rid of the
- rndis_filter_packet structure
-
-This structure is redundant; get rid of it make the code little more efficient -
-get rid of the unnecessary indirection.
-
-Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
-Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- drivers/net/hyperv/hyperv_net.h   |  6 ------
- drivers/net/hyperv/netvsc_drv.c   |  2 +-
- drivers/net/hyperv/rndis_filter.c | 41 +++------------------------------------
- 3 files changed, 4 insertions(+), 45 deletions(-)
-
-diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
-index 7b594ce3f21d..7645ba38bde8 100644
---- a/drivers/net/hyperv/hyperv_net.h
-+++ b/drivers/net/hyperv/hyperv_net.h
-@@ -846,12 +846,6 @@ struct rndis_message {
- };
- 
- 
--struct rndis_filter_packet {
--	void *completion_ctx;
--	void (*completion)(void *context);
--	struct rndis_message msg;
--};
--
- /* Handy macros */
- 
- /* get the size of an RNDIS message. Pass in the message type, */
-diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
-index 3c1c33ceffba..28020f83ba6f 100644
---- a/drivers/net/hyperv/netvsc_drv.c
-+++ b/drivers/net/hyperv/netvsc_drv.c
-@@ -156,7 +156,7 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
- 	/* Allocate a netvsc packet based on # of frags. */
- 	packet = kzalloc(sizeof(struct hv_netvsc_packet) +
- 			 (num_pages * sizeof(struct hv_page_buffer)) +
--			 sizeof(struct rndis_filter_packet) +
-+			 sizeof(struct rndis_message) +
- 			 NDIS_VLAN_PPI_SIZE, GFP_ATOMIC);
- 	if (!packet) {
- 		/* out of memory, drop packet */
-diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
-index b54fd257652b..6a9f6021f09c 100644
---- a/drivers/net/hyperv/rndis_filter.c
-+++ b/drivers/net/hyperv/rndis_filter.c
-@@ -58,9 +58,6 @@ struct rndis_request {
- 	u8 request_ext[RNDIS_EXT_LEN];
- };
- 
--static void rndis_filter_send_completion(void *ctx);
--
--
- static struct rndis_device *get_rndis_device(void)
- {
- 	struct rndis_device *device;
-@@ -297,7 +294,7 @@ static void rndis_filter_receive_response(struct rndis_device *dev,
- 				"rndis response buffer overflow "
- 				"detected (size %u max %zu)\n",
- 				resp->msg_len,
--				sizeof(struct rndis_filter_packet));
-+				sizeof(struct rndis_message));
- 
- 			if (resp->ndis_msg_type ==
- 			    RNDIS_MSG_RESET_C) {
-@@ -917,17 +914,14 @@ int rndis_filter_close(struct hv_device *dev)
- int rndis_filter_send(struct hv_device *dev,
- 			     struct hv_netvsc_packet *pkt)
- {
--	int ret;
--	struct rndis_filter_packet *filter_pkt;
- 	struct rndis_message *rndis_msg;
- 	struct rndis_packet *rndis_pkt;
- 	u32 rndis_msg_size;
- 	bool isvlan = pkt->vlan_tci & VLAN_TAG_PRESENT;
- 
- 	/* Add the rndis header */
--	filter_pkt = (struct rndis_filter_packet *)pkt->extension;
-+	rndis_msg = (struct rndis_message *)pkt->extension;
- 
--	rndis_msg = &filter_pkt->msg;
- 	rndis_msg_size = RNDIS_MESSAGE_SIZE(struct rndis_packet);
- 	if (isvlan)
- 		rndis_msg_size += NDIS_VLAN_PPI_SIZE;
-@@ -980,34 +974,5 @@ int rndis_filter_send(struct hv_device *dev,
- 		pkt->page_buf[1].len = rndis_msg_size - pkt->page_buf[0].len;
- 	}
- 
--	/* Save the packet send completion and context */
--	filter_pkt->completion = pkt->completion.send.send_completion;
--	filter_pkt->completion_ctx =
--				pkt->completion.send.send_completion_ctx;
--
--	/* Use ours */
--	pkt->completion.send.send_completion = rndis_filter_send_completion;
--	pkt->completion.send.send_completion_ctx = filter_pkt;
--
--	ret = netvsc_send(dev, pkt);
--	if (ret != 0) {
--		/*
--		 * Reset the completion to originals to allow retries from
--		 * above
--		 */
--		pkt->completion.send.send_completion =
--				filter_pkt->completion;
--		pkt->completion.send.send_completion_ctx =
--				filter_pkt->completion_ctx;
--	}
--
--	return ret;
--}
--
--static void rndis_filter_send_completion(void *ctx)
--{
--	struct rndis_filter_packet *filter_pkt = ctx;
--
--	/* Pass it back to the original handler */
--	filter_pkt->completion(filter_pkt->completion_ctx);
-+	return netvsc_send(dev, pkt);
- }
--- 
-2.4.3
-