diff --git a/patch.sh b/patch.sh index 4836be69204aab19e720a76baa28534b7f5a43a3..5f47ebd20da8c76f14c14a634c2236f8ed6edb84 100644 --- a/patch.sh +++ b/patch.sh @@ -103,6 +103,90 @@ external_git () { ${git_bin} describe } +aufs_fail () { + echo "aufs failed" + exit 2 +} + +aufs () { + aufs_prefix="aufs5-" + #regenerate="enable" + if [ "x${regenerate}" = "xenable" ] ; then + KERNEL_REL=5.10 + wget https://raw.githubusercontent.com/sfjro/${aufs_prefix}standalone/aufs${KERNEL_REL}/${aufs_prefix}kbuild.patch + patch -p1 < ${aufs_prefix}kbuild.patch || aufs_fail + rm -rf ${aufs_prefix}kbuild.patch + ${git_bin} add . + ${git_bin} commit -a -m 'merge: aufs-kbuild' -s + + wget https://raw.githubusercontent.com/sfjro/${aufs_prefix}standalone/aufs${KERNEL_REL}/${aufs_prefix}base.patch + patch -p1 < ${aufs_prefix}base.patch || aufs_fail + rm -rf ${aufs_prefix}base.patch + ${git_bin} add . + ${git_bin} commit -a -m 'merge: aufs-base' -s + + wget https://raw.githubusercontent.com/sfjro/${aufs_prefix}standalone/aufs${KERNEL_REL}/${aufs_prefix}mmap.patch + patch -p1 < ${aufs_prefix}mmap.patch || aufs_fail + rm -rf ${aufs_prefix}mmap.patch + ${git_bin} add . + ${git_bin} commit -a -m 'merge: aufs-mmap' -s + + wget https://raw.githubusercontent.com/sfjro/${aufs_prefix}standalone/aufs${KERNEL_REL}/${aufs_prefix}standalone.patch + patch -p1 < ${aufs_prefix}standalone.patch || aufs_fail + rm -rf ${aufs_prefix}standalone.patch + ${git_bin} add . + ${git_bin} commit -a -m 'merge: aufs-standalone' -s + + ${git_bin} format-patch -4 -o ../patches/aufs/ + + cd ../ + if [ ! -d ./${aufs_prefix}standalone ] ; then + ${git_bin} clone -b aufs${KERNEL_REL} https://github.com/sfjro/${aufs_prefix}standalone --depth=1 + cd ./${aufs_prefix}standalone/ + aufs_hash=$(git rev-parse HEAD) + cd - + else + rm -rf ./${aufs_prefix}standalone || true + ${git_bin} clone -b aufs${KERNEL_REL} https://github.com/sfjro/${aufs_prefix}standalone --depth=1 + cd ./${aufs_prefix}standalone/ + aufs_hash=$(git rev-parse HEAD) + cd - + fi + cd ./KERNEL/ + KERNEL_REL=5.10 + + cp -v ../${aufs_prefix}standalone/Documentation/ABI/testing/*aufs ./Documentation/ABI/testing/ + mkdir -p ./Documentation/filesystems/aufs/ + cp -rv ../${aufs_prefix}standalone/Documentation/filesystems/aufs/* ./Documentation/filesystems/aufs/ + mkdir -p ./fs/aufs/ + cp -v ../${aufs_prefix}standalone/fs/aufs/* ./fs/aufs/ + cp -v ../${aufs_prefix}standalone/include/uapi/linux/aufs_type.h ./include/uapi/linux/ + + ${git_bin} add . + ${git_bin} commit -a -m 'merge: aufs' -m "https://github.com/sfjro/${aufs_prefix}standalone/commit/${aufs_hash}" -s + ${git_bin} format-patch -5 -o ../patches/aufs/ + echo "AUFS: https://github.com/sfjro/${aufs_prefix}standalone/commit/${aufs_hash}" > ../patches/git/AUFS + + rm -rf ../${aufs_prefix}standalone/ || true + + ${git_bin} reset --hard HEAD~5 + + start_cleanup + + ${git} "${DIR}/patches/aufs/0001-merge-aufs-kbuild.patch" + ${git} "${DIR}/patches/aufs/0002-merge-aufs-base.patch" + ${git} "${DIR}/patches/aufs/0003-merge-aufs-mmap.patch" + ${git} "${DIR}/patches/aufs/0004-merge-aufs-standalone.patch" + ${git} "${DIR}/patches/aufs/0005-merge-aufs.patch" + + wdir="aufs" + number=5 + cleanup + fi + + dir 'aufs' +} + wpanusb () { #regenerate="enable" if [ "x${regenerate}" = "xenable" ] ; then @@ -290,6 +374,7 @@ local_patch () { } #external_git +#aufs wpanusb #rt ti_pm_firmware diff --git a/patches/defconfig b/patches/defconfig index 7ec76e8ba5f253d9a5bebb8d07a0788eaaae1649..2ae33b8bcca897a597f79a6e1365a2772e59bb9b 100644 --- a/patches/defconfig +++ b/patches/defconfig @@ -427,7 +427,7 @@ CONFIG_ARM_ERRATA_773022=y # # Bus support # -# CONFIG_ARM_ERRATA_814220 is not set +CONFIG_ARM_ERRATA_814220=y # end of Bus support # @@ -604,10 +604,10 @@ CONFIG_EFI_ESRT=y CONFIG_EFI_PARAMS_FROM_FDT=y CONFIG_EFI_RUNTIME_WRAPPERS=y CONFIG_EFI_GENERIC_STUB=y -CONFIG_EFI_ARMSTUB_DTB_LOADER=y -CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y -# CONFIG_EFI_BOOTLOADER_CONTROL is not set -# CONFIG_EFI_CAPSULE_LOADER is not set +# CONFIG_EFI_ARMSTUB_DTB_LOADER is not set +# CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER is not set +CONFIG_EFI_BOOTLOADER_CONTROL=m +CONFIG_EFI_CAPSULE_LOADER=m # CONFIG_EFI_TEST is not set # CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_EFI_DISABLE_PCI_DMA is not set @@ -1075,11 +1075,11 @@ CONFIG_NFT_COMPAT=m CONFIG_NFT_HASH=m CONFIG_NFT_FIB=m CONFIG_NFT_FIB_INET=m -# CONFIG_NFT_XFRM is not set +CONFIG_NFT_XFRM=m CONFIG_NFT_SOCKET=m CONFIG_NFT_OSF=m CONFIG_NFT_TPROXY=m -# CONFIG_NFT_SYNPROXY is not set +CONFIG_NFT_SYNPROXY=m CONFIG_NF_DUP_NETDEV=m CONFIG_NFT_DUP_NETDEV=m CONFIG_NFT_FWD_NETDEV=m @@ -1310,7 +1310,7 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=m CONFIG_IP6_NF_MATCH_MH=m CONFIG_IP6_NF_MATCH_RPFILTER=m CONFIG_IP6_NF_MATCH_RT=m -# CONFIG_IP6_NF_MATCH_SRH is not set +CONFIG_IP6_NF_MATCH_SRH=m CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_TARGET_REJECT=m @@ -1325,10 +1325,10 @@ CONFIG_IP6_NF_TARGET_NPT=m CONFIG_NF_DEFRAG_IPV6=m CONFIG_NF_TABLES_BRIDGE=m -# CONFIG_NFT_BRIDGE_META is not set +CONFIG_NFT_BRIDGE_META=m CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NF_LOG_BRIDGE=m -# CONFIG_NF_CONNTRACK_BRIDGE is not set +CONFIG_NF_CONNTRACK_BRIDGE=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -2970,6 +2970,7 @@ CONFIG_TTY_PRINTK=m CONFIG_TTY_PRINTK_LEVEL=6 CONFIG_VIRTIO_CONSOLE=m # CONFIG_IPMI_HANDLER is not set +# CONFIG_IPMB_DEVICE_INTERFACE is not set CONFIG_HW_RANDOM=y # CONFIG_HW_RANDOM_TIMERIOMEM is not set # CONFIG_HW_RANDOM_BA431 is not set @@ -3056,7 +3057,9 @@ CONFIG_I2C_TINY_USB=m # end of I2C Hardware Bus support # CONFIG_I2C_STUB is not set -# CONFIG_I2C_SLAVE is not set +CONFIG_I2C_SLAVE=y +# CONFIG_I2C_SLAVE_EEPROM is not set +# CONFIG_I2C_SLAVE_TESTUNIT is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set @@ -4881,7 +4884,8 @@ CONFIG_SND_SOC_AK4554=m # CONFIG_SND_SOC_CS35L35 is not set # CONFIG_SND_SOC_CS35L36 is not set # CONFIG_SND_SOC_CS42L42 is not set -# CONFIG_SND_SOC_CS42L51_I2C is not set +CONFIG_SND_SOC_CS42L51=m +CONFIG_SND_SOC_CS42L51_I2C=m # CONFIG_SND_SOC_CS42L52 is not set # CONFIG_SND_SOC_CS42L56 is not set # CONFIG_SND_SOC_CS42L73 is not set @@ -5012,7 +5016,7 @@ CONFIG_SND_SOC_TPA6130A2=m CONFIG_SND_SIMPLE_CARD_UTILS=y CONFIG_SND_SIMPLE_CARD=y -# CONFIG_SND_AUDIO_GRAPH_CARD is not set +CONFIG_SND_AUDIO_GRAPH_CARD=m # # HID support @@ -5697,7 +5701,7 @@ CONFIG_RTC_DRV_DS1685=y # CONFIG_RTC_DRV_DS17885 is not set CONFIG_RTC_DRV_DS1742=m CONFIG_RTC_DRV_DS2404=m -# CONFIG_RTC_DRV_EFI is not set +CONFIG_RTC_DRV_EFI=y CONFIG_RTC_DRV_STK17TA8=m CONFIG_RTC_DRV_M48T86=m CONFIG_RTC_DRV_M48T35=m diff --git a/repo_maintenance/push-kernel-n-test.sh b/repo_maintenance/push-kernel-n-test.sh index 37786a11231b728eb7de40bdcc71d87ba69b56e3..3383079c27abb6a34478b1ceaa2d6c20958bc680 100755 --- a/repo_maintenance/push-kernel-n-test.sh +++ b/repo_maintenance/push-kernel-n-test.sh @@ -6,6 +6,10 @@ wfile=$(mktemp /tmp/builder.XXXXXXXXX) echo "Working on temp $wfile ..." cat_files () { + if [ -f ./patches/git/AUFS ] ; then + cat ./patches/git/AUFS >> ${wfile} + fi + if [ -f ./patches/git/BBDTBS ] ; then cat ./patches/git/BBDTBS >> ${wfile} fi diff --git a/version.sh b/version.sh index c9025ebe9872d814ec491b19467fc8c5a3f15e46..cf61b8f447272599f728ecdadfe34405bb7a67c8 100644 --- a/version.sh +++ b/version.sh @@ -45,7 +45,7 @@ KERNEL_REL=5.11 KERNEL_TAG=${KERNEL_REL}-rc5 kernel_rt=".x-rty" #Kernel Build -BUILD=${build_prefix}6.1 +BUILD=${build_prefix}6.2 #v5.X-rcX + upto SHA #prev_KERNEL_SHA=""