Install few packages in Janusz build

This commit is contained in:
Daniel Pawlik
2024-09-10 14:47:46 +02:00
parent 9d773419e2
commit a50db3f444
11 changed files with 91 additions and 68 deletions

View File

@@ -111,7 +111,7 @@ jobs:
- name: Clean up old releases
uses: dev-drprasad/delete-older-releases@master
with:
keep_latest: 15
delete_tags: true
keep_latest: 5
delete_tags: false
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -132,7 +132,7 @@ jobs:
- name: Clean up old releases
uses: dev-drprasad/delete-older-releases@master
with:
keep_latest: 15
delete_tags: true
keep_latest: 5
delete_tags: false
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -59,14 +59,40 @@ jobs:
- name: Configure firmware image
run: |
curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/mediatek/mt7988a/bpi-r4-simple > .config
curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/mediatek/mt7988a/bpi-r4 > .config
curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/luci >> .config
curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/snapshot >> .config
curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/snapshot-short >> .config
# add packages from other users. Temporary
- name: Add packages
run: |
echo "CONFIG_PACKAGE_tailscale=y" >> .config
echo "CONFIG_PACKAGE_fail2ban=y" >> .config
echo "CONFIG_PACKAGE_modemmanager=y" >> .config
echo "CONFIG_PACKAGE_kmod-mhi-net=y" >> .config
echo "CONFIG_PACKAGE_kmod-mhi-wwan-ctrl=y" >> .config
echo "CONFIG_PACKAGE_kmod-usb-net-qmi-wwan=y" >> .config
echo "CONFIG_PACKAGE_kmod-usb-acm=y" >> .config
echo "CONFIG_PACKAGE_kmod-usb-dwc3=y" >> .config
echo "CONFIG_PACKAGE_kmod-usb-net-rndis=y" >> .config
echo "CONFIG_PACKAGE_kmod-usb-cdns3=y" >> .config
echo "CONFIG_PACKAGE_kmod-mhi-wwan-mbim=y" >> .config
echo "CONFIG_PACKAGE_kmod-usb-serial-qualcomm=y" >> .config
echo "CONFIG_PACKAGE_kmod-usb-serial-option=y" >> .config
echo "CONFIG_PACKAGE_kmod-mtk-t7xx=y" >> .config
echo "CONFIG_PACKAGE_kmod-usb-net-cdc-eem=y" >> .config
echo "CONFIG_PACKAGE_kmod-wireguard=y" >> .config
echo "CONFIG_PACKAGE_wireguard-tools=y" >> .config
echo "CONFIG_PACKAGE_luci-proto-wireguard=y" >> .config
echo "CONFIG_PACKAGE_qrencode=y" >> .config
- name: Run defconfig
run: |
make defconfig
#
# - name: Remove packages that are marked as modules just to save time
# run: |
# grep "=m" .config | grep -v 'CONFIG_PACKAGE_libustream-mbedtls=m' | while read -r line; do module=$(echo "$line" | cut -f1 -d'='); sed -i "s/^$line$/# $module is not set/" .config; done
- name: Remove packages that are marked as modules just to save time
run: |
grep "=m" .config | grep -v 'CONFIG_PACKAGE_libustream-mbedtls=m' | while read -r line; do module=$(echo "$line" | cut -f1 -d'='); sed -i "s/^$line$/# $module is not set/" .config; done
- name: Download dependencies
run: make -j $(nproc) download
@@ -118,6 +144,6 @@ jobs:
uses: dev-drprasad/delete-older-releases@master
with:
keep_latest: 5
delete_tags: true
delete_tags: false
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -1,6 +1,6 @@
---
# Based on https://github.com/JuliusBairaktaris/Qualcommax_NSS_Builder/blob/main/.github/workflows/build.yaml
name: BPI-R4 + all packages + BE14 + new hostapd
name: BPI-R4 + all packages + BE14 + hostapd + eht
on:
workflow_dispatch:
@@ -8,8 +8,8 @@ on:
env:
REMOTE_REPOSITORY: danpawlik/openwrt
# REMOTE_BRANCH: be14
REMOTE_BRANCH: be14-and-hostapd
RELEASE_PREFIX: Mediatek_mt7988a_bpi-r4_be14_all_packages_hostapd
REMOTE_BRANCH: be14-and-hostapd-janusz-v4
RELEASE_PREFIX: Mediatek_mt7988a_bpi-r4_be14_all_packages_hostapd_eht
DEVICE_CONFIG: configs/mediatek/mt7988a/bpi-r4
ROLE_CONFIG: configs/common/main-router
@@ -52,19 +52,13 @@ jobs:
repository: ${{ env.REMOTE_REPOSITORY }}
ref: ${{ env.REMOTE_BRANCH }}
- name: Apply kmod-thermal patch
run: |
git config --global user.email "danielpawlik@test.com"
git config --global user.name "Daniel Pawlik"
curl -LO https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/patches/0001-Add-kmod-thermal-for-BPI-R4.patch
git apply --check 0001-Add-kmod-thermal-for-BPI-R4.patch
git am --keep-cr --signoff < 0001-Add-kmod-thermal-for-BPI-R4.patch
#
# - name: Add OpenWRT remote and update
# - name: Apply kmod-thermal patch
# run: |
# git remote add omain https://github.com/openwrt/openwrt
# git remote update omain
# git pull omain main --rebase
# git config --global user.email "danielpawlik@test.com"
# git config --global user.name "Daniel Pawlik"
# curl -LO https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/patches/0001-Add-kmod-thermal-for-BPI-R4.patch
# git apply --check 0001-Add-kmod-thermal-for-BPI-R4.patch
# git am --keep-cr --signoff < 0001-Add-kmod-thermal-for-BPI-R4.patch
- name: Update and install feeds
run: |
@@ -76,6 +70,8 @@ jobs:
curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/mediatek/mt7988a/bpi-r4 > .config
curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/main-router >> .config
curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/snapshot-short >> .config
sed -i '/CONFIG_PACKAGE_wpad-mbedtls=y/d' .config
curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/openssl >> .config
make defconfig
- name: Remove packages that are marked as modules
@@ -119,7 +115,7 @@ jobs:
with:
files: bin/targets/mediatek/filogic/*
tag_name: ${{ env.RELEASE_PREFIX }}-${{ env.REMOTE_BRANCH }}-${{ env.RELEASE_DATE }}
name: OpenWRT BPI-R4 + BE14 + hostapd + all main_router packages - ${{ env.REMOTE_BRANCH }} - ${{ env.RELEASE_DATE }}
name: OpenWRT BPI-R4 + BE14 + hostapd + eht + main_router packages - ${{ env.REMOTE_BRANCH }} - ${{ env.RELEASE_DATE }}
body: |
Updated prebuilt images for ${{ env.RELEASE_DATE }} with BE14, hostapd and all main_router packages
Build Commit: ${{ needs.check_commits.outputs.latest_commit_sha }}
@@ -128,6 +124,6 @@ jobs:
uses: dev-drprasad/delete-older-releases@master
with:
keep_latest: 5
delete_tags: true
delete_tags: false
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -7,7 +7,8 @@ on:
env:
REMOTE_REPOSITORY: openwrt/openwrt
REMOTE_BRANCH: main
# REMOTE_BRANCH: main
REMOTE_BRANCH: be14-and-hostapd-janusz-v4
RELEASE_PREFIX: Mediatek_mt7988a_bpi-r4_main_all_packages
DEVICE_CONFIG: configs/mediatek/mt7988a/bpi-r4
ROLE_CONFIG: configs/common/main-router
@@ -120,7 +121,7 @@ jobs:
- name: Clean up old releases
uses: dev-drprasad/delete-older-releases@master
with:
keep_latest: 15
delete_tags: true
keep_latest: 5
delete_tags: false
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -111,7 +111,7 @@ jobs:
- name: Clean up old releases
uses: dev-drprasad/delete-older-releases@master
with:
keep_latest: 15
delete_tags: true
keep_latest: 5
delete_tags: false
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -111,7 +111,7 @@ jobs:
- name: Clean up old releases
uses: dev-drprasad/delete-older-releases@master
with:
keep_latest: 15
delete_tags: true
keep_latest: 5
delete_tags: false
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -28,8 +28,8 @@ CONFIG_PACKAGE_tcpdump=y
CONFIG_PACKAGE_bind-dig=y
CONFIG_PACKAGE_ethtool-full=y
CONFIG_PACKAGE_pciutils=y
CONFIG_PACKAGE_irqbalance=y
CONFIG_PACKAGE_luci-app-irqbalance=y
# CONFIG_PACKAGE_irqbalance=y
# CONFIG_PACKAGE_luci-app-irqbalance=y
CONFIG_PACKAGE_tc-full=y
# CONFIG_PACKAGE_tc-tiny is not set

View File

@@ -1,31 +1,7 @@
#
# curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/mediatek/mt7988a/bpi-r4 > .config
# later, eg.:
# curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/main-router >> .config
#
CONFIG_TARGET_mediatek=y
CONFIG_TARGET_mediatek_filogic=y
CONFIG_TARGET_mediatek_filogic_DEVICE_bananapi_bpi-r4=y
# MT7921
CONFIG_PACKAGE_kmod-mt7921-common=y
CONFIG_PACKAGE_kmod-mt7921-firmware=y
CONFIG_PACKAGE_kmod-mt7921e=y
# MT7925
CONFIG_PACKAGE_kmod-mt7925-common=y
CONFIG_PACKAGE_kmod-mt7925e=y
CONFIG_PACKAGE_kmod-mt7925-firmware=y
CONFIG_PACKAGE_kmod-mt792x-common=y
CONFIG_PACKAGE_kmod-mt792x-usb=y
## debuging
CONFIG_PACKAGE_block-mount=y
CONFIG_PACKAGE_blockd=m
CONFIG_PACKAGE_mtdev=m
CONFIG_PACKAGE_kmod-mtd-rw=y
CONFIG_PACKAGE_kmod-veth=y
# avoid error when: CONFIG_ALL_KMODS=y
CONFIG_PACKAGE_kmod-thermal=y

View File

@@ -0,0 +1,31 @@
#
# curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/mediatek/mt7988a/bpi-r4 > .config
# later, eg.:
# curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/main-router >> .config
#
CONFIG_TARGET_mediatek=y
CONFIG_TARGET_mediatek_filogic=y
CONFIG_TARGET_mediatek_filogic_DEVICE_bananapi_bpi-r4=y
# MT7921
CONFIG_PACKAGE_kmod-mt7921-common=y
CONFIG_PACKAGE_kmod-mt7921-firmware=y
CONFIG_PACKAGE_kmod-mt7921e=y
# MT7925
CONFIG_PACKAGE_kmod-mt7925-common=y
CONFIG_PACKAGE_kmod-mt7925e=y
CONFIG_PACKAGE_kmod-mt7925-firmware=y
CONFIG_PACKAGE_kmod-mt792x-common=y
CONFIG_PACKAGE_kmod-mt792x-usb=y
## debuging
CONFIG_PACKAGE_block-mount=y
CONFIG_PACKAGE_blockd=m
CONFIG_PACKAGE_mtdev=m
CONFIG_PACKAGE_kmod-mtd-rw=y
CONFIG_PACKAGE_kmod-veth=y
# avoid error when: CONFIG_ALL_KMODS=y
CONFIG_PACKAGE_kmod-thermal=y

View File

@@ -1,7 +0,0 @@
#
# curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/mediatek/mt7988a/bpi-r4 > .config
#
CONFIG_TARGET_mediatek=y
CONFIG_TARGET_mediatek_filogic=y
CONFIG_TARGET_mediatek_filogic_DEVICE_bananapi_bpi-r4=y