diff --git a/device-lg-hammerhead/APKBUILD b/device-lg-hammerhead/APKBUILD index 62b1cd4b3..76a9b1e30 100644 --- a/device-lg-hammerhead/APKBUILD +++ b/device-lg-hammerhead/APKBUILD @@ -21,4 +21,4 @@ package() { "$pkgdir"/etc/deviceinfo } -sha512sums="a12472500d1047361a9b5708e0a1a384e3174717c0844b4e84882de7d65e17ac48a28a5c41d26d0e0f83796a8ceadb2f461a80df94e0fbdad38c6fe9db25c240 deviceinfo" +sha512sums="d9b34cde62f1de25a8635012ce1cc3a623a238ffb2237c997b74645d4e0df98f98f589c1f9c9f8d2519718d9345dee24b969b6efaa3533e5928a69272d9d997f deviceinfo" diff --git a/linux-lg-hammerhead/APKBUILD b/linux-lg-hammerhead/APKBUILD index 5c8e1d87f..3a7de4fde 100644 --- a/linux-lg-hammerhead/APKBUILD +++ b/linux-lg-hammerhead/APKBUILD @@ -12,7 +12,7 @@ _vendor=lg _flavor=lg-hammerhead _hash="1dae34efb7d2399073ca371c953aafd2ed503849" -_config="hammerhead_defconfig" +_config="config-${_flavor}.armhf" pkgname=linux-${_flavor} pkgver=3.4.0 @@ -25,15 +25,15 @@ arch="armhf" pkgdesc="LineageOS kernel for Nexus 5 hammerhead" url="https://github.com/LineageOS/android_kernel_lge_hammerhead" depends="postmarketos-mkinitfs" -makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev" +makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev python2" options="!strip !check !tracedeps" install= source=" https://github.com/LineageOS/android_kernel_lge_hammerhead/archive/${_hash}.zip + ${_config} compiler-gcc6.h aeea3592a13bf12861943e44fc48f1f270941f8d.patch gpu-msm-fix-gcc5-compile.patch - devtmpfs.patch " subpackages="" license="GPL2" @@ -71,9 +71,11 @@ prepare() { # gcc6 support cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" - mkdir -p "$srcdir"/build - make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" CONFIG_NO_ERROR_ON_MISMATCH=y HOSTCC="$HOSTCC" CROSS_COMPILE=arm-linux-gnueabi- \ - ${_config} + mkdir -p "$srcdir"/build + cp "$srcdir"/$_config "$srcdir"/build/.config || return 1 + echo "--[ silentoldconfig ]--" + yes "" | make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \ + oldconfig } @@ -81,6 +83,7 @@ prepare() { # this is so we can do: 'abuild menuconfig' to reconfigure kernel menuconfig() { cd "$srcdir"/build || return 1 + echo "--[ menuconfig ]--" make ARCH="$_carch" menuconfig cp .config "$startdir"/$_config } @@ -91,6 +94,10 @@ build() { make ARCH="$_carch" CC="${CC:-gcc}" \ KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \ || return 1 + #echo "--[ Build modules ]--" + #make ARCH="$_carch" CC="${CC:-gcc}" \ + # KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \ + # modules || return 1 } package() { @@ -99,10 +106,18 @@ package() { install -D "$srcdir/build/include/config/kernel.release" \ "$pkgdir/usr/share/kernel/$_flavor/kernel.release" + + #cd "$srcdir"/build + #unset LDFLAGS + #echo "--[ Installing modules ]--" + #make ARCH="$_carch" CC="${CC:-gcc}" \ + # KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \ + # INSTALL_MOD_PATH="$pkgdir" modules_install \ + # || return 1 } sha512sums="882ec7d4ce3eadb372c1279f53fab18c5c7f18109d3df2c8c4005ec5d06e6244c2c788c3183defa4d4aaf493a5c1bf905d8bd2aeb554e4b0680b0e1b45de6742 1dae34efb7d2399073ca371c953aafd2ed503849.zip +9e6c0bfc684fc271598208bdbf11e445df388166e6038271d6663ef863bcea10237ef435654db085cb64d669609382f58291aca0e0fbc4b302f540f916f4bfc0 config-lg-hammerhead.armhf d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc compiler-gcc6.h ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864 aeea3592a13bf12861943e44fc48f1f270941f8d.patch -7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881 gpu-msm-fix-gcc5-compile.patch -71fb635ddac4faee90a2454231e50ac4ba9c273447f3e4c373034e6bce1414fd987bcfc8f7592751debe88230c4e164da7cfe339273510ec3d8f934120ab00f3 devtmpfs.patch" +7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881 gpu-msm-fix-gcc5-compile.patch" diff --git a/linux-lg-hammerhead/config-lg-hammerhead.armhf b/linux-lg-hammerhead/config-lg-hammerhead.armhf index 39ed40e5a..3495a8b35 100644 --- a/linux-lg-hammerhead/config-lg-hammerhead.armhf +++ b/linux-lg-hammerhead/config-lg-hammerhead.armhf @@ -158,7 +158,6 @@ CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y # CONFIG_OPROFILE is not set CONFIG_HAVE_OPROFILE=y -# CONFIG_KPROBES is not set # CONFIG_JUMP_LABEL is not set CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y @@ -185,12 +184,7 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 -CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set -CONFIG_MODULE_UNLOAD=y -# CONFIG_MODULE_FORCE_UNLOAD is not set -# CONFIG_MODVERSIONS is not set -# CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_MODULES is not set CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_LBDAF=y @@ -673,8 +667,8 @@ CONFIG_CP_ACCESS=y CONFIG_USE_OF=y CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE=y CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAMES="" -CONFIG_ZBOOT_ROM_TEXT=0 -CONFIG_ZBOOT_ROM_BSS=0 +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 # CONFIG_ARM_APPENDED_DTB is not set CONFIG_CMDLINE="" # CONFIG_XIP_KERNEL is not set @@ -1014,7 +1008,7 @@ CONFIG_IP6_NF_IPTABLES=y # CONFIG_IP6_NF_MATCH_HL is not set # CONFIG_IP6_NF_MATCH_IPV6HEADER is not set # CONFIG_IP6_NF_MATCH_MH is not set -# CONFIG_IP6_NF_MATCH_RPFILTER is not set +CONFIG_IP6_NF_MATCH_RPFILTER=y # CONFIG_IP6_NF_MATCH_RT is not set # CONFIG_IP6_NF_TARGET_HL is not set CONFIG_IP6_NF_FILTER=y @@ -1138,7 +1132,6 @@ CONFIG_XPS=y # CONFIG_NETPRIO_CGROUP is not set CONFIG_BQL=y CONFIG_HAVE_BPF_JIT=y -# CONFIG_BPF_JIT is not set # # Network testing @@ -1221,8 +1214,8 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_GENERIC_CPU_DEVICES is not set CONFIG_SOC_BUS=y CONFIG_REGMAP=y -CONFIG_REGMAP_I2C=m -CONFIG_REGMAP_SPI=m +CONFIG_REGMAP_I2C=y +CONFIG_REGMAP_SPI=y CONFIG_DMA_SHARED_BUFFER=y # CONFIG_GENLOCK is not set CONFIG_SYNC=y @@ -1367,7 +1360,6 @@ CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_LOGGING=y CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_SCSI_WAIT_SCAN=m # # SCSI Transports @@ -1789,7 +1781,6 @@ CONFIG_I2C_QUP=y # # Other I2C/SMBus bus drivers # -# CONFIG_I2C_STUB is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set @@ -1908,7 +1899,7 @@ CONFIG_SMB349_CHARGER=y # CONFIG_BATTERY_BQ27520 is not set # CONFIG_BATTERY_BQ27541 is not set # CONFIG_BATTERY_BQ28400 is not set -CONFIG_QPNP_CHARGER=m +CONFIG_QPNP_CHARGER=y # CONFIG_LTC4088_CHARGER is not set # CONFIG_BATTERY_BCL is not set # CONFIG_CHARGER_SMB347 is not set @@ -2025,8 +2016,8 @@ CONFIG_THERMAL_HWMON=y # CONFIG_THERMAL_TSENS8960 is not set CONFIG_THERMAL_TSENS8974=y CONFIG_THERMAL_MONITOR=y -CONFIG_THERMAL_QPNP=m -CONFIG_THERMAL_QPNP_ADC_TM=m +CONFIG_THERMAL_QPNP=y +CONFIG_THERMAL_QPNP_ADC_TM=y # CONFIG_WATCHDOG is not set CONFIG_SSB_POSSIBLE=y @@ -2116,35 +2107,35 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y # CONFIG_REGULATOR_MSM_GPIO is not set CONFIG_REGULATOR_STUB=y CONFIG_REGULATOR_QPNP=y -CONFIG_MEDIA_SUPPORT=m +CONFIG_MEDIA_SUPPORT=y # # Multimedia core support # CONFIG_MEDIA_CONTROLLER=y -CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L2_COMMON=m +CONFIG_VIDEO_DEV=y +CONFIG_VIDEO_V4L2_COMMON=y CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_DVB_CORE is not set -CONFIG_VIDEO_MEDIA=m +CONFIG_VIDEO_MEDIA=y # # Multimedia drivers # -CONFIG_RC_CORE=m -CONFIG_LIRC=m +CONFIG_RC_CORE=y +CONFIG_LIRC=y # CONFIG_USER_RC_INPUT is not set # CONFIG_USER_SP_RC_INPUT is not set -CONFIG_RC_MAP=m -CONFIG_IR_NEC_DECODER=m -CONFIG_IR_RC5_DECODER=m -CONFIG_IR_RC6_DECODER=m -CONFIG_IR_JVC_DECODER=m -CONFIG_IR_SONY_DECODER=m -CONFIG_IR_RC5_SZ_DECODER=m -CONFIG_IR_SANYO_DECODER=m -CONFIG_IR_MCE_KBD_DECODER=m -CONFIG_IR_LIRC_CODEC=m +CONFIG_RC_MAP=y +CONFIG_IR_NEC_DECODER=y +CONFIG_IR_RC5_DECODER=y +CONFIG_IR_RC6_DECODER=y +CONFIG_IR_JVC_DECODER=y +CONFIG_IR_SONY_DECODER=y +CONFIG_IR_RC5_SZ_DECODER=y +CONFIG_IR_SANYO_DECODER=y +CONFIG_IR_MCE_KBD_DECODER=y +CONFIG_IR_LIRC_CODEC=y # CONFIG_RC_ATI_REMOTE is not set # CONFIG_IR_IMON is not set # CONFIG_IR_MCEUSB is not set @@ -2182,12 +2173,11 @@ CONFIG_OIS_ONSEMI_LC898111A=y # CONFIG_MSM_ISPIF_V1 is not set # CONFIG_OV9724 is not set CONFIG_MT9M114B=y -CONFIG_MSMB_JPEG=m +CONFIG_MSMB_JPEG=y CONFIG_MSM_VIDC_V4L2=y # CONFIG_MSM_WFD is not set -CONFIG_MSM_VCAP=m -# CONFIG_MEDIA_ATTACH is not set -CONFIG_MEDIA_TUNER=m +CONFIG_MSM_VCAP=y +CONFIG_MEDIA_TUNER=y CONFIG_MEDIA_TUNER_CUSTOMISE=y # @@ -2215,18 +2205,18 @@ CONFIG_MEDIA_TUNER_CUSTOMISE=y # CONFIG_MEDIA_TUNER_MAX2165 is not set # CONFIG_MEDIA_TUNER_TDA18218 is not set # CONFIG_MEDIA_TUNER_TDA18212 is not set -CONFIG_VIDEO_V4L2=m -CONFIG_VIDEOBUF2_CORE=m -CONFIG_VIDEOBUF2_MEMOPS=m -CONFIG_VIDEOBUF2_DMA_CONTIG=m -CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_VIDEOBUF2_DMA_SG=m -CONFIG_VIDEOBUF2_MSM_MEM=m +CONFIG_VIDEO_V4L2=y +CONFIG_VIDEOBUF2_CORE=y +CONFIG_VIDEOBUF2_MEMOPS=y +CONFIG_VIDEOBUF2_DMA_CONTIG=y +CONFIG_VIDEOBUF2_VMALLOC=y +CONFIG_VIDEOBUF2_DMA_SG=y +CONFIG_VIDEOBUF2_MSM_MEM=y CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set -CONFIG_VIDEO_IR_I2C=m +CONFIG_VIDEO_IR_I2C=y # # Encoders, decoders, sensors and other helper chips @@ -2325,7 +2315,7 @@ CONFIG_VIDEO_IR_I2C=m # CONFIG_VIDEO_THS7303 is not set # CONFIG_VIDEO_M52790 is not set CONFIG_V4L_USB_DRIVERS=y -CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS=y CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y # CONFIG_USB_GSPCA is not set # CONFIG_VIDEO_PVRUSB2 is not set @@ -2534,14 +2524,14 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_FRAMEBUFFER_CONSOLE is not set # CONFIG_LOGO is not set CONFIG_SLIMPORT_ANX7808=y -CONFIG_SOUND=m +CONFIG_SOUND=y # CONFIG_SOUND_OSS_CORE is not set -CONFIG_SND=m -CONFIG_SND_TIMER=m -CONFIG_SND_PCM=m -CONFIG_SND_HWDEP=m -CONFIG_SND_RAWMIDI=m -CONFIG_SND_COMPRESS_OFFLOAD=m +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_HWDEP=y +CONFIG_SND_RAWMIDI=y +CONFIG_SND_COMPRESS_OFFLOAD=y CONFIG_SND_JACK=y # CONFIG_SND_SEQUENCER is not set # CONFIG_SND_MIXER_OSS is not set @@ -2566,27 +2556,27 @@ CONFIG_SND_DRIVERS=y CONFIG_SND_ARM=y CONFIG_SND_SPI=y CONFIG_SND_USB=y -CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_AUDIO=y # CONFIG_SND_USB_UA101 is not set # CONFIG_SND_USB_CAIAQ is not set # CONFIG_SND_USB_6FIRE is not set -CONFIG_SND_SOC=m +CONFIG_SND_SOC=y # # MSM SoC Audio support # -CONFIG_SND_SOC_MSM_HOSTLESS_PCM=m +CONFIG_SND_SOC_MSM_HOSTLESS_PCM=y CONFIG_SND_SOC_MSM_QDSP6V2_INTF=y # CONFIG_SND_SOC_QDSP6 is not set -CONFIG_SND_SOC_QDSP6V2=m +CONFIG_SND_SOC_QDSP6V2=y CONFIG_AUDIO_OCMEM=y # CONFIG_DOLBY_DAP is not set -CONFIG_SND_SOC_MSM8974=m +CONFIG_SND_SOC_MSM8974=y # CONFIG_SND_SOC_APQ8074 is not set -CONFIG_SND_SOC_I2C_AND_SPI=m +CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_SOC_ALL_CODECS is not set -CONFIG_SND_SOC_WCD9320=m -CONFIG_SND_SOC_MSM_STUB=m +CONFIG_SND_SOC_WCD9320=y +CONFIG_SND_SOC_MSM_STUB=y CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=y # CONFIG_SOUND_PRIME is not set CONFIG_HID_SUPPORT=y @@ -2612,7 +2602,7 @@ CONFIG_HID_APPLE=y CONFIG_HID_BELKIN=y CONFIG_HID_CHERRY=y CONFIG_HID_CHICONY=y -CONFIG_HID_PRODIKEYS=m +CONFIG_HID_PRODIKEYS=y CONFIG_HID_CYPRESS=y CONFIG_HID_DRAGONRISE=y # CONFIG_DRAGONRISE_FF is not set @@ -3020,15 +3010,12 @@ CONFIG_STAGING=y # CONFIG_PRISM2_USB is not set # CONFIG_ECHO is not set # CONFIG_ASUS_OLED is not set -# CONFIG_RTLLIB is not set # CONFIG_R8712U is not set # CONFIG_RTS5139 is not set # CONFIG_TRANZPORT is not set # CONFIG_LINE6_USB is not set -# CONFIG_VT6656 is not set # CONFIG_IIO is not set # CONFIG_FB_SM7XX is not set -# CONFIG_USB_ENESTORAGE is not set # CONFIG_BCM_WIMAX is not set # CONFIG_FT1000 is not set @@ -3129,8 +3116,15 @@ CONFIG_FS_MBCACHE=y # CONFIG_GFS2_FS is not set # CONFIG_BTRFS_FS is not set # CONFIG_NILFS2_FS is not set -# CONFIG_F2FS_FS is not set -# CONFIG_FS_POSIX_ACL is not set +CONFIG_F2FS_FS=y +CONFIG_F2FS_STAT_FS=y +CONFIG_F2FS_FS_XATTR=y +CONFIG_F2FS_FS_POSIX_ACL=y +CONFIG_F2FS_FS_SECURITY=y +# CONFIG_F2FS_CHECK_FS is not set +# CONFIG_F2FS_FS_ENCRYPTION is not set +# CONFIG_F2FS_IO_TRACE is not set +CONFIG_FS_POSIX_ACL=y CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y @@ -3344,7 +3338,6 @@ CONFIG_OLD_MCOUNT=y # CONFIG_DEBUG_USER is not set # CONFIG_DEBUG_LL is not set CONFIG_PID_IN_CONTEXTIDR=y -# CONFIG_DEBUG_SET_MODULE_RONX is not set # # Security options @@ -3400,7 +3393,6 @@ CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_WORKQUEUE=y # CONFIG_CRYPTO_CRYPTD is not set CONFIG_CRYPTO_AUTHENC=y -# CONFIG_CRYPTO_TEST is not set # # Authenticated Encryption with Associated Data diff --git a/linux-lg-hammerhead/devtmpfs.patch b/linux-lg-hammerhead/devtmpfs.patch deleted file mode 100644 index 3daee59af..000000000 --- a/linux-lg-hammerhead/devtmpfs.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/arch/arm/configs/hammerhead_defconfig b/arch/arm/configs/hammerhead_defconfig -index f94bb7e..51e5323 100644 ---- a/arch/arm/configs/hammerhead_defconfig -+++ b/arch/arm/configs/hammerhead_defconfig -@@ -1,4 +1,5 @@ - # CONFIG_ARM_PATCH_PHYS_VIRT is not set -+CONFIG_DEVTMPFS=y - CONFIG_EXPERIMENTAL=y - # CONFIG_SWAP is not set - CONFIG_AUDIT=y -