From fe4bd3ab4dde182013bc541e7400d67e228fef14 Mon Sep 17 00:00:00 2001 From: lambdadroid Date: Thu, 10 Oct 2019 19:10:11 +0200 Subject: [PATCH] asus-me176c: rework packages (!699) device/device-asus-me176c: - Install me176c-factory to apply correct MAC addresses for WiFi and BT - Use FAT32 for boot partition. This allows flashing the boot partition directly as ESP (EFI System Partition). - Overall cleanup device/linux-asus-me176c: - Update kernel fork to 4.19.80 - Cleanup APKBUILD - Stop building patched ACPI DSDT table directly into kernel firmware/firmware-asus-me176c: - Package WiFi firmware firmware/firmware-asus-me176c-acpi: - New package for the patched ACPI DSDT table -> Separate from firmware-asus-me176c because it is always required, (not optional) [ci:skip-build]: runs into timeout --- device/device-asus-me176c/APKBUILD | 56 +++++-- device/device-asus-me176c/deviceinfo | 8 +- device/linux-asus-me176c/APKBUILD | 80 +++------ .../config-asus-me176c.x86_64 | 152 +++++++++++------- firmware/firmware-asus-me176c-acpi/APKBUILD | 27 ++++ firmware/firmware-asus-me176c/APKBUILD | 23 +-- 6 files changed, 197 insertions(+), 149 deletions(-) create mode 100644 firmware/firmware-asus-me176c-acpi/APKBUILD diff --git a/device/device-asus-me176c/APKBUILD b/device/device-asus-me176c/APKBUILD index c30d67060..949728db9 100644 --- a/device/device-asus-me176c/APKBUILD +++ b/device/device-asus-me176c/APKBUILD @@ -1,20 +1,50 @@ # Reference: pkgname="device-asus-me176c" -pkgdesc="Asus MeMo Pad 7" -pkgver=0.1 +pkgdesc="ASUS MeMO Pad 7 (ME176C(X))" +pkgver=1 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="x86_64" options="!check !archcheck" -depends="postmarketos-base linux-asus-me176c mesa-dri-intel" -makedepends="devicepkg-dev" -source="deviceinfo" +depends="postmarketos-base linux-asus-me176c firmware-asus-me176c-acpi $pkgname-factory intel-ucode mesa-dri-intel" +makedepends="devicepkg-dev meson eudev-dev" + +_commit=3155254999ac36c3051a2118c415de25a072c0f6 +source=" + deviceinfo + https://github.com/me176c-dev/linux-me176c/archive/$_commit.tar.gz +" subpackages=" + $pkgname-factory $pkgname-nonfree-firmware:nonfree_firmware $pkgname-x11 " +build() { + devicepkg_build $startdir $pkgname + + meson \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + -Dsystemd=false -Dopenrc=true \ + linux-me176c-$_commit/factory build-factory + ninja -C build-factory +} + +package() { + devicepkg_package $startdir $pkgname +} + +factory() { + pkgdesc="WiFi/BT MAC address loader" + depends="bluez-btmgmt" + DESTDIR="$subpkgdir" ninja -C "$srcdir"/build-factory install +} + x11() { install_if="$pkgname xorg-server" depends="xf86-video-intel" @@ -22,18 +52,10 @@ x11() { } nonfree_firmware() { - pkgdesc="Wifi, Bluetooth, and sound firmware" - depends="linux-firmware-intel linux-firmware-brcm firmware-asus-me176c" + pkgdesc="WiFi, Bluetooth and Sound firmware" + depends="linux-firmware-intel firmware-asus-me176c" mkdir "$subpkgdir" } -build() { - devicepkg_build $startdir $pkgname -} - -package() { - devicepkg_package $startdir $pkgname -} - - -sha512sums="1281e7dafedf566c983e9d682ca8fccdb9dd4fdb1d8b9dc7d80e180a917e242d61e4e0c1bf70ddfd1cf53ef590ba6f973ec24dafbe143f93ebb8e52e0500b2db deviceinfo" +sha512sums="3a329f76237c5fcacc194892a32855d6b4b724f8320d0a43594ceafdba8a447706b590b290bc927256365bc65eeeb300579ee000e99ba7c9acb19cbb12ead56f deviceinfo +75243e3d0bc9a352465683ec8cf8b83566e4131bb7fae0f388267a62bdbf4691c955ed034b30df550f921b771080688123ae8db144b72f786bf1677ef1d83f57 3155254999ac36c3051a2118c415de25a072c0f6.tar.gz" diff --git a/device/device-asus-me176c/deviceinfo b/device/device-asus-me176c/deviceinfo index 7033dcb75..619f2fab1 100644 --- a/device/device-asus-me176c/deviceinfo +++ b/device/device-asus-me176c/deviceinfo @@ -2,12 +2,12 @@ # Please use double quotes only. You can source this file in shell scripts. deviceinfo_format_version="0" -deviceinfo_name="Asus MeMo Pad 7" +deviceinfo_name="ASUS MeMO Pad 7 (ME176C(X))" deviceinfo_codename="asus-me176c" -deviceinfo_manufacturer="Asus" +deviceinfo_manufacturer="ASUS" deviceinfo_date="" deviceinfo_dtb="" -deviceinfo_modules_initfs="" +deviceinfo_modules_initfs="vfat nls_cp437 nls_iso8859_1 nls_utf8" deviceinfo_arch="x86_64" # Device related @@ -21,4 +21,4 @@ deviceinfo_dev_keyboard="" # Bootloader related deviceinfo_flash_method="none" - +deviceinfo_boot_filesystem="fat32" diff --git a/device/linux-asus-me176c/APKBUILD b/device/linux-asus-me176c/APKBUILD index bd8f400cc..481f2bae9 100644 --- a/device/linux-asus-me176c/APKBUILD +++ b/device/linux-asus-me176c/APKBUILD @@ -1,82 +1,52 @@ # Reference: -# Kernel config based on: https://github.com/me176c-dev/me176c-archlinux/blob/master/linux-me176c/config +# Kernel config based on: https://github.com/me176c-dev/archlinux-me176c/blob/master/linux-me176c/config -pkgname="linux-asus-me176c" -pkgver=4.19.9 -pkgrel=2 -pkgdesc="Asus MeMo Pad 7 kernel fork" +_flavor="asus-me176c" +pkgname="linux-${_flavor}" +pkgver=4.19.80 +pkgrel=0 +pkgdesc="Mainline kernel fork for ASUS MeMO Pad 7 (ME176C(X))" arch="x86_64" _carch="x86_64" -_flavor="asus-me176c" -url="https://kernel.org" +url="https://github.com/me176c-dev/linux-me176c" license="GPL-2.0-only" options="!strip !check !tracedeps" -makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev bison flex libressl-dev iasl xz" +depends_dev="perl gmp-dev elfutils-dev bash flex bison" +makedepends="$depends_dev sed installkernel bc linux-headers openssl-dev xz" # Compiler: latest GCC from Alpine HOSTCC="${CC:-gcc}" HOSTCC="${HOSTCC#${CROSS_COMPILE}}" # Source -_repository="linux-me176c" -_commit="961c8ea95f2febdaceb2d31940b48932aea0e782" -_dsdt_commit="18a1fe0c450375c16e17429b429955e068f83945" -_config="config-${_flavor}.${arch}" source=" - $pkgname-$_commit.tar.gz::https://github.com/me176c-dev/${_repository}/archive/${_commit}.tar.gz - https://raw.githubusercontent.com/me176c-dev/me176c-acpi/${_dsdt_commit}/dsdt.dsl - $_config + $pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz + config-$_flavor.$arch " -builddir="$srcdir/${_repository}-${_commit}" +builddir="$srcdir/linux-me176c-$pkgver" prepare() { default_prepare - - iasl -tc $srcdir/dsdt.dsl - sed -i s/dsdt_aml_code/AmlCode/ $srcdir/dsdt.hex - cp $srcdir/dsdt.hex $builddir/include/ - - # Remove -Werror from all makefiles - makefiles="$(find "$builddir" -type f -name Makefile) - $(find "$builddir" -type f -name Kbuild)" - for i in $makefiles; do - sed -i 's/-Werror-/-W/g' "$i" - sed -i 's/-Werror//g' "$i" - done - - # Prepare kernel config ('yes ""' for kernels lacking olddefconfig) - cp "$srcdir/$_config" "$builddir"/.config - yes "" | make -C "$builddir" ARCH="$_carch" HOSTCC="$HOSTCC" oldconfig + cp "$srcdir/config-$_flavor.$arch" .config } build() { unset LDFLAGS - make ARCH="$_carch" CC="${CC:-gcc}" + make ARCH="$_carch" CC="${CC:-gcc}" \ + KBUILD_BUILD_VERSION=$((pkgrel + 1 )) } package() { - # kernel.release - install -D "$builddir/include/config/kernel.release" \ - "$pkgdir/usr/share/kernel/$_flavor/kernel.release" + mkdir -p "$pkgdir"/boot + make install modules_install \ + ARCH="$_carch" \ + INSTALL_PATH="$pkgdir"/boot \ + INSTALL_MOD_PATH="$pkgdir" + rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source - make ARCH="$_carch" CC="${CC:-gcc}" \ - INSTALL_MOD_PATH="$pkgdir/" INSTALL_MOD_STRIP=1 modules_install - - # zImage (find the right one) - cd "$builddir/arch/$_carch/boot" - _target="$pkgdir/boot/vmlinuz-$_flavor" - for _zimg in zImage-dtb Image.gz-dtb *zImage Image; do - [ -e "$_zimg" ] || continue - msg "zImage found: $_zimg" - install -Dm644 "$_zimg" "$_target" - break - done - if ! [ -e "$_target" ]; then - error "Could not find zImage in $PWD!" - return 1 - fi + install -D "$builddir"/include/config/kernel.release \ + "$pkgdir"/usr/share/kernel/$_flavor/kernel.release } -sha512sums="ad0a15e74e2a322fd119dbd159140b97f46e1770d41b1fa8469f529b117e0334f5a9a8c948b54b8f8aeea3d2424c910e17be4068bf17a6d3d571b52134105277 linux-asus-me176c-961c8ea95f2febdaceb2d31940b48932aea0e782.tar.gz -9f3d8691252dbbc06e8c9ce1f26aaf1803b5fe5647bee7ee80ca89d8bac52ec91bffeb629f41f0babad1b27a33bff766754ed151f2886684b0c6022c190b0907 dsdt.dsl -67e547102501345ed87a1e555a023c5184d8de4dd1d201f86503bd4bfec49d9144dd46193beebd89facc8354ceb516ba94148720a7751017aee805a01a4fe792 config-asus-me176c.x86_64" +sha512sums="7725d0fb7152d7727c769d831d00afd2dd9e0b9df7349c0a8cde4c432b42ea24cf06a4f5a9016a5e8b41f28fd71dfca8c5b9b67ecccbd2857682d19f18ba8655 linux-asus-me176c-4.19.80.tar.gz +fea1ad3104daa792678735bf190a8b351e8b7e529895b219aae1ed789e02bf9d13cd5ec9c9322ce080c3fd26da56e064a8e4053918dfd0a817b9f205b2559ce6 config-asus-me176c.x86_64" diff --git a/device/linux-asus-me176c/config-asus-me176c.x86_64 b/device/linux-asus-me176c/config-asus-me176c.x86_64 index 9070982b7..69a0993d1 100644 --- a/device/linux-asus-me176c/config-asus-me176c.x86_64 +++ b/device/linux-asus-me176c/config-asus-me176c.x86_64 @@ -1,14 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.19.9 Kernel Configuration +# Linux/x86_64 4.19.77 Kernel Configuration # # -# Compiler: gcc (Alpine 8.3.0) 8.3.0 +# Compiler: gcc (GCC) 9.2.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=80300 +CONFIG_GCC_VERSION=90200 CONFIG_CLANG_VERSION=0 +CONFIG_CC_HAS_ASM_GOTO=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -18,7 +19,7 @@ CONFIG_THREAD_INFO_IN_TASK=y # CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION="-asus-me176c" CONFIG_LOCALVERSION_AUTO=y CONFIG_BUILD_SALT="" CONFIG_HAVE_KERNEL_GZIP=y @@ -94,6 +95,7 @@ CONFIG_PREEMPT_COUNT=y CONFIG_VIRT_CPU_ACCOUNTING=y CONFIG_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_SCHED_AVG_IRQ=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_TASKSTATS=y @@ -479,8 +481,6 @@ CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_PROCESSOR_AGGREGATOR=y CONFIG_ACPI_THERMAL=y CONFIG_ACPI_NUMA=y -CONFIG_ACPI_CUSTOM_DSDT_FILE="dsdt.hex" -CONFIG_ACPI_CUSTOM_DSDT=y CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y CONFIG_ACPI_TABLE_UPGRADE=y # CONFIG_ACPI_DEBUG is not set @@ -632,7 +632,6 @@ CONFIG_FIRMWARE_MEMMAP=y CONFIG_DMIID=y CONFIG_DMI_SYSFS=m CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y -# CONFIG_ISCSI_IBFT_FIND is not set # CONFIG_FW_CFG_SYSFS is not set # CONFIG_GOOGLE_FIRMWARE is not set @@ -774,8 +773,9 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y # # CONFIG_GCOV_KERNEL is not set CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y -CONFIG_PLUGIN_HOSTCC="" +CONFIG_PLUGIN_HOSTCC="g++" CONFIG_HAVE_GCC_PLUGINS=y +# CONFIG_GCC_PLUGINS is not set CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 CONFIG_MODULES=y @@ -787,12 +787,12 @@ CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_MODULE_SIG=y # CONFIG_MODULE_SIG_FORCE is not set CONFIG_MODULE_SIG_ALL=y -CONFIG_MODULE_SIG_SHA1=y +# CONFIG_MODULE_SIG_SHA1 is not set # CONFIG_MODULE_SIG_SHA224 is not set # CONFIG_MODULE_SIG_SHA256 is not set # CONFIG_MODULE_SIG_SHA384 is not set -# CONFIG_MODULE_SIG_SHA512 is not set -CONFIG_MODULE_SIG_HASH="sha1" +CONFIG_MODULE_SIG_SHA512=y +CONFIG_MODULE_SIG_HASH="sha512" CONFIG_MODULE_COMPRESS=y # CONFIG_MODULE_COMPRESS_GZIP is not set CONFIG_MODULE_COMPRESS_XZ=y @@ -1703,7 +1703,7 @@ CONFIG_UEVENT_HELPER=y CONFIG_UEVENT_HELPER_PATH="" CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y -# CONFIG_STANDALONE is not set +CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y # @@ -1920,7 +1920,7 @@ CONFIG_BCACHE=m # CONFIG_BCACHE_DEBUG is not set # CONFIG_BCACHE_CLOSURES_DEBUG is not set CONFIG_BLK_DEV_DM_BUILTIN=y -CONFIG_BLK_DEV_DM=y +CONFIG_BLK_DEV_DM=m CONFIG_DM_MQ_DEFAULT=y # CONFIG_DM_DEBUG is not set CONFIG_DM_BUFIO=m @@ -2047,7 +2047,7 @@ CONFIG_LED_TRIGGER_PHY=y # CONFIG_SFP is not set # CONFIG_AMD_PHY is not set # CONFIG_AQUANTIA_PHY is not set -# CONFIG_ASIX_PHY is not set +# CONFIG_AX88796B_PHY is not set # CONFIG_AT803X_PHY is not set # CONFIG_BCM7XXX_PHY is not set # CONFIG_BCM87XX_PHY is not set @@ -2518,6 +2518,7 @@ CONFIG_UNIX98_PTYS=y # CONFIG_NOZOMI is not set # CONFIG_N_GSM is not set # CONFIG_TRACE_SINK is not set +CONFIG_LDISC_AUTOLOAD=y CONFIG_DEVMEM=y # CONFIG_DEVKMEM is not set @@ -2566,7 +2567,6 @@ CONFIG_SERIAL_DEV_CTRL_TTYPORT=y # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set CONFIG_NVRAM=m -# CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # CONFIG_MWAVE is not set CONFIG_RAW_DRIVER=m @@ -3560,6 +3560,7 @@ CONFIG_DRM_KMS_HELPER=m CONFIG_DRM_KMS_FB_HELPER=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 +# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y # CONFIG_DRM_DP_CEC is not set @@ -3943,7 +3944,7 @@ CONFIG_SND_SOC_RT5640=m # # HID support # -CONFIG_HID=y +CONFIG_HID=m CONFIG_HID_BATTERY_STRENGTH=y CONFIG_HIDRAW=y CONFIG_UHID=m @@ -4056,10 +4057,16 @@ CONFIG_HID_ALPS=m # # USB HID support # -CONFIG_USB_HID=y +CONFIG_USB_HID=m CONFIG_HID_PID=y CONFIG_USB_HIDDEV=y +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set + # # I2C HID support # @@ -4082,10 +4089,9 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y # CONFIG_USB_DEFAULT_PERSIST=y CONFIG_USB_DYNAMIC_MINORS=y -CONFIG_USB_OTG=y +# CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OTG_BLACKLIST_HUB is not set -# CONFIG_USB_OTG_FSM is not set CONFIG_USB_LEDS_TRIGGER_USBPORT=m CONFIG_USB_MON=m CONFIG_USB_WUSB_CBAF=m @@ -4099,10 +4105,10 @@ CONFIG_USB_XHCI_HCD=m # CONFIG_USB_XHCI_DBGCAP is not set CONFIG_USB_XHCI_PCI=m CONFIG_USB_XHCI_PLATFORM=m -CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_HCD=m # CONFIG_USB_EHCI_ROOT_HUB_TT is not set CONFIG_USB_EHCI_TT_NEWSCHED=y -CONFIG_USB_EHCI_PCI=y +CONFIG_USB_EHCI_PCI=m # CONFIG_USB_EHCI_HCD_PLATFORM is not set # CONFIG_USB_OXU210HP_HCD is not set # CONFIG_USB_ISP116X_HCD is not set @@ -4117,7 +4123,7 @@ CONFIG_USB_EHCI_PCI=y # # USB Device Class drivers # -CONFIG_USB_ACM=y +CONFIG_USB_ACM=m CONFIG_USB_PRINTER=m CONFIG_USB_WDM=m # CONFIG_USB_TMC is not set @@ -4300,28 +4306,28 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 # CONFIG_USB_GOKU is not set # CONFIG_USB_EG20T is not set # CONFIG_USB_DUMMY_HCD is not set -CONFIG_USB_LIBCOMPOSITE=y -CONFIG_USB_F_ACM=y -CONFIG_USB_F_SS_LB=y -CONFIG_USB_U_SERIAL=y -CONFIG_USB_U_ETHER=y +CONFIG_USB_LIBCOMPOSITE=m +CONFIG_USB_F_ACM=m +CONFIG_USB_F_SS_LB=m +CONFIG_USB_U_SERIAL=m +CONFIG_USB_U_ETHER=m CONFIG_USB_U_AUDIO=m -CONFIG_USB_F_SERIAL=y -CONFIG_USB_F_OBEX=y -CONFIG_USB_F_NCM=y -CONFIG_USB_F_ECM=y -CONFIG_USB_F_EEM=y -CONFIG_USB_F_SUBSET=y -CONFIG_USB_F_RNDIS=y -CONFIG_USB_F_MASS_STORAGE=y -CONFIG_USB_F_FS=y +CONFIG_USB_F_SERIAL=m +CONFIG_USB_F_OBEX=m +CONFIG_USB_F_NCM=m +CONFIG_USB_F_ECM=m +CONFIG_USB_F_EEM=m +CONFIG_USB_F_SUBSET=m +CONFIG_USB_F_RNDIS=m +CONFIG_USB_F_MASS_STORAGE=m +CONFIG_USB_F_FS=m CONFIG_USB_F_UAC1=m CONFIG_USB_F_UAC2=m CONFIG_USB_F_UVC=m CONFIG_USB_F_MIDI=m -CONFIG_USB_F_HID=y -CONFIG_USB_F_PRINTER=y -CONFIG_USB_CONFIGFS=y +CONFIG_USB_F_HID=m +CONFIG_USB_F_PRINTER=m +CONFIG_USB_CONFIGFS=m CONFIG_USB_CONFIGFS_SERIAL=y CONFIG_USB_CONFIGFS_ACM=y CONFIG_USB_CONFIGFS_OBEX=y @@ -4341,21 +4347,33 @@ CONFIG_USB_CONFIGFS_F_HID=y CONFIG_USB_CONFIGFS_F_UVC=y CONFIG_USB_CONFIGFS_F_PRINTER=y # CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=y +CONFIG_USB_AUDIO=m +# CONFIG_GADGET_UAC1 is not set +CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y CONFIG_USB_ETH_EEM=y -# CONFIG_USB_G_NCM is not set -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_FUNCTIONFS is not set -# CONFIG_USB_MASS_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set -# CONFIG_USB_G_PRINTER is not set -# CONFIG_USB_CDC_COMPOSITE is not set -# CONFIG_USB_G_ACM_MS is not set -# CONFIG_USB_G_MULTI is not set -# CONFIG_USB_G_HID is not set -# CONFIG_USB_G_DBGP is not set +CONFIG_USB_G_NCM=m +CONFIG_USB_GADGETFS=m +CONFIG_USB_FUNCTIONFS=m +CONFIG_USB_FUNCTIONFS_ETH=y +CONFIG_USB_FUNCTIONFS_RNDIS=y +CONFIG_USB_FUNCTIONFS_GENERIC=y +CONFIG_USB_MASS_STORAGE=m +CONFIG_USB_G_SERIAL=m +CONFIG_USB_MIDI_GADGET=m +CONFIG_USB_G_PRINTER=m +CONFIG_USB_CDC_COMPOSITE=m +CONFIG_USB_G_ACM_MS=m +CONFIG_USB_G_MULTI=m +CONFIG_USB_G_MULTI_RNDIS=y +CONFIG_USB_G_MULTI_CDC=y +CONFIG_USB_G_HID=m +CONFIG_USB_G_DBGP=m +# CONFIG_USB_G_DBGP_PRINTK is not set +CONFIG_USB_G_DBGP_SERIAL=y +CONFIG_USB_G_WEBCAM=m # CONFIG_TYPEC is not set +# CONFIG_USB_ROLE_SWITCH is not set CONFIG_USB_LED_TRIG=y CONFIG_USB_ULPI_BUS=y # CONFIG_UWB is not set @@ -5072,16 +5090,16 @@ CONFIG_DCACHE_WORD_ACCESS=y CONFIG_FS_IOMAP=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set -CONFIG_EXT4_FS=y +CONFIG_EXT4_FS=m CONFIG_EXT4_USE_FOR_EXT2=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_ENCRYPTION=y CONFIG_EXT4_FS_ENCRYPTION=y # CONFIG_EXT4_DEBUG is not set -CONFIG_JBD2=y +CONFIG_JBD2=m # CONFIG_JBD2_DEBUG is not set -CONFIG_FS_MBCACHE=y +CONFIG_FS_MBCACHE=m CONFIG_REISERFS_FS=m # CONFIG_REISERFS_CHECK is not set CONFIG_REISERFS_PROC_INFO=y @@ -5132,7 +5150,7 @@ CONFIG_EXPORTFS=y CONFIG_EXPORTFS_BLOCK_OPS=y CONFIG_FILE_LOCKING=y # CONFIG_MANDATORY_FILE_LOCKING is not set -CONFIG_FS_ENCRYPTION=y +CONFIG_FS_ENCRYPTION=m CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y @@ -5209,7 +5227,7 @@ CONFIG_TMPFS_XATTR=y CONFIG_HUGETLBFS=y CONFIG_HUGETLB_PAGE=y CONFIG_MEMFD_CREATE=y -CONFIG_CONFIGFS_FS=y +CONFIG_CONFIGFS_FS=m CONFIG_EFIVAR_FS=y CONFIG_MISC_FILESYSTEMS=y # CONFIG_ORANGEFS_FS is not set @@ -5407,8 +5425,16 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 CONFIG_SECURITY_SELINUX_DEVELOP=y CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 -# CONFIG_SECURITY_SMACK is not set -# CONFIG_SECURITY_TOMOYO is not set +CONFIG_SECURITY_SMACK=y +CONFIG_SECURITY_SMACK_BRINGUP=y +CONFIG_SECURITY_SMACK_NETFILTER=y +CONFIG_SECURITY_SMACK_APPEND_SIGNALS=y +CONFIG_SECURITY_TOMOYO=y +CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 +CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 +# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set +CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" +CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 CONFIG_SECURITY_APPARMOR_HASH=y @@ -5422,6 +5448,8 @@ CONFIG_INTEGRITY_AUDIT=y # CONFIG_IMA is not set # CONFIG_EVM is not set # CONFIG_DEFAULT_SECURITY_SELINUX is not set +# CONFIG_DEFAULT_SECURITY_SMACK is not set +# CONFIG_DEFAULT_SECURITY_TOMOYO is not set # CONFIG_DEFAULT_SECURITY_APPARMOR is not set CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_DEFAULT_SECURITY="" @@ -5496,14 +5524,14 @@ CONFIG_CRYPTO_ECHAINIV=m # # Block modes # -CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_CBC=m CONFIG_CRYPTO_CFB=m CONFIG_CRYPTO_CTR=y -CONFIG_CRYPTO_CTS=y -CONFIG_CRYPTO_ECB=y +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_ECB=m CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_XTS=y +CONFIG_CRYPTO_XTS=m CONFIG_CRYPTO_KEYWRAP=m # diff --git a/firmware/firmware-asus-me176c-acpi/APKBUILD b/firmware/firmware-asus-me176c-acpi/APKBUILD new file mode 100644 index 000000000..90541e582 --- /dev/null +++ b/firmware/firmware-asus-me176c-acpi/APKBUILD @@ -0,0 +1,27 @@ +pkgname=firmware-asus-me176c-acpi +pkgver=0_git20190206 +pkgrel=1 +arch="x86_64" +pkgdesc="Patched ACPI DSDT table for ASUS MeMO Pad 7 (ME176C(X))" +url="https://github.com/me176c-dev/me176c-acpi" +license="unknown" +options="!check !strip !checkarch" +makedepends="iasl" + +_commit=9c25272d67965b7bbc03283e333822f02a8f9a9a +source="$url/archive/$_commit.tar.gz" +builddir="$srcdir/me176c-acpi-$_commit" + +build() { + iasl dsdt.dsl + + mkdir -p kernel/firmware/acpi + cp dsdt.aml kernel/firmware/acpi/dsdt.aml + echo kernel/firmware/acpi/dsdt.aml | cpio -o -H newc -R 0:0 > acpi.img +} + +package() { + install -Dm644 acpi.img "$pkgdir"/boot/acpi-me176c.img +} + +sha512sums="c85db14df9e6d90d3e63f496243d27ee9750b302c1829a678ea51e9070f5e8679ea51e65609a43d8ae359287f713da37ea98df2e39b22e0a7a797bff4c63768d 9c25272d67965b7bbc03283e333822f02a8f9a9a.tar.gz" diff --git a/firmware/firmware-asus-me176c/APKBUILD b/firmware/firmware-asus-me176c/APKBUILD index 475a12e55..e2e34ff01 100644 --- a/firmware/firmware-asus-me176c/APKBUILD +++ b/firmware/firmware-asus-me176c/APKBUILD @@ -1,23 +1,24 @@ pkgname=firmware-asus-me176c pkgver=12.10.1.36 -pkgrel=0 +pkgrel=1 arch="x86_64" -pkgdesc="Firmware for asus-me176c" +pkgdesc="Firmware for ASUS MeMO Pad 7 (ME176C(X))" +url="https://dlcdnets.asus.com/pub/ASUS/EeePAD/ME176C/UL-K013-WW-$pkgver-user.zip" license="unknown" options="!check !strip !checkarch" -url="http://dlcdnet.asus.com/pub/ASUS/EeePAD/ME176C/UL-K013-WW-$pkgver-user.zip" +source="$url" -source=" - http://dlcdnet.asus.com/pub/ASUS/EeePAD/ME176C/UL-K013-WW-$pkgver-user.zip -" +_fwdir="/lib/firmware/postmarketos" package() { cd "$srcdir" - - # WiFi NVRAM file - install -Dm644 system/etc/nvram.txt "$pkgdir/lib/firmware/brcm/brcmfmac43362-sdio.txt" - # Bluetooth firmware - install -Dm644 system/etc/firmware/BCM2076B1_002.002.004.0132.0141_reduced_2dB.hcd "$pkgdir/lib/firmware/brcm/BCM.hcd" + # WiFi + install -Dm644 system/vendor/firmware/bcm43362/fw_bcmdhd.bin "$pkgdir/$_fwdir"/brcm/brcmfmac43362-sdio.bin + install -Dm644 system/etc/nvram.txt "$pkgdir/$_fwdir"/brcm/brcmfmac43362-sdio.txt + + # Bluetooth + install -Dm644 system/etc/firmware/BCM2076B1_002.002.004.0132.0141_reduced_2dB.hcd "$pkgdir/$_fwdir"/brcm/BCM2076B1.hcd } + sha512sums="4bfb30fcc872b9e3d57f251bff7a3fe9349d90a02c2c9ef8af938fad9d84ff3367723a2fee0dc7a5a10c3df1d4e28a766ae69f967b6a45e1835f284e61762404 UL-K013-WW-12.10.1.36-user.zip"