mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-18 22:16:18 -05:00
fix: update Rust version and dependencies for packaging
This commit is contained in:
5 files changed
+8
-13
No files matched your search
@@ -4,7 +4,6 @@ OFFLINE ?= 0
|
||||
BUILD_FE ?= 1
|
||||
INCLUDE_GUI ?= 0
|
||||
CARGO ?= cargo
|
||||
RUST_VERSION = 1.80
|
||||
|
||||
VERSION = $(shell $(CARGO) metadata --no-deps --format-version 1 | jq -r '.packages[0].version')
|
||||
REVISION ?= 1
|
||||
@@ -180,7 +179,6 @@ init-debian: clean-debian tarball
|
||||
|
||||
sed -i "s/@OFFLINE@/$(OFFLINE)/g" .build/deb/$(PKG)/debian/rules
|
||||
sed -i "s/@BUILD_GUI@/$(BUILD_GUI)/g" .build/deb/$(PKG)/debian/rules
|
||||
sed -i "s/@RUST_VERSION@/$(RUST_VERSION)/g" .build/deb/$(PKG)/debian/rules
|
||||
|
||||
# Remove the GUI dependencies if BUILD_GUI is set to 0
|
||||
if [ $(BUILD_GUI) -eq 0 ]; then \
|
||||
@@ -194,11 +192,11 @@ init-debian: clean-debian tarball
|
||||
rm -f .build/deb/$(PKG)/debian/changelog
|
||||
|
||||
deb: init-debian
|
||||
# Remove the rust build dependency from the control file
|
||||
sed -i "s/@RUST@//g" .build/deb/$(PKG)/debian/control
|
||||
|
||||
cd .build/deb/$(PKG) && dch --create --distribution unstable --package $(PKG_NAME) --newversion $(VERSION)-$(REVISION) "Bugfix and improvements."
|
||||
|
||||
# Install build dependencies
|
||||
cd .build/deb/$(PKG) && sudo mk-build-deps --install --remove debian/control
|
||||
|
||||
cd .build/deb/$(PKG) && debuild --preserve-env -e PATH -us -uc -b
|
||||
|
||||
check-ppa:
|
||||
@@ -208,8 +206,6 @@ check-ppa:
|
||||
|
||||
# Usage: make ppa SERIES=focal OFFLINE=1 PUBLISH=1
|
||||
ppa: check-ppa init-debian
|
||||
sed -i "s/@RUST@/cargo-1.80/g" .build/deb/$(PKG)/debian/control
|
||||
|
||||
$(eval SERIES_VER = $(shell distro-info --series $(SERIES) -r | cut -d' ' -f1))
|
||||
@echo "Building for $(SERIES) $(SERIES_VER)"
|
||||
|
||||
|
||||
Reference in new issue
Block a user