From: RICCIARDI-Adrien <adrien.ricciardi@hotmail.fr>
Date: Sat, 17 Jul 2021 07:19:55 +0000 (+0200)
Subject: Updated Buildroot CI to make it work with autotools.
X-Git-Tag: ppp-2.5.0~66^2~7
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=e9cdeb051b18404c8127e57bbd555004c4ab5bbf;p=ppp.git

Updated Buildroot CI to make it work with autotools.
---

diff --git a/.github/workflows/buildroot.yaml b/.github/workflows/buildroot.yaml
index 4da78dd..3429d17 100644
--- a/.github/workflows/buildroot.yaml
+++ b/.github/workflows/buildroot.yaml
@@ -10,7 +10,7 @@ jobs:
         libc_name: [glibc, uclibc, musl]
     steps:
       - name: Checkout Buildroot sources
-        run: git clone --depth=1 --branch=2020.11.1 https://git.busybox.net/buildroot
+        run: git clone --depth=1 --branch=2021.02.3 https://git.busybox.net/buildroot
       - name: Select latest PPP version
         working-directory: buildroot/package/pppd
         run: |
@@ -24,10 +24,26 @@ jobs:
           rm -f 0001-pppd-Fix-bounds-check.patch
           # Get package sources from head of master branch
           sed -i "/PPPD_VERSION =/c\\PPPD_VERSION = ${GITHUB_SHA}" pppd.mk
-          sed -i '/PPPD_SITE =/c\\PPPD_SITE = https://github.com/paulusmack/ppp' pppd.mk
+          sed -i '/PPPD_SITE =/c\\PPPD_SITE = https://github.com/ppp-project/ppp' pppd.mk
           sed -i '9iPPPD_SITE_METHOD = git' pppd.mk
-          # Plugin rp-pppoe has been renamed in "pppoe"
-          sed -i 's/rp-pppoe/pppoe/g' pppd.mk
+          # Tell Buildroot to run autoreconf.sh
+          sed -i '16iPPPD_AUTORECONF = YES' pppd.mk
+          # Filters feature needs libpcap
+          sed -i '17iPPPD_DEPENDENCIES = libpcap openssl' pppd.mk
+          # Enable verbose build commands and force OpenSSL directory, otherwise the host system one might be used instead of Buildroot one
+          sed -i '18iPPPD_CONF_OPTS = --disable-silent-rules --with-openssl="$(STAGING_DIR)/usr"' pppd.mk
+          # Do not install build artifacts to staging directory
+          sed -i 's/PPPD_INSTALL_STAGING = YES/PPPD_INSTALL_STAGING = NO/' pppd.mk
+          # Delete custom configuration tool, it is now automatically handled by Buildroot
+          sed -i '/PPPD_CONFIGURE_CMDS/,+4d' pppd.mk
+          # Delete custom build rule, it is now generated by Autotools
+          sed -i '/define PPPD_BUILD_CMDS/,+4d' pppd.mk
+          # Delete custom installation to target rule, it is now generated by Autotools
+          sed -i '/define PPPD_INSTALL_TARGET_CMDS/,+27d' pppd.mk
+          # Delete custom staging installation rule as PPP does not need to be installed to staging in this CI
+          sed -i '/define PPPD_INSTALL_STAGING_CMDS/,+3d' pppd.mk
+          # Tell Buildroot that this package uses Autotools
+          sed -i 's/$(eval $(generic-package))/$(eval $(autotools-package))/' pppd.mk
       - name: Enable PPP build
         working-directory: buildroot
         run: |