From 627cbd9ab903650947f156890fc40d98b0109605 Mon Sep 17 00:00:00 2001 From: openKylinBot Date: Wed, 1 Jun 2022 10:59:08 +0800 Subject: [PATCH] * debian/rules: + fix openkylin vendor --- debian/changelog | 7 +++++++ debian/rules | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e8ef755..d337de2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +cups (2.3.1-ok2) yangtze; urgency=medium + + * debian/rules: + + fix openkylin vendor + + -- luzhiping Wed, 01 Jun 2022 10:57:48 +0800 + cups (2.3.1-ok1) yangtze; urgency=medium * Build for openKylin. diff --git a/debian/rules b/debian/rules index d03b06c..8efe2d7 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,7 @@ #!/usr/bin/make -f derives_from_ubuntu := $(shell (dpkg-vendor --derives-from Ubuntu && echo "yes") || echo "no") +derives_from_openkylin := $(shell (dpkg-vendor --derives-from openKylin && echo "yes") || echo "no") # Enabling PIE globally doesn't work, but ./configure already enables PIE # where necessary. @@ -11,6 +12,10 @@ ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes) $(DEB_HOST_ARCH), yes i386) skip_packages = -Ncups -Ncups-core-drivers endif +ifeq ($(shell dpkg-vendor --is openKylin && echo yes) $(DEB_HOST_ARCH), yes i386) + skip_packages = -Ncups -Ncups-core-drivers +endif + # The build system uses only DSOFLAGS but not LDFLAGS to build some libraries. # Add LDFLAGS to enable (hardening) build flags. export DSOFLAGS = $(shell dpkg-buildflags --get LDFLAGS) @@ -27,7 +32,7 @@ CONFIG_LIBUSB=--enable-libusb endif override_dh_auto_configure: -ifeq ($(derives_from_ubuntu),yes) +ifeq ($(filter yes,$(derives_from_ubuntu) $(derives_from_openkylin)),yes) set -e; if ! [ -e debian/patches-ubuntu/stamp-applied ]; then \ echo '---- Applying Ubuntu specific patches'; \ for p in debian/patches-ubuntu/*; do \