]> git.ozlabs.org Git - ppp.git/commitdiff
Added Buildroot configuration and build steps.
authorRICCIARDI-Adrien <adrien.ricciardi@hotmail.fr>
Thu, 31 Dec 2020 15:21:04 +0000 (16:21 +0100)
committerRICCIARDI-Adrien <adrien.ricciardi@hotmail.fr>
Fri, 1 Jan 2021 15:59:00 +0000 (16:59 +0100)
Signed-off-by: RICCIARDI-Adrien <adrien.ricciardi@hotmail.fr>
.github/workflows/buildroot.yaml

index a80353b4d2f6d64a0839f7ea2c06b73ae2fd0f73..e38656252b01c6c397d628a930cda99dc360444b 100644 (file)
@@ -2,11 +2,12 @@ name: Buildroot
 on: [push]
 
 jobs:
-  matrix_build:
+  buildroot:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         defconfig_name: [qemu_x86_defconfig, qemu_x86_64_defconfig]
+        libc_name: [glibc, uclibc]
     steps:
       - name: Checkout Buildroot sources
         run: git clone --depth=1 --branch=2020.11.1 https://git.busybox.net/buildroot
@@ -15,15 +16,27 @@ jobs:
         run: |
           # Allow package to build when musl libc is selected
           sed -i '/depends on !BR2_TOOLCHAIN_USES_MUSL/d' Config.in
+          # Upstream version always needs OpenSSL
+          sed -i '/select BR2_PACKAGE_OPENSSL/c\\select BR2_PACKAGE_OPENSSL' Config.in
           # Do not check for package hash, so there is no need to compute it
           rm pppd.hash
+          # Buildroot patch is already applied upstream
+          rm -f 0001-pppd-Fix-bounds-check.patch
           # Get package sources from head of master branch
-          sed -i '/PPPD_VERSION =/c\\PPPD_VERSION = master' pppd.mk
+          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 '9iPPPD_MUSL_SITE_METHOD = git' pppd.mk
+          sed -i '9iPPPD_SITE_METHOD = git' pppd.mk
       - name: Enable PPP build
         working-directory: buildroot
         run: |
+          # Enable all Buildroot PPP options as everything is built by upstream build system
           echo "BR2_PACKAGE_PPPD=y" >> configs/${{ matrix.defconfig_name }}
-          # TODO enable other PPP package options if needed
-          cat configs/${{ matrix.defconfig_name }}
+          echo "BR2_PACKAGE_PPPD_FILTER=y" >> configs/${{ matrix.defconfig_name }}
+          echo "BR2_PACKAGE_PPPD_RADIUS=y" >> configs/${{ matrix.defconfig_name }}
+          echo "BR2_PACKAGE_PPPD_OVERWRITE_RESOLV_CONF=y" >> configs/${{ matrix.defconfig_name }}
+      - name: Configure Buildroot
+        working-directory: buildroot
+        run: make ${{ matrix.defconfig_name }}
+      - name: Build
+        working-directory: buildroot
+        run: make