diff --git a/aports/device/device-motorola-peregrine/APKBUILD b/aports/device/device-motorola-peregrine/APKBUILD index 0c79d0c72cba0f6fba02a9ba1a070fc47476d015..0044c9c057135c32a91b9f8adf6de51b66f49b9b 100644 --- a/aports/device/device-motorola-peregrine/APKBUILD +++ b/aports/device/device-motorola-peregrine/APKBUILD @@ -7,7 +7,7 @@ url="https://postmarketos.org" license="MIT" arch="noarch" options="!check" -depends="linux-motorola-peregrine firmware-motorola-titan mkbootimg mesa-dri-swrast msm-fb-refresher" +depends="postmarketos-base linux-motorola-peregrine firmware-motorola-titan mkbootimg mesa-dri-swrast msm-fb-refresher" makedepends="devicepkg-dev" source="deviceinfo" diff --git a/aports/device/linux-motorola-peregrine/01_msm-fix-perf_trace_counters.patch b/aports/device/linux-motorola-peregrine/01_msm-fix-perf_trace_counters.patch deleted file mode 100644 index 97812bf4ecf6367025d77ffabbd581d46c8a15eb..0000000000000000000000000000000000000000 --- a/aports/device/linux-motorola-peregrine/01_msm-fix-perf_trace_counters.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e41494c15d4df342854ac3d2940f5d6ac3158212 Mon Sep 17 00:00:00 2001 -From: Bryan Huntsman <bryanh@codeaurora.org> -Date: Mon, 3 Jun 2013 18:48:08 -0700 -Subject: [PATCH] msm: fix in-tree compilation for perf_trace_counters - -In-tree compilation for arch/arm/mach-msm/perf_trace_counters.c was -hitting this error: - - In file included from arch/arm/mach-msm/perf_trace_counters.h:127:0, - from arch/arm/mach-msm/perf_trace_counters.c:14: - include/trace/define_trace.h:79:43: fatal error: ./perf_trace_counters.h: No such file or directory - -Instructions for TRACE_INCLUDE_FILE in include/trace/define_trace.h say -"the path is relative to define_trace.h, not the file including it". -Fix in-tree compilation by making the path relative to define_trace.h. - -Signed-off-by: Bryan Huntsman <bryanh@codeaurora.org> ---- - arch/arm/mach-msm/perf_trace_counters.h | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/arch/arm/mach-msm/perf_trace_counters.h b/arch/arm/mach-msm/perf_trace_counters.h -index ce7e336aa40d..8f77badf42ac 100644 ---- a/arch/arm/mach-msm/perf_trace_counters.h -+++ b/arch/arm/mach-msm/perf_trace_counters.h -@@ -121,7 +121,6 @@ TRACE_EVENT(sched_switch_with_ctrs, - - #endif - #undef TRACE_INCLUDE_PATH --#define TRACE_INCLUDE_PATH . -+#define TRACE_INCLUDE_PATH ../../arch/arm/mach-msm - #define TRACE_INCLUDE_FILE perf_trace_counters - #include <trace/define_trace.h> -- diff --git a/aports/device/linux-motorola-peregrine/02_gpu-msm-fix-gcc5-compile.1.patch b/aports/device/linux-motorola-peregrine/02_gpu-msm-fix-gcc5-compile.1.patch deleted file mode 100644 index 91b17cd76b7a5fa7dc1dedcf4362edf71082101b..0000000000000000000000000000000000000000 --- a/aports/device/linux-motorola-peregrine/02_gpu-msm-fix-gcc5-compile.1.patch +++ /dev/null @@ -1,33 +0,0 @@ -source: -https://github.com/ShinySide/HispAsian_Lollipop_G6/commit/b7756b6fc4bb728722b14d2dfdbaf1dc843812e9 - -* These need to be static to avoid these errors: - -drivers/built-in.o: In function `.LANCHOR1': -msm_iommu_sec.c:(.data+0x9298): undefined reference to `kgsl_iommu_sync_lock' -msm_iommu_sec.c:(.data+0x929c): undefined reference to `kgsl_iommu_sync_unlock' -Makefile:877: recipe for target '.tmp_vmlinux1' failed -make: *** [.tmp_vmlinux1] Error 1 - -Signed-off-by: Chet Kener <Cl3Kener@gmail.com> - ---- a/drivers/gpu/msm/kgsl_iommu.c -+++ b/drivers/gpu/msm/kgsl_iommu.c -@@ -1010,7 +1010,7 @@ static int kgsl_iommu_init_sync_lock(struct kgsl_mmu *mmu) - * - * Return - int - number of commands. - */ --inline unsigned int kgsl_iommu_sync_lock(struct kgsl_mmu *mmu, -+static inline unsigned int kgsl_iommu_sync_lock(struct kgsl_mmu *mmu, - unsigned int *cmds) - { - struct kgsl_device *device = mmu->device; -@@ -1080,7 +1080,7 @@ inline unsigned int kgsl_iommu_sync_lock(struct kgsl_mmu *mmu, - * - * Return - int - number of commands. - */ --inline unsigned int kgsl_iommu_sync_unlock(struct kgsl_mmu *mmu, -+static inline unsigned int kgsl_iommu_sync_unlock(struct kgsl_mmu *mmu, - unsigned int *cmds) - { - struct kgsl_device *device = mmu->device; diff --git a/aports/firmware/firmware-motorola-titan/APKBUILD b/aports/firmware/firmware-motorola-titan/APKBUILD index 067492149d1894912e2ba4dd40a38f552e316a00..4f0d8b5ac667b83226fef243bf59a8df21e3a5a6 100644 --- a/aports/firmware/firmware-motorola-titan/APKBUILD +++ b/aports/firmware/firmware-motorola-titan/APKBUILD @@ -1,7 +1,7 @@ pkgname=firmware-motorola-titan pkgver=1 pkgrel=1 -pkgdesc="Firmware files for Motorola Moto G 2014 (titan)" +pkgdesc="Firmware files for Motorola Moto G 2014 (titan) and Moto G 4G 2013 (peregrine)" url="https://github.com/postmarketOS" arch="noarch" license="proprietary"