Fix build & migrate i386 build

This commit is contained in:
Ward Nakchbandi (Cosmic Fusion) 2023-07-12 19:32:50 +03:00 committed by GitHub
parent 25641052c0
commit 35be9d9194
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 42 deletions

View File

@ -7,7 +7,7 @@ jobs:
build: build:
runs-on: self-hosted runs-on: self-hosted
container: container:
image: ubuntu:23.04 image: ghcr.io/pikaos-linux/pika-i386-package-container:latest
volumes: volumes:
- /proc:/proc - /proc:/proc
options: --privileged -it options: --privileged -it
@ -15,9 +15,6 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install needed packages
run: apt update && apt install software-properties-common sudo git bc gpg gpg-agent bison build-essential ccache cpio fakeroot flex git kmod libelf-dev libncurses5-dev libssl-dev lz4 qtbase5-dev rsync schedtool wget zstd tar reprepro dpkg-sig devscripts dh-make -y
- name: Import GPG key - name: Import GPG key
id: import_gpg id: import_gpg
uses: crazy-max/ghaction-import-gpg@v5 uses: crazy-max/ghaction-import-gpg@v5
@ -34,7 +31,7 @@ jobs:
if_key_exists: replace if_key_exists: replace
- name: Build Package - name: Build Package
run: ./main32.sh run: ./main.sh
- name: Release Package - name: Release Package
run: ./release.sh run: ./release.sh

View File

@ -1,4 +1,4 @@
usr/bin/mangoapp usr/bin/mangoapp
usr/lib/*/mangohud/libMangoApp.so usr/lib/*/mangohud/libMangoApp.so
usr/share/vulkan/implicit_layer.d/libMangoApp.json usr/share/vulkan/implicit_layer.d/*
usr/share/man/man1/mangoapp.1 usr/share/man/man1/mangoapp.1

View File

@ -1,2 +0,0 @@
#echo "deb [trusted=yes] https://ppa.pika-os.com/ lunar main" >> /etc/apt/sources.list
apt-get update

View File

@ -11,7 +11,7 @@ apt-get build-dep ./ -y
LOGNAME=root dh_make --createorig -y -l -p mangohud_0.6.9.1 LOGNAME=root dh_make --createorig -y -l -p mangohud_0.6.9.1
dpkg-buildpackage dpkg-buildpackage --no-sign
# Move the debs to output # Move the debs to output
cd ../ cd ../

View File

@ -1,37 +1,19 @@
# Add dependent repositories
sudo dpkg --add-architecture i386
wget -q -O - https://ppa.pika-os.com/key.gpg | sudo apt-key add -
touch /etc/apt/sources.list.d/pika.list
echo 'deb https://ppa.pika-os.com/ lunar main' > /etc/apt/sources.list.d/pika.list
add-apt-repository ppa:pikaos/pika
add-apt-repository ppa:kubuntu-ppa/backports
apt update
# Clone Upstream # Clone Upstream
git clone https://github.com/flightlessmango/MangoHud -b v0.6.9-1 git clone https://github.com/flightlessmango/MangoHud -b v0.6.9-1
mv ./MangoHud ./mangohud mv ./MangoHud ./mangohud
cp -rvf ./debian ./mangohud/ cp -rvf ./debian ./mangohud/
cd ./mangohud cd ./mangohud
LOGNAME=root dh_make --createorig -y -l -p mangohud_0.6.9.1
# Get build deps # Get build deps
ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime apt-get build-dep ./ -y
DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata
apt-get build-dep -y ./
debuild -S -uc -us
cd ../
apt-get install -y pbuilder debootstrap devscripts debhelper sbuild debhelper ubuntu-dev-tools piuparts # Build package
apt install -y debian-archive-keyring LOGNAME=root dh_make --createorig -y -l -p mangohud_0.6.9.1
cp -rvf ./pbuilderrc /etc/pbuilderrc
mkdir -p /var/cache/pbuilder/hook.d/ dpkg-buildpackage --no-sign
cp -rvf ./hooks/* /var/cache/pbuilder/hook.d/
rm -rf /var/cache/apt/
mkdir -p /pbuilder-results
DIST=lunar ARCH=i386 pbuilder create --distribution lunar --architecture i386 --debootstrapopts --include=ca-certificates
echo 'starting build'
DIST=lunar ARCH=i386 pbuilder build ./*.dsc --distribution lunar --architecture i386 --debootstrapopts --include=ca-certificates
# Move the debs to output # Move the debs to output
cd ../
mkdir -p ./output mkdir -p ./output
mv /var/cache/pbuilder/result/*.deb ./output/ || sudo mv ../*.deb ./output/ mv ./*.deb ./output/

Binary file not shown.

View File

@ -1,8 +0,0 @@
USENETWORK=yes
OTHERMIRROR="deb [trusted=yes] http://ppa.pika-os.com/ lunar main"
HOOKDIR="/var/cache/pbuilder/hook.d/"
APTCACHEHARDLINK=no
export DEBIAN_FRONTEND="noninteractive"
#OTHERMIRROR="deb [trusted=yes] https://ppa.pika-os.com/ lunar main"