diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..b3134b1 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,50 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "label": "Build Packgage", + "type": "shell", + "command": " cd ${input:Package}; abuild -r", + "problemMatcher": [], + "group": { + "kind": "build", + "isDefault": true + } + }, + { + "label": "Clean Package", + "type": "shell", + "command": " cd ${input:Package}; abuild clean; abuild cleancache", + "problemMatcher": [], + "group": { + "kind": "build", + "isDefault": true + } + }, + { + "label": "Re-generate checksum for package sources", + "type": "shell", + "command": " cd ${input:Package}; abuild clean; abuild cleancache; abuild checksum", + "problemMatcher": [], + "group": { + "kind": "build", + "isDefault": true + } + }, + ], + "inputs": [ + { + "type": "pickString", + "id": "Package", + "description": "Wich package shoud the command be applied to", + "options": [ + "minisatip", + "nut", + "custom-firmware", + "rflink" + ], + }, + ] +} \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 5587acc..7814626 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -//When setting up this pipeline, please enable SCM branch to '*/Main' and enable 'checkout to subdirectory' to checkout to 'AlpinePackages' +//When setting up this pipeline, please enable SCM branch to '*/Main' pipeline { agent none @@ -22,9 +22,12 @@ pipeline { stage('Prepair') { steps { echo "Prepairing on ${Arch}" - // cleanWs() + cleanWs() // Checkout the repository - checkout scm + dir('AlpinePackages') { + checkout scm + } + sh 'if [ ! -L out ];then ln -s ~/packages/AlpinePackages ./out;fi' script{ diff --git a/minisatip/APKBUILD b/minisatip/APKBUILD index 80cd92f..30b5547 100644 --- a/minisatip/APKBUILD +++ b/minisatip/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Bram Prieshof pkgname=minisatip -pkgver=2.0.71 +pkgver=2.0.75 pkgrel=0 pkgdesc="SATIP server" url="https://github.com/catalinii/minisatip" arch="all" license="GPL-2.0-or-later" depends="linux-headers openssl curl libdvbcsa libxml2" -makedepends="openssl-dev openssl-libs-static libdvbcsa-dev libxml2-dev" +makedepends="openssl-dev openssl-libs-static libdvbcsa-dev libxml2-dev cmake ninja-build ninja-is-really-ninja" options=" !check !archcheck" source="minisatip-src.tar.gz::https://codeload.github.com/catalinii/minisatip/tar.gz/v$pkgver @@ -18,20 +18,23 @@ _builddir="$srcdir"/$pkgname-$pkgver build() { cd "${_builddir}" - sed -i 's/bash/ash/' ./tools/determine_version.sh - ./configure --enable-static - if [ "$CARCH" = "armhf" ] || [ "$CARCH" = "armv7" ]; then sed -i 's/CXX23=.*/CXX23=0/' src/Makefile ;fi - make + #sed -i 's/bash/ash/' ./tools/determine_version.sh + #./configure --enable-static + cmake -B build + #if [ "$CARCH" = "armhf" ] || [ "$CARCH" = "armv7" ]; then sed -i 's/CXX23=.*/CXX23=0/' src/Makefile ;fi + cd build + sed -i "s/\~/${pkgver}-r${pkgrel}/" config.h + ninja } package() { install -D -m755 "$srcdir"/minisatip.initd "$pkgdir"/etc/init.d/minisatip - install -D -m755 "${_builddir}"/minisatip "$pkgdir"/usr/sbin/minisatip + install -D -m755 "${_builddir}"/build/minisatip "$pkgdir"/usr/sbin/minisatip mkdir -p "$pkgdir"/usr/share/minisatip mv "${_builddir}"/html "$pkgdir"/usr/share/minisatip } sha512sums=" -fec3e49bf161b9f1362e3db5dc40245bd5b0a68efd65e039f6c70728233a11ff54b50ec9fc65026460bc0166a35ce9dd3eb7f262510050869f7c1e457e2aba55 minisatip-src.tar.gz +b700626d58f48322cbf9f326b003d62637599ae0062cccd9bfdb52ae9b6bb9198dcd9ed6f253178a753a09951f498417324269ededeeb196310f317428ac99b1 minisatip-src.tar.gz 970823cd26821af97bd099104b8c2b5376a21701b0e3d0e8947b6784091c4bfb179af8064d9bcfc18d9629705b5b3999d6cbfcb19bf2f4d20593d08f95e3d849 minisatip.initd "