fix: naming

This commit is contained in:
Tobias Reisinger 2020-07-01 23:39:09 +02:00
parent 340489da6d
commit 3c0a34f842
10 changed files with 16 additions and 20 deletions

View file

@ -24,18 +24,18 @@ sha256sums=('8c1195f9d23edb195bf88363e066bf25dfa8b31c1f05f9be51e800ccf763ea4e'
'5a4ce46c1302546509c0024d4614b5b0d47dde02467b7bf52b28ef6c4ead91e7') '5a4ce46c1302546509c0024d4614b5b0d47dde02467b7bf52b28ef6c4ead91e7')
prepare() { prepare() {
cd "$pkgname" cd "controller"
mkdir -p "build" mkdir -p "build"
} }
build() { build() {
cd "$pkgname/build" || exit 1 cd "controller/build" || exit 1
cmake -DWIRING_PI_DEBUG=ON .. cmake -DWIRING_PI_DEBUG=ON ..
make make
} }
package() { package() {
install -Dm755 "${pkgname}/build/controller" "${pkgdir}/usr/bin/emgauwa-controller" install -Dm755 "controller/build/controller" "${pkgdir}/usr/bin/emgauwa-controller"
install -Dm660 "controller.ini" "${pkgdir}/etc/emgauwa/controller.ini" install -Dm660 "controller.ini" "${pkgdir}/etc/emgauwa/controller.ini"
install -Dm644 "${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" install -Dm644 "${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"

View file

@ -14,28 +14,28 @@ conflicts=('emgauwa-controller')
backup=('etc/emgauwa/controller.ini') backup=('etc/emgauwa/controller.ini')
source=("https://git.serguzim.me/emgauwa/controller/archive/v$pkgver.tar.gz" source=("https://git.serguzim.me/emgauwa/controller/archive/v$pkgver.tar.gz"
"controller.ini" "controller.ini"
"emgauwa-controller-testing.service" "emgauwa-controller.service"
"emgauwa-controller-testing.sysusers" "emgauwa-controller.sysusers"
"emgauwa-controller-testing.tmpfiles") "emgauwa-controller.tmpfiles")
sha256sums=('8a191242a329e0b559aac06584e8513254a065ae3780d59f62955bb52fec5d7c' sha256sums=('8a191242a329e0b559aac06584e8513254a065ae3780d59f62955bb52fec5d7c'
'e467db2a2b382f34c125d01c735eb4ea83b971eb0928ac2863d19b7c151301c0' '91d6bb80b7bfabbe3fc500c72ecc5173c70ef27483135a02739c74baa5720298'
'8ece4b409d5550cdae23591217e440d8599ebf2175f2a91574c0b069314879a0' '8ece4b409d5550cdae23591217e440d8599ebf2175f2a91574c0b069314879a0'
'b9cde58b9e9b0605ca4a1eddd78067c55aa3c8d40f80cde0a25c4da9f6f95798' 'b9cde58b9e9b0605ca4a1eddd78067c55aa3c8d40f80cde0a25c4da9f6f95798'
'5a4ce46c1302546509c0024d4614b5b0d47dde02467b7bf52b28ef6c4ead91e7') '5a4ce46c1302546509c0024d4614b5b0d47dde02467b7bf52b28ef6c4ead91e7')
prepare() { prepare() {
cd "$pkgname" cd "controller"
mkdir -p "build" mkdir -p "build"
} }
build() { build() {
cd "$pkgname/build" || exit 1 cd "controller/build" || exit 1
cmake -DWIRING_PI_DEBUG=ON .. cmake -DWIRING_PI_DEBUG=ON ..
make make
} }
package() { package() {
install -Dm755 "${pkgname}/build/controller" "${pkgdir}/usr/bin/emgauwa-controller" install -Dm755 "controller/build/controller" "${pkgdir}/usr/bin/emgauwa-controller"
install -Dm660 "controller.ini" "${pkgdir}/etc/emgauwa/controller.ini" install -Dm660 "controller.ini" "${pkgdir}/etc/emgauwa/controller.ini"
install -Dm644 "${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" install -Dm644 "${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"

View file

@ -23,23 +23,19 @@ sha256sums=('f1869e952835308ca921b96c9d2160c74ed511fcd3da6c5bd47a4e87302da67a'
'b9cde58b9e9b0605ca4a1eddd78067c55aa3c8d40f80cde0a25c4da9f6f95798' 'b9cde58b9e9b0605ca4a1eddd78067c55aa3c8d40f80cde0a25c4da9f6f95798'
'0531f10303410afd7e53099e66b124ef2fd14afec9d33c4a0146793375acb6c2') '0531f10303410afd7e53099e66b124ef2fd14afec9d33c4a0146793375acb6c2')
pkgver() {
grep -Po "^ *VERSION \K[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+$" "${pkgname}/CMakeLists.txt"
}
prepare() { prepare() {
cd "$pkgname" cd "core"
mkdir -p "build" mkdir -p "build"
} }
build() { build() {
cd "$pkgname/build" || exit 1 cd "core/build" || exit 1
cmake .. cmake ..
make make
} }
package() { package() {
install -Dm755 "${pkgname}/build/core" "${pkgdir}/usr/bin/emgauwa-core" install -Dm755 "core/build/core" "${pkgdir}/usr/bin/emgauwa-core"
install -Dm600 "core.ini" "${pkgdir}/etc/emgauwa/core.ini" install -Dm600 "core.ini" "${pkgdir}/etc/emgauwa/core.ini"
install -Dm644 "${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" install -Dm644 "${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"

View file

@ -24,18 +24,18 @@ sha256sums=('82984c9742a63f9e8a561229b00926a85ff27a283054aa92f8ec712d67f87222'
'0531f10303410afd7e53099e66b124ef2fd14afec9d33c4a0146793375acb6c2') '0531f10303410afd7e53099e66b124ef2fd14afec9d33c4a0146793375acb6c2')
prepare() { prepare() {
cd "$pkgname" cd "core"
mkdir -p "build" mkdir -p "build"
} }
build() { build() {
cd "$pkgname/build" || exit 1 cd "core/build" || exit 1
cmake .. cmake ..
make make
} }
package() { package() {
install -Dm755 "${pkgname}/build/core" "${pkgdir}/usr/bin/emgauwa-core" install -Dm755 "core/build/core" "${pkgdir}/usr/bin/emgauwa-core"
install -Dm600 "core.ini" "${pkgdir}/etc/emgauwa/core.ini" install -Dm600 "core.ini" "${pkgdir}/etc/emgauwa/core.ini"
install -Dm644 "${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" install -Dm644 "${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"