diff --git a/device/downstream/device-samsung-n1awifi/APKBUILD b/device/downstream/device-samsung-n1awifi-downstream/APKBUILD similarity index 72% rename from device/downstream/device-samsung-n1awifi/APKBUILD rename to device/downstream/device-samsung-n1awifi-downstream/APKBUILD index 6ddece7d8..a5bb2ba23 100644 --- a/device/downstream/device-samsung-n1awifi/APKBUILD +++ b/device/downstream/device-samsung-n1awifi-downstream/APKBUILD @@ -1,5 +1,5 @@ # Reference: -pkgname=device-samsung-n1awifi +pkgname=device-samsung-n1awifi-downstream pkgdesc="Samsung Galaxy Note 10.1 (2014 edition)" pkgver=3 pkgrel=0 @@ -8,7 +8,7 @@ license="MIT" arch="armv7" options="!check !archcheck" depends=" - linux-samsung-n1awifi + linux-samsung-n1awifi-downstream mkbootimg postmarketos-base postmarketos-base-downstream @@ -28,10 +28,10 @@ package() { nonfree_firmware() { pkgdesc="Non-free firmware for the Samsung Galaxy Note 10.1 (2014 edition)" - depends="firmware-samsung-n1awifi" + depends="firmware-samsung-n1awifi-downstream" mkdir "$subpkgdir" } sha512sums=" -d64cac0a49e06dde5f15a9edda2d171773d7e9f5043773a847b85d6b90a5d9cc6e68e3e2c2932a3ed0dccad4d2b040b9c192054332cdd5a65ee9da3f060c76c9 deviceinfo +fd9a53c4357e634bf9e2ce99736362743100e0a16136d06ff4a080fe29b4bf72eaa38b9c0103de16927b98cd05208f322b1e389fe9d50945df79faadf4d1dd5a deviceinfo " diff --git a/device/downstream/device-samsung-n1awifi/deviceinfo b/device/downstream/device-samsung-n1awifi-downstream/deviceinfo similarity index 83% rename from device/downstream/device-samsung-n1awifi/deviceinfo rename to device/downstream/device-samsung-n1awifi-downstream/deviceinfo index 14e3141db..2a4f0ba5b 100644 --- a/device/downstream/device-samsung-n1awifi/deviceinfo +++ b/device/downstream/device-samsung-n1awifi-downstream/deviceinfo @@ -5,13 +5,12 @@ deviceinfo_format_version="0" deviceinfo_name="Samsung Galaxy Note 10.1 (2014 edition)" deviceinfo_manufacturer="Samsung" -deviceinfo_codename="samsung-n1awifi" +deviceinfo_codename="samsung-n1awifi-downstream" deviceinfo_year="2013" deviceinfo_arch="armv7" # Device related deviceinfo_chassis="tablet" -deviceinfo_keyboard="false" deviceinfo_external_storage="false" deviceinfo_screen_width="2560" deviceinfo_screen_height="1600" @@ -22,8 +21,6 @@ deviceinfo_flash_method="heimdall-bootimg" deviceinfo_kernel_cmdline="buildvariant=userdebug" deviceinfo_generate_bootimg="true" deviceinfo_bootimg_qcdt="false" -deviceinfo_bootimg_dtb_second="false" -deviceinfo_flash_offset_base="0x10000000" deviceinfo_flash_offset_kernel="0x00008000" deviceinfo_flash_offset_ramdisk="0x01000000" deviceinfo_flash_offset_second="0x00f00000" @@ -32,4 +29,3 @@ deviceinfo_flash_pagesize="2048" deviceinfo_flash_sparse="true" deviceinfo_flash_sparse_samsung_format="1" deviceinfo_flash_heimdall_partition_kernel="BOOT" -deviceinfo_flash_heimdall_partition_rootfs="SYSTEM" diff --git a/device/downstream/firmware-samsung-n1awifi/APKBUILD b/device/downstream/firmware-samsung-n1awifi-downstream/APKBUILD similarity index 65% rename from device/downstream/firmware-samsung-n1awifi/APKBUILD rename to device/downstream/firmware-samsung-n1awifi-downstream/APKBUILD index 653f6bd6c..03580c70d 100644 --- a/device/downstream/firmware-samsung-n1awifi/APKBUILD +++ b/device/downstream/firmware-samsung-n1awifi-downstream/APKBUILD @@ -1,4 +1,4 @@ -pkgname=firmware-samsung-n1awifi +pkgname=firmware-samsung-n1awifi-downstream pkgver=1 pkgrel=0 pkgdesc="Firmware for Samsung n1awifi" @@ -34,10 +34,12 @@ package() { "$pkgdir/lib/firmware/postmarketos/$file" done } -sha512sums="f0adb03c36e5524c2aca1ec871861d7bc126302028455e0a4eca5b841261e3d50803eba2f82738483de21c6703b2c896e65930c09a6a16d3de61a63ca035844a firmware-samsung-n1awifi-d5f5bda50338eaea89d31e95afd7be5080485c41-bcmdhd_apsta.bin -9993d27fef9f62c43b8a4a75a9c2658022a39a40e65065329519fe8274114a1667d2a4f87ffca43bd043897e5ecaac293ef4929e449d0e8e7f5c3f07f5602536 firmware-samsung-n1awifi-d5f5bda50338eaea89d31e95afd7be5080485c41-bcmdhd_ibss.bin -bff2e27222f3fea8fd0c9eef3b7f474531a8a1d22cc5742e8a20bade7ab8c6407ec2773e3d7a5346b54d8389e54d101fb4cdf049c35040b3806325a607346758 firmware-samsung-n1awifi-d5f5bda50338eaea89d31e95afd7be5080485c41-bcmdhd_mfg.bin -b9344478874f94af33052e76116f2c24b577c4c8178a3c7fc8eb9bb6a1d8c3f497443a88cf1b94256ef3e17806541d7271784505ac16de2b322ccb5ddcec54d3 firmware-samsung-n1awifi-d5f5bda50338eaea89d31e95afd7be5080485c41-bcmdhd_sta.bin -16ee43800bf7c05f550a14036ef1d648999568996854c72c1ef3965a8fd18eabfda284266fa2e2a0fee8c5fec01fd9a7e22b11b6723797742b5a6260e0b44096 firmware-samsung-n1awifi-d5f5bda50338eaea89d31e95afd7be5080485c41-cred.conf -83b6d11dd5544d1a130a74464b0f30c7f5807ef586c26d2a216961e335bd0bedfaa725198f912f226fb267ca5742487938a8fc948cbc71f84682cd447d064ea0 firmware-samsung-n1awifi-d5f5bda50338eaea89d31e95afd7be5080485c41-nvram_mfg.txt -1b94536a1dca06195787999e5788178e6eced88779911bd24418d77f07dccce3ffcd2a182c14f231b6a8ca7723f2b0fcf6c45cdd1d7d20966cce1bd7e98c3c40 firmware-samsung-n1awifi-d5f5bda50338eaea89d31e95afd7be5080485c41-nvram_net.txt" +sha512sums=" +f0adb03c36e5524c2aca1ec871861d7bc126302028455e0a4eca5b841261e3d50803eba2f82738483de21c6703b2c896e65930c09a6a16d3de61a63ca035844a firmware-samsung-n1awifi-downstream-d5f5bda50338eaea89d31e95afd7be5080485c41-bcmdhd_apsta.bin +9993d27fef9f62c43b8a4a75a9c2658022a39a40e65065329519fe8274114a1667d2a4f87ffca43bd043897e5ecaac293ef4929e449d0e8e7f5c3f07f5602536 firmware-samsung-n1awifi-downstream-d5f5bda50338eaea89d31e95afd7be5080485c41-bcmdhd_ibss.bin +bff2e27222f3fea8fd0c9eef3b7f474531a8a1d22cc5742e8a20bade7ab8c6407ec2773e3d7a5346b54d8389e54d101fb4cdf049c35040b3806325a607346758 firmware-samsung-n1awifi-downstream-d5f5bda50338eaea89d31e95afd7be5080485c41-bcmdhd_mfg.bin +b9344478874f94af33052e76116f2c24b577c4c8178a3c7fc8eb9bb6a1d8c3f497443a88cf1b94256ef3e17806541d7271784505ac16de2b322ccb5ddcec54d3 firmware-samsung-n1awifi-downstream-d5f5bda50338eaea89d31e95afd7be5080485c41-bcmdhd_sta.bin +16ee43800bf7c05f550a14036ef1d648999568996854c72c1ef3965a8fd18eabfda284266fa2e2a0fee8c5fec01fd9a7e22b11b6723797742b5a6260e0b44096 firmware-samsung-n1awifi-downstream-d5f5bda50338eaea89d31e95afd7be5080485c41-cred.conf +83b6d11dd5544d1a130a74464b0f30c7f5807ef586c26d2a216961e335bd0bedfaa725198f912f226fb267ca5742487938a8fc948cbc71f84682cd447d064ea0 firmware-samsung-n1awifi-downstream-d5f5bda50338eaea89d31e95afd7be5080485c41-nvram_mfg.txt +1b94536a1dca06195787999e5788178e6eced88779911bd24418d77f07dccce3ffcd2a182c14f231b6a8ca7723f2b0fcf6c45cdd1d7d20966cce1bd7e98c3c40 firmware-samsung-n1awifi-downstream-d5f5bda50338eaea89d31e95afd7be5080485c41-nvram_net.txt +" diff --git a/device/downstream/linux-samsung-n1awifi/01-fix-FIMC-IS-disabling.patch b/device/downstream/linux-samsung-n1awifi-downstream/01-fix-FIMC-IS-disabling.patch similarity index 100% rename from device/downstream/linux-samsung-n1awifi/01-fix-FIMC-IS-disabling.patch rename to device/downstream/linux-samsung-n1awifi-downstream/01-fix-FIMC-IS-disabling.patch diff --git a/device/downstream/linux-samsung-n1awifi/02-revert-hrtimer-crash.patch b/device/downstream/linux-samsung-n1awifi-downstream/02-revert-hrtimer-crash.patch similarity index 100% rename from device/downstream/linux-samsung-n1awifi/02-revert-hrtimer-crash.patch rename to device/downstream/linux-samsung-n1awifi-downstream/02-revert-hrtimer-crash.patch diff --git a/device/downstream/linux-samsung-n1awifi/03-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch b/device/downstream/linux-samsung-n1awifi-downstream/03-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch similarity index 100% rename from device/downstream/linux-samsung-n1awifi/03-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch rename to device/downstream/linux-samsung-n1awifi-downstream/03-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch diff --git a/device/downstream/linux-samsung-n1awifi/APKBUILD b/device/downstream/linux-samsung-n1awifi-downstream/APKBUILD similarity index 73% rename from device/downstream/linux-samsung-n1awifi/APKBUILD rename to device/downstream/linux-samsung-n1awifi-downstream/APKBUILD index 157b59cc5..6ccd046a4 100644 --- a/device/downstream/linux-samsung-n1awifi/APKBUILD +++ b/device/downstream/linux-samsung-n1awifi-downstream/APKBUILD @@ -1,9 +1,9 @@ # Reference: # Kernel config based on: arch/arm/configs/lineageos_n1awifi_defconfig -pkgname=linux-samsung-n1awifi +pkgname=linux-samsung-n1awifi-downstream pkgver=3.4.113 -pkgrel=3 +pkgrel=0 pkgdesc="Samsung Galaxy Note 10.1 (2014 Edition) kernel fork" arch="armv7" _carch="arm" @@ -17,11 +17,19 @@ makedepends=" bison devicepkg-dev flex + gcc6 openssl-dev perl xz " +# Compiler: GCC 6 (doesn't compile with newer kernel) +if [ "${CC:0:5}" != "gcc6-" ]; then + CC="gcc6-$CC" + HOSTCC="gcc6-gcc" + CROSS_COMPILE="gcc6-$CROSS_COMPILE" +fi + # Source _repository="android_kernel_samsung_exynos5420" _commit="c1a203cee565eb20a9b5bc2daf1c1b650a420fe5" @@ -29,14 +37,12 @@ _config="config-$_flavor.$arch" source=" $pkgname-$_commit.tar.gz::https://github.com/exynos5420/$_repository/archive/$_commit.tar.gz $_config - gcc7-give-up-on-ilog2-const-optimizations.patch - gcc8-fix-put-user.patch - gcc10-extern_YYLOC_global_declaration.patch linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch drivers-psmouse-add-guard-for-Finger-Sensing-Pad-cod.patch 01-fix-FIMC-IS-disabling.patch 02-revert-hrtimer-crash.patch 03-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch + fix-check-lxdialog.patch " builddir="$srcdir/$_repository-$_commit" _outdir="out" @@ -57,14 +63,12 @@ package() { } sha512sums=" -38bb1af78097f32ec594d3c7dd393c1fe449c4c892b567b1558a999143049e1bc2fa7375ecd54477be97066534e0dd875c01453e4658b4ae3f91e346e0b3b6ea linux-samsung-n1awifi-c1a203cee565eb20a9b5bc2daf1c1b650a420fe5.tar.gz -295f7a408873650f74f40f334add5454ca5b19b8f6d198e9206375d41c798a97c60245d539ac85c46dd4cbb25abddfd11858864f70d172fcdbbcd6f0f40362d0 config-samsung-n1awifi.armv7 -77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7 gcc7-give-up-on-ilog2-const-optimizations.patch -197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967 gcc8-fix-put-user.patch -2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch +38bb1af78097f32ec594d3c7dd393c1fe449c4c892b567b1558a999143049e1bc2fa7375ecd54477be97066534e0dd875c01453e4658b4ae3f91e346e0b3b6ea linux-samsung-n1awifi-downstream-c1a203cee565eb20a9b5bc2daf1c1b650a420fe5.tar.gz +a7b056c7bf900ffc038eee8276dbd00ff3cf448bf957b1de187daeef160017282c1861cfc603659babec33f343f4253286c78831dc41567ed8a06b90dc254a4c config-samsung-n1awifi.armv7 9e3b067fa1b19ad02500c4fce1b6142051df3845c508e615788beb650c4f953683107ac2d80670c4e3df38f532e0e91060d2d13ec04c9ec985abd2dfa82e900b linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch a3df24c8d9116a3ad3559aac5ce126049e9123df633990ec72facd64ef538ed773e3ac0da233f2e04d99164d590340d598cfb3da3bbea502cf7c2cd3ef08cf24 drivers-psmouse-add-guard-for-Finger-Sensing-Pad-cod.patch 00c86b897193340ce4e8184e622d830d16efe9a5c10c12357e5f6ab98193a28f69c0006bdfe0d3429f1136a9820b8f8ff262d07b0314e40f4c7b664013e0b8a6 01-fix-FIMC-IS-disabling.patch 14e9341140e6fcc899c435c7572cacfbbef3c5a9b455106cfc648985211daf64ff5955ea9b9b7706b459401d9b60c6bb5857396e913adc07c01b3557c49a98d8 02-revert-hrtimer-crash.patch 5fad0940e90da71277b70b6e72fbb75fcc5e12625e65f827ae896d448628b252b3312539f9c184b26ffe5ca3b343a56b388ea6addb7fe446c7d1ae2aefb4b51e 03-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch +182be3c596b9cc267ac108d7cf03fc8c328ccc6b36770800e4dcedea8d1bb65e3f5eacf590c2948f58b1418cc60a1670ba77dde8c259e428d158c31b6e1dbaf5 fix-check-lxdialog.patch " diff --git a/device/downstream/linux-samsung-n1awifi/config-samsung-n1awifi.armv7 b/device/downstream/linux-samsung-n1awifi-downstream/config-samsung-n1awifi.armv7 similarity index 99% rename from device/downstream/linux-samsung-n1awifi/config-samsung-n1awifi.armv7 rename to device/downstream/linux-samsung-n1awifi-downstream/config-samsung-n1awifi.armv7 index 576fbbbc8..4eb54c396 100644 --- a/device/downstream/linux-samsung-n1awifi/config-samsung-n1awifi.armv7 +++ b/device/downstream/linux-samsung-n1awifi-downstream/config-samsung-n1awifi.armv7 @@ -828,7 +828,7 @@ CONFIG_IP_MULTIPLE_TABLES=y # CONFIG_NET_IPGRE_DEMUX is not set # CONFIG_IP_MROUTE is not set # CONFIG_ARPD is not set -# CONFIG_SYN_COOKIES is not set +CONFIG_SYN_COOKIES=y CONFIG_INET_AH=y CONFIG_INET_ESP=y CONFIG_INET_IPCOMP=y diff --git a/device/downstream/linux-samsung-n1awifi/drivers-psmouse-add-guard-for-Finger-Sensing-Pad-cod.patch b/device/downstream/linux-samsung-n1awifi-downstream/drivers-psmouse-add-guard-for-Finger-Sensing-Pad-cod.patch similarity index 100% rename from device/downstream/linux-samsung-n1awifi/drivers-psmouse-add-guard-for-Finger-Sensing-Pad-cod.patch rename to device/downstream/linux-samsung-n1awifi-downstream/drivers-psmouse-add-guard-for-Finger-Sensing-Pad-cod.patch diff --git a/device/downstream/linux-samsung-n1awifi-downstream/fix-check-lxdialog.patch b/device/downstream/linux-samsung-n1awifi-downstream/fix-check-lxdialog.patch new file mode 120000 index 000000000..bfb5653df --- /dev/null +++ b/device/downstream/linux-samsung-n1awifi-downstream/fix-check-lxdialog.patch @@ -0,0 +1 @@ +../../.shared-patches/linux/fix-check-lxdialog.patch \ No newline at end of file diff --git a/device/downstream/linux-samsung-n1awifi/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch b/device/downstream/linux-samsung-n1awifi-downstream/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch similarity index 100% rename from device/downstream/linux-samsung-n1awifi/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch rename to device/downstream/linux-samsung-n1awifi-downstream/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch diff --git a/device/downstream/linux-samsung-n1awifi/gcc10-extern_YYLOC_global_declaration.patch b/device/downstream/linux-samsung-n1awifi/gcc10-extern_YYLOC_global_declaration.patch deleted file mode 120000 index fe99abf4d..000000000 --- a/device/downstream/linux-samsung-n1awifi/gcc10-extern_YYLOC_global_declaration.patch +++ /dev/null @@ -1 +0,0 @@ -../../.shared-patches/linux/gcc10-extern_YYLOC_global_declaration.patch \ No newline at end of file diff --git a/device/downstream/linux-samsung-n1awifi/gcc7-give-up-on-ilog2-const-optimizations.patch b/device/downstream/linux-samsung-n1awifi/gcc7-give-up-on-ilog2-const-optimizations.patch deleted file mode 120000 index da3d1ed41..000000000 --- a/device/downstream/linux-samsung-n1awifi/gcc7-give-up-on-ilog2-const-optimizations.patch +++ /dev/null @@ -1 +0,0 @@ -../../.shared-patches/linux/gcc7-give-up-on-ilog2-const-optimizations.patch \ No newline at end of file diff --git a/device/downstream/linux-samsung-n1awifi/gcc8-fix-put-user.patch b/device/downstream/linux-samsung-n1awifi/gcc8-fix-put-user.patch deleted file mode 120000 index 1d40b2674..000000000 --- a/device/downstream/linux-samsung-n1awifi/gcc8-fix-put-user.patch +++ /dev/null @@ -1 +0,0 @@ -../../.shared-patches/linux/gcc8-fix-put-user.patch \ No newline at end of file