diff --git a/.github/workflows/build-canaryi386.yml b/.github/workflows/build-canaryi386.yml index 27c6068..bbcebda 100644 --- a/.github/workflows/build-canaryi386.yml +++ b/.github/workflows/build-canaryi386.yml @@ -30,5 +30,8 @@ jobs: known_hosts: ${{ secrets.KNOWN_HOSTS }} if_key_exists: replace + - name: Update APT Cache + run: apt-get update -y + - name: Build Package run: ./maini386.sh diff --git a/.github/workflows/build-canaryv3.yml b/.github/workflows/build-canaryv3.yml index 61fbee7..a6164ae 100644 --- a/.github/workflows/build-canaryv3.yml +++ b/.github/workflows/build-canaryv3.yml @@ -30,5 +30,8 @@ jobs: known_hosts: ${{ secrets.KNOWN_HOSTS }} if_key_exists: replace + - name: Update APT Cache + run: apt-get update -y + - name: Build Package run: ./mainv3.sh diff --git a/.github/workflows/build-nesti386.yml b/.github/workflows/build-nesti386.yml index 23022bf..143ee7d 100644 --- a/.github/workflows/build-nesti386.yml +++ b/.github/workflows/build-nesti386.yml @@ -30,5 +30,8 @@ jobs: known_hosts: ${{ secrets.KNOWN_HOSTS }} if_key_exists: replace + - name: Update APT Cache + run: apt-get update -y + - name: Build Package run: ./maini386.sh diff --git a/.github/workflows/build-nestv3.yml b/.github/workflows/build-nestv3.yml index 0d013ba..352cca0 100644 --- a/.github/workflows/build-nestv3.yml +++ b/.github/workflows/build-nestv3.yml @@ -30,5 +30,8 @@ jobs: known_hosts: ${{ secrets.KNOWN_HOSTS }} if_key_exists: replace + - name: Update APT Cache + run: apt-get update -y + - name: Build Package run: ./mainv3.sh diff --git a/.github/workflows/release-canaryi386.yml b/.github/workflows/release-canaryi386.yml index a4c3f5c..82964f8 100644 --- a/.github/workflows/release-canaryi386.yml +++ b/.github/workflows/release-canaryi386.yml @@ -30,6 +30,9 @@ jobs: known_hosts: ${{ secrets.KNOWN_HOSTS }} if_key_exists: replace + - name: Update APT Cache + run: apt-get update -y + - name: Build Package run: ./maini386.sh diff --git a/.github/workflows/release-canaryv3.yml b/.github/workflows/release-canaryv3.yml index 5b36604..763db72 100644 --- a/.github/workflows/release-canaryv3.yml +++ b/.github/workflows/release-canaryv3.yml @@ -30,6 +30,9 @@ jobs: known_hosts: ${{ secrets.KNOWN_HOSTS }} if_key_exists: replace + - name: Update APT Cache + run: apt-get update -y + - name: Build Package run: ./mainv3.sh diff --git a/.github/workflows/release-nesti386.yml b/.github/workflows/release-nesti386.yml index 00292eb..96c8b36 100644 --- a/.github/workflows/release-nesti386.yml +++ b/.github/workflows/release-nesti386.yml @@ -30,6 +30,9 @@ jobs: known_hosts: ${{ secrets.KNOWN_HOSTS }} if_key_exists: replace + - name: Update APT Cache + run: apt-get update -y + - name: Build Package run: ./maini386.sh diff --git a/.github/workflows/release-nestv3.yml b/.github/workflows/release-nestv3.yml index 36a34fb..cbd3f5b 100644 --- a/.github/workflows/release-nestv3.yml +++ b/.github/workflows/release-nestv3.yml @@ -30,6 +30,9 @@ jobs: known_hosts: ${{ secrets.KNOWN_HOSTS }} if_key_exists: replace + - name: Update APT Cache + run: apt-get update -y + - name: Build Package run: ./mainv3.sh diff --git a/debian/changelog b/debian/changelog index 328bc5c..6d8d068 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -upstream-name (pkgver-pkgrel) distro_codename; urgency=medium +upstream-name (1.0-101pika1) pika; urgency=medium * Initial release. (Closes: #nnnn) diff --git a/debian/rules b/debian/rules index ed40aff..f25c868 100755 --- a/debian/rules +++ b/debian/rules @@ -4,20 +4,6 @@ ## Output every command that modifies files on the build system. export DH_VERBOSE = 1 -## === Set paths env vars === - -## Source directory, called upon by $(srcdir) -srcdir = $(shell debian/scripts/get_pwd.sh) -## The Root of package number one, called upon by $(pkgdir1) -pkgdir1 = $(srcdir)/debian/pkgdir1 -## The Root of package number two, you can add as many of these as you like -pkgdir2 = $(srcdir)/debian/pkgdir2 - -## If building a singular package you can remove the number, and as you guessed you call upon it with $(pkgdir) -# pkgdir = $(srcdir)/debian/pkgdir - -## === End end of region === - ## === the chain of command === ## debuild runs a chain of dh functions in the following order: ## dh_testdir @@ -70,8 +56,8 @@ pkgdir2 = $(srcdir)/debian/pkgdir2 ## overriding dh_install to install files to a package: #override_dh_auto_configure: -# mkdir -p $(pkgdir1)/usr/bin -# cp $(srcdir)/pikman $(pkgdir1)/usr/bin/ +# mkdir -p debian/pikman/usr/bin +# cp pikman debian/pikman/usr/bin/ ## === End end of region === diff --git a/debian/scripts/get_pwd.sh b/debian/scripts/get_pwd.sh deleted file mode 100755 index ef98ce9..0000000 --- a/debian/scripts/get_pwd.sh +++ /dev/null @@ -1,2 +0,0 @@ -#! /bin/sh -env | grep -w "PWD" | cut -c5- diff --git a/debian/source/format b/debian/source/format index 89ae9db..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (native) +3.0 (quilt) diff --git a/maini386.sh b/maini386.sh index 310ed5c..dd7ca3f 100755 --- a/maini386.sh +++ b/maini386.sh @@ -1,5 +1,9 @@ #! /bin/bash +set -e + +VERSION="1.0" + export DEBIAN_FRONTEND="noninteractive" export DEB_BUILD_OPTIONS="nocheck notest terse" export DPKG_GENSYMBOLS_CHECK_LEVEL=0 @@ -10,6 +14,7 @@ cp -rvf ./debian ./src-pkg-name/ cd ./src-pkg-name/ # Get build deps +LOGNAME=root dh_make --createorig -y -l -p src-pkg-name_"$VERSION" || echo "dh-make: Ignoring Last Error" apt-get build-dep ./ -y # Build package diff --git a/mainv3.sh b/mainv3.sh index 5261e8a..8f56325 100755 --- a/mainv3.sh +++ b/mainv3.sh @@ -1,5 +1,9 @@ #! /bin/bash +set -e + +VERSION="1.0" + export DEBIAN_FRONTEND="noninteractive" export DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" @@ -15,6 +19,7 @@ cp -rvf ./debian ./src-pkg-name/ cd ./src-pkg-name/ # Get build deps +LOGNAME=root dh_make --createorig -y -l -p src-pkg-name_"$VERSION" || echo "dh-make: Ignoring Last Error" apt-get build-dep ./ -y # Build package