Merge pull request #868 from c-po/package-build

T6674: move patches to "package/<package_name>" subfolder
vyos · Dec 22, 2024 · 3b377bd · 3b377bd
2 parents 77f3471 + 53ceb24
commit 3b377bd
Show file tree

Hide file tree

Showing 52 changed files with 44 additions and 405 deletions.
diff --git a/scripts/package-build/.gitignore b/scripts/package-build/.gitignore
@@ -0,0 +1,8 @@
+*.buildinfo
+*.build
+*.changes
+*.deb
+*.udeb
+*.dsc
+*.tar.gz
+*.tar.xz
diff --git a/scripts/package-build/amazon-cloudwatch-agent/.gitignore b/scripts/package-build/amazon-cloudwatch-agent/.gitignore
@@ -1,7 +1 @@
-amazon-cloudwatch-agent/
-*.buildinfo
-*.build
-*.changes
-*.deb
-*.dsc
-*.tar.gz
+/amazon-cloudwatch-agent/
diff --git a/scripts/package-build/amazon-ssm-agent/.gitignore b/scripts/package-build/amazon-ssm-agent/.gitignore
@@ -1,7 +1 @@
-amazon-ssm-agent/
-*.buildinfo
-*.build
-*.changes
-*.deb
-*.dsc
-*.tar.gz
+/amazon-ssm-agent/
diff --git a/scripts/package-build/aws-gwlbtun/.gitignore b/scripts/package-build/aws-gwlbtun/.gitignore
@@ -1,8 +1 @@
-aws-gwlbtun*/
-*.tar.gz
-*.tar.xz
-*.deb
-*.dsc
-*.buildinfo
-*.build
-*.changes
+/aws-gwlbtun*/
diff --git a/scripts/package-build/build.py b/scripts/package-build/build.py
@@ -58,7 +58,6 @@ def apply_patches(repo_dir: Path, patch_dir: Path) -> None:
             series.write(patch.name + '\n')
             print(f"I: Applied patch: {patch.name}")
 
-
 def prepare_package(repo_dir: Path, install_data: str) -> None:
     """Prepare a package"""
     if not install_data:
@@ -95,7 +94,7 @@ def build_package(package: list, patch_dir: Path) -> None:
 
         # Apply patches if any
         if (repo_dir / 'patches'):
-            apply_patches(repo_dir, patch_dir)
+            apply_patches(repo_dir, patch_dir / repo_name)
 
         # Sanitize the commit ID and build a tarball for the package
         commit_id_sanitized = package['commit_id'].replace('/', '_')

diff --git a/scripts/package-build/ddclient/.gitignore b/scripts/package-build/ddclient/.gitignore
@@ -1,7 +1 @@
-ddclient/
-*.buildinfo
-*.build
-*.changes
-*.deb
-*.dsc
-
+/ddclient/
diff --git a/scripts/package-build/dropbear/.gitignore b/scripts/package-build/dropbear/.gitignore
@@ -1,7 +1 @@
-dropbear/
-*.buildinfo
-*.build
-*.changes
-*.deb
-*.dsc
-*.tar.gz
+/dropbear/
diff --git a/...ear/patches/0001-Enable-PAM-support.patch → ...es/dropbear/0001-Enable-PAM-support.patch b/...ear/patches/0001-Enable-PAM-support.patch → ...es/dropbear/0001-Enable-PAM-support.patch
diff --git a/scripts/package-build/ethtool/.gitignore b/scripts/package-build/ethtool/.gitignore
@@ -1,7 +1 @@
-ethtool/
-*.buildinfo
-*.build
-*.changes
-*.deb
-*.dsc
-
+/ethtool/
diff --git a/scripts/package-build/frr/.gitignore b/scripts/package-build/frr/.gitignore
@@ -1,9 +1,3 @@
-frr/
-rtrlib/
-libyang/
-*.buildinfo
-*.build
-*.changes
-*.deb
-*.dsc
-*.tar.gz
+/frr/
+/rtrlib/
+/libyang/
diff --git a/...able-PCRE2-in-Debian-package-builds.patch → ...able-PCRE2-in-Debian-package-builds.patch b/...able-PCRE2-in-Debian-package-builds.patch → ...able-PCRE2-in-Debian-package-builds.patch
@@ -15,7 +15,7 @@ index 43e5d7e61..1f971ab22 100755
  		--enable-vty-group=frrvty \
  		--enable-configfile-mask=0640 \
  		--enable-logfile-mask=0640 \
-+                --enable-pcre2posix \
++		--enable-pcre2posix \
  		# end
 
  override_dh_auto_install:

diff --git a/...hes/0003-Clear-Babel-Config-On-Stop.patch → ...frr/0003-Clear-Babel-Config-On-Stop.patch b/...hes/0003-Clear-Babel-Config-On-Stop.patch → ...frr/0003-Clear-Babel-Config-On-Stop.patch
diff --git a/scripts/package-build/frr_exporter/.gitignore b/scripts/package-build/frr_exporter/.gitignore
@@ -1,6 +1 @@
-frr_exporter    /
-*.buildinfo
-*.build
-*.changes
-*.deb
-*.dsc
+/frr_exporter/
diff --git a/scripts/package-build/hostap/.gitignore b/scripts/package-build/hostap/.gitignore
@@ -1,7 +1,2 @@
-hostap/
-wpa/
-*.buildinfo
-*.build
-*.changes
-*.deb
-*.dsc
+/hostap/
+/wpa/
diff --git a/scripts/package-build/hsflowd/.gitignore b/scripts/package-build/hsflowd/.gitignore
@@ -1,7 +1 @@
-host-sflow/
-*.buildinfo
-*.build
-*.changes
-*.deb
-*.dsc
-*.tar.gz
+/host-sflow/
diff --git a/scripts/package-build/isc-dhcp/.gitignore b/scripts/package-build/isc-dhcp/.gitignore
@@ -1,7 +1 @@
-isc-dhcp/
-*.buildinfo
-*.build
-*.changes
-*.deb
-*.dsc
-*.tar.gz
+/isc-dhcp/
diff --git a/...d-support-for-raw-IP-interface-type.patch → ...d-support-for-raw-IP-interface-type.patch b/...d-support-for-raw-IP-interface-type.patch → ...d-support-for-raw-IP-interface-type.patch
diff --git a/...ches/0002-Checkpoint-improved-patch.patch → ...dhcp/0002-Checkpoint-improved-patch.patch b/...ches/0002-Checkpoint-improved-patch.patch → ...dhcp/0002-Checkpoint-improved-patch.patch
diff --git a/...patches/0003-fix-compilation-errors.patch → ...sc-dhcp/0003-fix-compilation-errors.patch b/...patches/0003-fix-compilation-errors.patch → ...sc-dhcp/0003-fix-compilation-errors.patch
diff --git a/...port-for-ARPHRD_NONE-interface-type.patch → ...port-for-ARPHRD_NONE-interface-type.patch b/...port-for-ARPHRD_NONE-interface-type.patch → ...port-for-ARPHRD_NONE-interface-type.patch
diff --git a/scripts/package-build/kea/.gitignore b/scripts/package-build/kea/.gitignore
@@ -1,7 +1 @@
-isc-kea/
-*.buildinfo
-*.build
-*.changes
-*.deb
-*.dsc
-
+/isc-kea/
diff --git a/scripts/package-build/keepalived/.gitignore b/scripts/package-build/keepalived/.gitignore
@@ -1,7 +1 @@
-keepalived/
-*.buildinfo
-*.build
-*.changes
-*.deb
-*.dsc
-
+/keepalived/
diff --git a/...ysctl-arp_ignore-to-1-on-IPv6-VMACs.patch → ...ysctl-arp_ignore-to-1-on-IPv6-VMACs.patch b/...ysctl-arp_ignore-to-1-on-IPv6-VMACs.patch → ...ysctl-arp_ignore-to-1-on-IPv6-VMACs.patch
diff --git a/scripts/package-build/ndppd/.gitignore b/scripts/package-build/ndppd/.gitignore
@@ -1,7 +1 @@
-ndppd/
-*.buildinfo
-*.build
-*.changes
-*.deb
-*.dsc
-
+/ndppd/
diff --git a/...oute-table-if-there-is-no-auto-rule.patch → ...oute-table-if-there-is-no-auto-rule.patch b/...oute-table-if-there-is-no-auto-rule.patch → ...oute-table-if-there-is-no-auto-rule.patch
diff --git a/...ndppd/patches/0002-set-vyos-version.patch → ...patches/ndppd/0002-set-vyos-version.patch b/...ndppd/patches/0002-set-vyos-version.patch → ...patches/ndppd/0002-set-vyos-version.patch
diff --git a/scripts/package-build/net-snmp/.gitignore b/scripts/package-build/net-snmp/.gitignore
@@ -1,6 +1 @@
-net-snmp/
-*.buildinfo
-*.build
-*.changes
-*.deb
-*.dsc
+/net-snmp/
diff --git a/...add-linux-6.7-compatibility-parsing.patch → ...add-linux-6.7-compatibility-parsing.patch b/...add-linux-6.7-compatibility-parsing.patch → ...add-linux-6.7-compatibility-parsing.patch
diff --git a/scripts/package-build/netfilter/.gitignore b/scripts/package-build/netfilter/.gitignore
@@ -1,8 +1,2 @@
 /pkg-libnftnl/
 /pkg-nftables/
-*.buildinfo
-*.build
-*.changes
-*.deb
-*.dsc
-*.tar.gz
diff --git a/scripts/package-build/netfilter/build.py b/scripts/package-build/netfilter/build.py
diff --git a/scripts/package-build/netfilter/build.py b/scripts/package-build/netfilter/build.py
@@ -0,0 +1 @@
+../build.py
diff --git a/scripts/package-build/node_exporter/.gitignore b/scripts/package-build/node_exporter/.gitignore
@@ -1,7 +1 @@
 node_exporter/
-*.buildinfo
-*.build
-*.changes
-*.deb
-*.dsc
-
diff --git a/scripts/package-build/opennhrp/.gitignore b/scripts/package-build/opennhrp/.gitignore
@@ -1,6 +1 @@
-opennhrp/
-*.buildinfo
-*.build
-*.changes
-*.deb
-*.dsc
+/opennhrp/