cassidy/GlobalProtect-openconnect
1
0
Fork 0
mirror of https://github.com/yuezk/GlobalProtect-openconnect.git synced 2025-05-20 07:26:58 -04:00
Code Issues Projects Releases Wiki Activity

Use .build folder

Browse Source
This commit is contained in:
Kevin Yue
2024-02-25 10:37:52 +08:00
parent 55b119d0f2
commit f44cd85971
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build.yaml vendored
View File

@@ -89,8 +89,8 @@ jobs:
- name: Install RPM package
run: |
cd globalprotect-openconnect-*/
ls -l .rpm
sudo rpm -i ".rpm/globalprotect-openconnect/*$(uname -m).rpm"
ls -l .build/rpm
sudo rpm -i ".build/rpm/globalprotect-openconnect/*$(uname -m).rpm"
gpclient --version
gpservice --version
@@ -102,7 +102,7 @@ jobs:
with:
name: artifact-rpm
path: |
globalprotect-openconnect-*/.rpm/*.rpm
globalprotect-openconnect-*/.build/rpm/*.rpm
# Include arm64 if ref is a tag
# setup-matrix:

2
.gitignore vendored
View File

@@ -6,4 +6,4 @@
*.tar.xz
.cargo
.rpm
.build

28
Makefile
View File

@@ -58,7 +58,7 @@ build-rs: extract-vendor
clean:
$(CARGO) clean
rm -rf .rpm
rm -rf .build
rm -rf .vendor
rm -rf apps/gpgui-helper/node_modules
@@ -121,18 +121,18 @@ publish-ppa: ppa
# Generate RPM sepc file
rpm-spec:
rm -rf .rpm
mkdir .rpm
rm -rf .build/rpm
mkdir -p .build/rpm
cp packaging/rpm/globalprotect-openconnect.spec.in .rpm/globalprotect-openconnect.spec
cp packaging/rpm/globalprotect-openconnect.changes.in .rpm/globalprotect-openconnect.changes
cp packaging/rpm/globalprotect-openconnect.spec.in .build/rpm/globalprotect-openconnect.spec
cp packaging/rpm/globalprotect-openconnect.changes.in .build/rpm/globalprotect-openconnect.changes
sed -i "s/@VERSION@/$(VERSION)/g" .rpm/globalprotect-openconnect.spec
sed -i "s/@REVISION@/$(REVISION)/g" .rpm/globalprotect-openconnect.spec
sed -i "s/@DATE@/$(shell date "+%a %b %d %Y")/g" .rpm/globalprotect-openconnect.spec
sed -i "s/@VERSION@/$(VERSION)/g" .build/rpm/globalprotect-openconnect.spec
sed -i "s/@REVISION@/$(REVISION)/g" .build/rpm/globalprotect-openconnect.spec
sed -i "s/@DATE@/$(shell date "+%a %b %d %Y")/g" .build/rpm/globalprotect-openconnect.spec
sed -i "s/@VERSION@/$(VERSION)/g" .rpm/globalprotect-openconnect.changes
sed -i "s/@DATE@/$(shell LC_ALL=en.US date -u "+%a %b %e %T %Z %Y")/g" .rpm/globalprotect-openconnect.changes
sed -i "s/@VERSION@/$(VERSION)/g" .build/rpm/globalprotect-openconnect.changes
sed -i "s/@DATE@/$(shell LC_ALL=en.US date -u "+%a %b %e %T %Z %Y")/g" .build/rpm/globalprotect-openconnect.changes
# Ensure ../globalprotect-openconnect-*.tar.gz exists.
rpm: rpm-spec
@@ -146,12 +146,14 @@ rpm: rpm-spec
cp ../$(PKG).tar.gz $(HOME)/rpmbuild/SOURCES/$(PKG_NAME).tar.gz
rpmbuild -ba .rpm/globalprotect-openconnect.spec
rpmbuild -ba .build/rpm/globalprotect-openconnect.spec
# Copy RPM package
cp $(HOME)/rpmbuild/RPMS/$(shell uname -m)/$(PKG_NAME)*.rpm .rpm
cp $(HOME)/rpmbuild/RPMS/$(shell uname -m)/$(PKG_NAME)*.rpm .build/rpm
# Copy the SRPM only for x86_64.
if [ "$(shell uname -m)" = "x86_64" ]; then \
cp $(HOME)/rpmbuild/SRPMS/$(PKG_NAME)*.rpm .rpm; \
cp $(HOME)/rpmbuild/SRPMS/$(PKG_NAME)*.rpm .build/rpm; \
fi
pkgbuild: