From 05ddaa63560983eb01741bc488bcb0b7d72a3bd5 Mon Sep 17 00:00:00 2001 From: Alastair Pharo Date: Wed, 5 Jan 2022 17:33:48 +1100 Subject: [PATCH] Fix rk3399 PKGBUILD --- pkgbuilds/PKGBUILD-rk3399 | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/pkgbuilds/PKGBUILD-rk3399 b/pkgbuilds/PKGBUILD-rk3399 index 5f3b8883..b7c1dd58 100644 --- a/pkgbuilds/PKGBUILD-rk3399 +++ b/pkgbuilds/PKGBUILD-rk3399 @@ -19,26 +19,12 @@ pkgver() { printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } -prepare() { - cd "${srcdir}/${pkgname%-rk3399-git}" - if [[ ! -d ./build ]]; then - mkdir build && cd build - cmake .. -DRK3399=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo - fi -} - build() { - cd "$srcdir/${pkgname%-rk3399-git}/build" - make -j$(nproc) + cmake -B build -S "${pkgname%-rk3399-git}" -DRK3399=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr + make -C build } package() { - cd "$srcdir/${pkgname%-arm-git}/build" + cd "$srcdir/${pkgname%-rk3399-git}/build" make DESTDIR="${pkgdir}/" install - # /usr/local/bin isn't in PATH by the default, - # we should move it to /usr/bin - cd ${pkgdir} - mv usr/local/bin/ usr/bin/ - # cleanup when dir is empty - rmdir usr/local || exit 0 }