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

network-manager: add patch to disable netplan on i386

Browse source
This commit is contained in:
Ark74 2024-10-17 00:21:26 -06:00
parent 19cdc0e545
commit e73c07bd61
2 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
helpers/DATA/network-manager/define_trisquel_for_i386.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/debian/rules b/debian/rules
index 0740cdee..cde335f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
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 || dpkg-vendor --is Trisquel && echo yes) $(DEB_HOST_ARCH), yes i386)
BUILD_PACKAGES += -Nnetwork-manager
NETPLAN += --disable-netplan
endif

6
helpers/make-network-manager
View file

@ -1,5 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2024 Luis Guzmán <ark@switnet.org>
# Copyright (C) 2020 Ruben Rodriguez <ruben@trisquel.info> # Copyright (C) 2020 Ruben Rodriguez <ruben@trisquel.info>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
@ -17,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=2 VERSION=3
COMPONENT=main COMPONENT=main
. ./config . ./config
@ -30,6 +31,9 @@ sed '/send fqdn/s|added by NetworkManager|Enable at /etc/dhcp/dhclient.conf|' -i
sed '/HOSTNAME4_TAG/s|added by NetworkManager|Enable at /etc/dhcp/dhclient.conf|' -i src/core/dhcp/nm-dhcp-dhclient-utils.c sed '/HOSTNAME4_TAG/s|added by NetworkManager|Enable at /etc/dhcp/dhclient.conf|' -i src/core/dhcp/nm-dhcp-dhclient-utils.c
sed '/FQDN_TAG/s|added by NetworkManager|Enable at /etc/dhcp/dhclient.conf|' -i src/core/dhcp/nm-dhcp-dhclient-utils.c sed '/FQDN_TAG/s|added by NetworkManager|Enable at /etc/dhcp/dhclient.conf|' -i src/core/dhcp/nm-dhcp-dhclient-utils.c
# Patch debian/rules to match Trisquel on i386 build.
patch_p1 $DATA/define_trisquel_for_i386.patch
changelog "Do not send hostname on dhcp, plus other features" changelog "Do not send hostname on dhcp, plus other features"
package package