CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

network-manager: standardize dpkg-vendor '--derives' instead of '--is'

Browse source
This commit is contained in:
Luis Guzmán 2024-11-10 07:07:55 +00:00
parent 193c89753f
commit 9d07b5ee53
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
helpers/DATA/network-manager/define_trisquel_for_i386.patch
View file

@ -7,7 +7,7 @@ index 0740cdee..cde335f9 100755
include /usr/share/dpkg/architecture.mk include /usr/share/dpkg/architecture.mk
-ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes) $(DEB_HOST_ARCH), yes i386) -ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes) $(DEB_HOST_ARCH), yes i386)
+ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes || dpkg-vendor --is Trisquel && echo yes) $(DEB_HOST_ARCH), yes i386) +ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes) $(DEB_HOST_ARCH), yes i386)
BUILD_PACKAGES += -Nnetwork-manager BUILD_PACKAGES += -Nnetwork-manager
NETPLAN += --disable-netplan NETPLAN += --disable-netplan
endif endif

2
helpers/make-network-manager
View file

@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
VERSION=3 VERSION=4
COMPONENT=main COMPONENT=main
. ./config . ./config