From f614ba8614116835d9a69ab07a26fe4ed47284ba Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 24 Jul 2024 00:14:51 +0300 Subject: [PATCH] fix main --- .github/workflows/build-canaryv3.yml | 3 +++ .github/workflows/build-nestv3.yml | 3 +++ .github/workflows/release-canaryv3.yml | 3 +++ .github/workflows/release-nestv3.yml | 3 +++ debian/changelog | 6 ++++++ debian/control | 6 +++--- debian/scripts/get_pwd.sh | 2 -- mainv3.sh | 24 ++++++++++++++++++------ 8 files changed, 39 insertions(+), 11 deletions(-) delete mode 100755 debian/scripts/get_pwd.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-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-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-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 244f0dc..2fae4da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +booster (0.11.3.ferreogit-101pika1) pika; urgency=medium + + * Update depends + + -- ferreo Wed, 18 Jan 2023 21:48:14 +0000 + booster (0.11.3.git-101pika1) pika; urgency=medium * Update depends diff --git a/debian/control b/debian/control index 85913f9..5013067 100644 --- a/debian/control +++ b/debian/control @@ -9,20 +9,20 @@ Rules-Requires-Root: no Package: booster Architecture: linux-any -Depends: ${misc:Depends}, libdevmapper-dev, libdevmapper-event1.02.1, libdevmapper1.02.1, busybox, console-data, lvm2, pciutils +Depends: ${misc:Depends}, ${shlibs:Depends}, libdevmapper-dev, libdevmapper-event1.02.1, libdevmapper1.02.1, busybox, console-data, lvm2, pciutils Replaces: booster-temp Conflicts: booster-temp Description: booster initramfs generation Package: booster-placeholder Architecture: linux-any -Depends: ${misc:Depends}, libdevmapper-dev, libdevmapper-event1.02.1, libdevmapper1.02.1, busybox, pciutils +Depends: ${misc:Depends}, ${shlibs:Depends}, libdevmapper-dev, libdevmapper-event1.02.1, libdevmapper1.02.1, busybox, pciutils Provides: booster (= ${binary:Version}) Description: PLACEHOLDER FOR ISO BUILDS DO NOT USE. Package: booster-temp Architecture: linux-any -Depends: ${misc:Depends}, libdevmapper-dev, libdevmapper-event1.02.1, libdevmapper1.02.1, busybox, pciutils +Depends: ${misc:Depends}, ${shlibs:Depends}, libdevmapper-dev, libdevmapper-event1.02.1, libdevmapper1.02.1, busybox, pciutils Provides: booster (= ${binary:Version}) Replaces: booster Conflicts: booster 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/mainv3.sh b/mainv3.sh index d90e31f..606f64b 100755 --- a/mainv3.sh +++ b/mainv3.sh @@ -1,19 +1,31 @@ #! /bin/bash -DEBIAN_FRONTEND=noninteractive +set -e + +VERSION="0.11.3.ferreogit" + +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" +export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" +export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" +export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" +export DEB_BUILD_OPTIONS="nocheck notest terse" +export DPKG_GENSYMBOLS_CHECK_LEVEL=0 # Clone Upstream git clone https://github.com/ferrreo/booster.git -cd booster -cp -rvf ../debian ./ -cp -f ../Makefile ./Makefile -cp -f ../booster.yml ./booster.yml -cp -f ../update-initramfs ./update-initramfs +cp -rvf ./debian ./booster/ +cp -vf ./Makefile ./booster/ +cp -vf ./booster.yml ./booster/ +cp -vf ./update-initramfs ./booster/ +cd ./booster # Get build deps apt-get build-dep ./ -y # Build package +LOGNAME=root dh_make --createorig -y -l -p booster_"$VERSION" || echo "dh-make: Ignoring Last Error" dpkg-buildpackage --no-sign # Move the debs to output