1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter.git synced 2025-03-09 15:40:20 +00:00

Update to kernel 4.9

This commit is contained in:
Ycarus 2018-02-27 21:54:33 +01:00
parent e6b86debde
commit 6e71179f84
8 changed files with 51774 additions and 34 deletions

View file

@ -32,9 +32,10 @@ if [ ! -f "$OMR_TARGET_CONFIG" ]; then
fi
#_get_repo source https://github.com/ysurac/openmptcprouter-source "master"
_get_repo "$OMR_TARGET/source" https://github.com/lede-project/source.git "lede-17.01"
_get_repo "$OMR_TARGET/source" https://github.com/lede-project/source.git "master"
_get_repo feeds/packages https://github.com/openwrt/packages "master"
_get_repo feeds/luci https://github.com/openwrt/luci "lede-17.01"
#_get_repo feeds/luci https://github.com/openwrt/luci "lede-17.01"
_get_repo feeds/luci https://github.com/openwrt/luci "master"
if [ -z "$OMR_FEED" ]; then
OMR_FEED=feeds/openmptcprouter
@ -83,10 +84,10 @@ if [ "$OMR_IMG" = "yes" ] && [ "$OMR_TARGET" = "x86_64" ]; then
echo 'CONFIG_VMDK_IMAGES=y' >> "$OMR_TARGET/source/.config"
fi
echo "Building $OMR_DIST for the target $OMR_TARGET"
cd "$OMR_TARGET/source"
echo "Checking if UEFI patch is set or not"
if [ "$OMR_UEFI" = "yes" ] && [ "$OMR_TARGET" = "x86_64" ]; then
if ! patch -Rf -N -p1 -s --dry-run < ../../patches/uefi.patch; then
patch -N -p1 -s < ../../patches/uefi.patch
@ -97,11 +98,20 @@ else
fi
fi
echo "Done"
echo "Set to kernel 4.9 for all arch"
find target/linux/ -type f -name Makefile -exec sed -i 's%KERNEL_PATCHVER:=4.14%KERNEL_PATCHVER:=4.9%g' {} \;
echo "Done"
echo "Update feeds index"
cp .config .config.keep
scripts/feeds clean
scripts/feeds update -a
scripts/feeds install -a -d y -f -p openmptcprouter
cp .config.keep .config
echo "Done"
echo "Building $OMR_DIST for the target $OMR_TARGET"
make defconfig
make "$@"
echo "Done"

5
config
View file

@ -171,3 +171,8 @@ CONFIG_PACKAGE_kmod-via-rhine=y
CONFIG_PACKAGE_kmod-via-velocity=y
CONFIG_PACKAGE_kmod-vmxnet3=y
CONFIG_TARGET_IMAGES_PAD=y
CONFIG_KERNEL_TCP_CONG_LIA=y
CONFIG_KERNEL_TCP_CONG_OLIA=y
CONFIG_KERNEL_TCP_CONG_WVEGAS=y
CONFIG_KERNEL_TCP_CONG_BALIA=y
CONFIG_KERNEL_MPTCP=y

View file

@ -72,11 +72,11 @@ index 965737ac63..d2a9e0ec0e 100644
grub-mkimage \
-p /boot/grub \
-d $(STAGING_DIR_HOST)/lib/grub/i386-pc \
diff --git a/target/linux/x86/image/gen_image_generic.sh b/target/linux/x86/image/gen_image_generic.sh
diff --git a/scripts/gen_image_generic.sh b/scripts/gen_image_generic.sh
index 17d969b96b..abb1abf5d1 100755
--- a/target/linux/x86/image/gen_image_generic.sh
+++ b/target/linux/x86/image/gen_image_generic.sh
@@ -15,23 +15,20 @@ ALIGN="$6"
--- a/scripts/gen_image_generic.sh
+++ b/scripts/gen_image_generic.sh
@@ -15,21 +15,18 @@ ALIGN="$6"
rm -f "$OUTPUT"
@ -100,8 +100,6 @@ index 17d969b96b..abb1abf5d1 100755
+[ -n "$PADDING" ] && dd if=/dev/zero of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" count="$ROOTFSCOUNT"
dd if="$ROOTFSIMAGE" of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc
[ -n "$NOGRUB" ] && exit 0
-make_ext4fs -J -l "$KERNELSIZE" "$OUTPUT.kernel" "$KERNELDIR"
+mkfs.fat -C -n BOOT "$OUTPUT.kernel" "$KERNELCOUNT"
+mcopy -s -i "$OUTPUT.kernel" "$KERNELDIR"/* ::/
@ -114,11 +112,11 @@ index acca036a2e..8169108ac4 100644
@@ -6,8 +6,8 @@ set timeout="@TIMEOUT@"
set root='(@ROOT@)'
menuentry "LEDE" {
menuentry "OpenWrt" {
- linux /boot/vmlinuz @CMDLINE@ noinitrd
+ linux /efi/boot/linux.efi @CMDLINE@ noinitrd
}
menuentry "LEDE (failsafe)" {
menuentry "OpenWrt (failsafe)" {
- linux /boot/vmlinuz failsafe=true @CMDLINE@ noinitrd
+ linux /efi/boot/linux.efi failsafe=true @CMDLINE@ noinitrd
}

File diff suppressed because it is too large Load diff

View file

@ -82,7 +82,7 @@ CONFIG_32BIT=y
# CONFIG_ADM6996_PHY is not set
# CONFIG_ADM8211 is not set
# CONFIG_ADT7316 is not set
# CONFIG_ADVISE_SYSCALLS is not set
CONFIG_ADVISE_SYSCALLS=y
# CONFIG_ADXRS450 is not set
CONFIG_AEABI=y
# CONFIG_AFFS_FS is not set
@ -208,6 +208,14 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
# CONFIG_ARCH_ZYNQ is not set
# CONFIG_ARCNET is not set
# CONFIG_ARC_EMAC is not set
# CONFIG_ARM64_ERRATUM_819472 is not set
# CONFIG_ARM64_ERRATUM_824069 is not set
# CONFIG_ARM64_ERRATUM_826319 is not set
# CONFIG_ARM64_ERRATUM_827319 is not set
# CONFIG_ARM64_ERRATUM_832075 is not set
# CONFIG_ARM64_ERRATUM_834220 is not set
# CONFIG_ARM64_ERRATUM_843419 is not set
# CONFIG_ARM64_ERRATUM_845719 is not set
# CONFIG_ARM_APPENDED_DTB is not set
# CONFIG_ARM_ARCH_TIMER is not set
# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
@ -215,8 +223,8 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
# CONFIG_ARM_CCI400_PMU is not set
# CONFIG_ARM_CCI500_PMU is not set
# CONFIG_ARM_CCN is not set
CONFIG_ARM_CPU_TOPOLOGY=y
# CONFIG_ARM_CPUIDLE is not set
CONFIG_ARM_CPU_TOPOLOGY=y
# CONFIG_ARM_CRYPTO is not set
CONFIG_ARM_DMA_MEM_BUFFERABLE=y
# CONFIG_ARM_ERRATA_326103 is not set
@ -323,8 +331,6 @@ CONFIG_ATM_CLIP_NO_ICMP=y
# CONFIG_B43 is not set
# CONFIG_B43LEGACY is not set
# CONFIG_B44 is not set
# CONFIG_SWCONFIG_B53 is not set
# CONFIG_SWCONFIG_B53_SPI_DRIVER is not set
# CONFIG_BACKLIGHT_ADP8860 is not set
# CONFIG_BACKLIGHT_ADP8870 is not set
# CONFIG_BACKLIGHT_BD6107 is not set
@ -587,6 +593,10 @@ CONFIG_CARDBUS=y
# CONFIG_CARDMAN_4040 is not set
# CONFIG_CARL9170 is not set
# CONFIG_CASSINI is not set
# CONFIG_CAVIUM_ERRATUM_22375 is not set
# CONFIG_CAVIUM_ERRATUM_23144 is not set
# CONFIG_CAVIUM_ERRATUM_23154 is not set
# CONFIG_CAVIUM_ERRATUM_27456 is not set
# CONFIG_CAVIUM_OCTEON_SOC is not set
# CONFIG_CB710_CORE is not set
# CONFIG_CC10001_ADC is not set
@ -900,7 +910,6 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
# CONFIG_DEFAULT_RENO is not set
CONFIG_DEFAULT_SECURITY=""
CONFIG_DEFAULT_SECURITY_DAC=y
CONFIG_DEFAULT_TCP_CONG="olia"
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
# CONFIG_DELL_RBTN is not set
# CONFIG_DELL_SMO8800 is not set
@ -915,7 +924,6 @@ CONFIG_DEVPORT=y
# CONFIG_DGAP is not set
# CONFIG_DGNC is not set
# CONFIG_DHT11 is not set
# CONFIG_DIRECT_IO is not set
# CONFIG_DISCONTIGMEM_MANUAL is not set
# CONFIG_DISPLAY_CONNECTOR_ANALOG_TV is not set
# CONFIG_DISPLAY_CONNECTOR_DVI is not set
@ -1392,6 +1400,7 @@ CONFIG_HW_PERF_EVENTS=y
# CONFIG_HW_RANDOM_OMAP3_ROM is not set
# CONFIG_HW_RANDOM_PPC4XX is not set
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
# CONFIG_HW_RANDOM_TPM is not set
# CONFIG_HW_RANDOM_VIA is not set
# CONFIG_HW_RANDOM_VIRTIO is not set
# CONFIG_HYPERV is not set
@ -1446,9 +1455,9 @@ CONFIG_HZ_100=y
# CONFIG_I2C_MPC is not set
# CONFIG_I2C_MUX is not set
# CONFIG_I2C_MUX_GPIO is not set
# CONFIG_I2C_MUX_PINCTRL is not set
# CONFIG_I2C_MUX_PCA9541 is not set
# CONFIG_I2C_MUX_PCA954x is not set
# CONFIG_I2C_MUX_PINCTRL is not set
# CONFIG_I2C_MUX_REG is not set
# CONFIG_I2C_MV64XXX is not set
# CONFIG_I2C_NFORCE2 is not set
@ -1699,7 +1708,7 @@ CONFIG_IPW2200_MONITOR=y
CONFIG_IP_ADVANCED_ROUTER=y
# CONFIG_IP_DCCP is not set
# CONFIG_IP_FIB_TRIE_STATS is not set
CONFIG_IP_MROUTE=y
# CONFIG_IP_MROUTE is not set
CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
CONFIG_IP_MULTICAST=y
CONFIG_IP_MULTIPLE_TABLES=y
@ -1810,6 +1819,7 @@ CONFIG_JOLIET=y
# CONFIG_KALLSYMS_ALL is not set
# CONFIG_KALLSYMS_UNCOMPRESSED is not set
# CONFIG_KARMA_PARTITION is not set
# CONFIG_KASAN is not set
# CONFIG_KERNEL_BZIP2 is not set
# CONFIG_KERNEL_CAT is not set
# CONFIG_KERNEL_GZIP is not set
@ -1872,6 +1882,7 @@ CONFIG_KUSER_HELPERS=y
# CONFIG_L2TP_V3 is not set
# CONFIG_LANMEDIA is not set
# CONFIG_LANTIQ is not set
# CONFIG_LANTIQ_PHY is not set
# CONFIG_LAPB is not set
# CONFIG_LASAT is not set
# CONFIG_LATENCYTOP is not set
@ -2365,7 +2376,9 @@ CONFIG_MTD_SPLIT=y
# CONFIG_MTD_SPLIT_FIRMWARE is not set
CONFIG_MTD_SPLIT_FIRMWARE_NAME="firmware"
# CONFIG_MTD_SPLIT_FIT_FW is not set
# CONFIG_MTD_SPLIT_JIMAGE_FW is not set
# CONFIG_MTD_SPLIT_LZMA_FW is not set
# CONFIG_MTD_SPLIT_MINOR_FW is not set
# CONFIG_MTD_SPLIT_SEAMA_FW is not set
CONFIG_MTD_SPLIT_SQUASHFS_ROOT=y
CONFIG_MTD_SPLIT_SUPPORT=y
@ -2595,8 +2608,8 @@ CONFIG_NET_VENDOR_AGERE=y
CONFIG_NET_VENDOR_ALTEON=y
CONFIG_NET_VENDOR_AMD=y
CONFIG_NET_VENDOR_ARC=y
CONFIG_NET_VENDOR_AURORA=y
CONFIG_NET_VENDOR_ATHEROS=y
CONFIG_NET_VENDOR_AURORA=y
CONFIG_NET_VENDOR_BROADCOM=y
CONFIG_NET_VENDOR_BROCADE=y
CONFIG_NET_VENDOR_CAVIUM=y
@ -2790,6 +2803,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
# CONFIG_NTP_PPS is not set
# CONFIG_NVM is not set
# CONFIG_NVMEM is not set
# CONFIG_NVMEM_IMX_OCOTP is not set
# CONFIG_NVRAM is not set
# CONFIG_NV_TCO is not set
# CONFIG_NXP_STB220 is not set
@ -2968,7 +2982,6 @@ CONFIG_PINCONF=y
CONFIG_PINCTRL_SINGLE=y
CONFIG_PINMUX=y
# CONFIG_PKCS7_MESSAGE_PARSER is not set
# CONFIG_PKCS7_TEST_KEY it not set
# CONFIG_PL320_MBOX is not set
# CONFIG_PLAT_SPEAR is not set
# CONFIG_PLIP is not set
@ -3313,6 +3326,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_SCHEDSTATS is not set
# CONFIG_SCHED_AUTOGROUP is not set
# CONFIG_SCHED_DEBUG is not set
CONFIG_SCHED_HRTICK=y
# CONFIG_SCHED_MC is not set
CONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_SCHED_SMT is not set
@ -3625,13 +3639,13 @@ CONFIG_SERIAL_EARLYCON=y
# CONFIG_SFC is not set
# CONFIG_SFI is not set
# CONFIG_SGETMASK_SYSCALL is not set
# CONFIG_SG_SPLIT is not set
# CONFIG_SGI_IOC4 is not set
# CONFIG_SGI_IP22 is not set
# CONFIG_SGI_IP27 is not set
# CONFIG_SGI_IP28 is not set
# CONFIG_SGI_IP32 is not set
# CONFIG_SGI_PARTITION is not set
# CONFIG_SG_SPLIT is not set
CONFIG_SHMEM=y
# CONFIG_SH_ETH is not set
# CONFIG_SH_TIMER_CMT is not set
@ -3719,8 +3733,8 @@ CONFIG_SND_DRIVERS=y
# CONFIG_SND_DYNAMIC_MINORS is not set
# CONFIG_SND_ECHO3G is not set
# CONFIG_SND_EMU10K1 is not set
# CONFIG_SND_EMU10K1_SEQ is not set
# CONFIG_SND_EMU10K1X is not set
# CONFIG_SND_EMU10K1_SEQ is not set
# CONFIG_SND_ENS1370 is not set
# CONFIG_SND_ENS1371 is not set
# CONFIG_SND_ES1688 is not set
@ -3846,6 +3860,8 @@ CONFIG_SND_PROC_FS=y
# CONFIG_SND_SOC_IMX_SPDIF is not set
# CONFIG_SND_SOC_IMX_WM8962 is not set
# CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH is not set
# CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH is not set
# CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH is not set
# CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH is not set
# CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH is not set
# CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH is not set
@ -4046,6 +4062,8 @@ CONFIG_STRIP_ASM_SYMS=y
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SWAP=y
# CONFIG_SWCONFIG is not set
# CONFIG_SWCONFIG_B53 is not set
# CONFIG_SWCONFIG_B53_SPI_DRIVER is not set
# CONFIG_SWCONFIG_LEDS is not set
# CONFIG_SX9500 is not set
# CONFIG_SXGBE_ETH is not set
@ -4069,11 +4087,20 @@ CONFIG_SYSVIPC_SYSCTL=y
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_T5403 is not set
# CONFIG_TARGET_CORE is not set
# CONFIG_TASK_XACCT is not set
# CONFIG_TASKSTATS is not set
# CONFIG_TASKS_RCU is not set
# CONFIG_TASK_XACCT is not set
# CONFIG_TC35815 is not set
# CONFIG_TCG_ATMEL is not set
# CONFIG_TCG_INFINEON is not set
# CONFIG_TCG_ST33_I2C is not set
# CONFIG_TCG_TIS is not set
# CONFIG_TCG_TIS_I2C_ATMEL is not set
# CONFIG_TCG_TIS_I2C_INFINEON is not set
# CONFIG_TCG_TIS_I2C_NUVOTON is not set
# CONFIG_TCG_TIS_ST33ZP24 is not set
# CONFIG_TCG_TPM is not set
# CONFIG_TCG_XEN is not set
# CONFIG_TCIC is not set
CONFIG_TCP_CONG_ADVANCED=y
# CONFIG_TCP_CONG_BIC is not set
@ -4090,10 +4117,6 @@ CONFIG_TCP_CONG_CUBIC=y
# CONFIG_TCP_CONG_VENO is not set
# CONFIG_TCP_CONG_WESTWOOD is not set
# CONFIG_TCP_CONG_YEAH is not set
CONFIG_TCP_CONG_LIA=y
CONFIG_TCP_CONG_OLIA=y
CONFIG_TCP_CONG_WVEGAS=y
CONFIG_TCP_CONG_BALIA=y
# CONFIG_TCP_MD5SIG is not set
# CONFIG_TCS3414 is not set
# CONFIG_TCS3472 is not set
@ -4231,6 +4254,7 @@ CONFIG_TRAD_SIGNALS=y
# CONFIG_TRANSPARENT_HUGEPAGE is not set
# CONFIG_TREE_RCU is not set
# CONFIG_TREE_RCU_TRACE is not set
# CONFIG_TRUSTED_KEYS is not set
# CONFIG_TSL2583 is not set
# CONFIG_TSL2x7x is not set
# CONFIG_TSL4531 is not set
@ -4306,6 +4330,7 @@ CONFIG_USB_DEFAULT_PERSIST=y
# CONFIG_USB_DWC3_QCOM is not set
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_EG20T is not set
# CONFIG_USB_EHCI_ATH79 is not set
# CONFIG_USB_EHCI_HCD_AT91 is not set
# CONFIG_USB_EHCI_HCD_PPC_OF is not set
# CONFIG_USB_EHCI_MSM is not set
@ -4413,6 +4438,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=2
# CONFIG_USB_LCD is not set
# CONFIG_USB_LD is not set
# CONFIG_USB_LED is not set
# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
# CONFIG_USB_LED_TRIG is not set
# CONFIG_USB_LEGOTOWER is not set
# CONFIG_USB_LINK_LAYER_TEST is not set
@ -4469,7 +4495,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
# CONFIG_USB_OTG_BLACKLIST_HUB is not set
# CONFIG_USB_OTG_FSM is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
# CONFIG_USB_OXU210HP_HCD is not set
# CONFIG_USB_PEGASUS is not set
# CONFIG_USB_PHY is not set
@ -4612,7 +4637,7 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
# CONFIG_VGA_ARB is not set
# CONFIG_VGA_SWITCHEROO is not set
# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
# CONFIG_VHOST_NET is not seta
# CONFIG_VHOST_NET is not set
# CONFIG_VIA_RHINE is not set
# CONFIG_VIA_VELOCITY is not set
# CONFIG_VIDEO_ADV7170 is not set
@ -4809,8 +4834,6 @@ CONFIG_XZ_DEC=y
# CONFIG_XZ_DEC_SPARC is not set
# CONFIG_XZ_DEC_TEST is not set
# CONFIG_XZ_DEC_X86 is not set
# CONFIG_YAFFS_DISABLE_BAD_BLOCK_MARKING is not set
# CONFIG_YAFFS_FS is not set
# CONFIG_YAM is not set
# CONFIG_YELLOWFIN is not set
# CONFIG_YENTA is not set
@ -4830,5 +4853,9 @@ CONFIG_ZONE_DMA_FLAG=1
# CONFIG_ZPOOL is not set
# CONFIG_ZRAM is not set
# CONFIG_ZSMALLOC is not set
# HIST_TRIGGERS is not set
CONFIG_MPTCP=y
CONFIG_TCP_CONG_LIA=y
CONFIG_TCP_CONG_OLIA=y
CONFIG_TCP_CONG_WVEGAS=y
CONFIG_TCP_CONG_BALIA=y
CONFIG_DEFAULT_TCP_CONG="olia"
CONFIG_MPTCP=y

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff