From ee487007aa102266c67488ac02c59faea6ce899a Mon Sep 17 00:00:00 2001 From: hayzamjs Date: Sat, 9 Mar 2024 18:09:24 +0530 Subject: [PATCH] version: bump to 2.5.2, pkg: add hid devices, workflow: .0 and .5 considered stable --- .forgejo/workflows/dmsbg-100.yml | 7 ++++--- configs/dmsbg100.config | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/dmsbg-100.yml b/.forgejo/workflows/dmsbg-100.yml index 67812e87a0..ee52fbdb64 100644 --- a/.forgejo/workflows/dmsbg-100.yml +++ b/.forgejo/workflows/dmsbg-100.yml @@ -16,8 +16,9 @@ jobs: id: determine-env run: | TAG_REF=${GITHUB_REF#refs/tags/} - IFS='.' read -ra VERSION <<< "$TAG_REF" - if [[ ${VERSION[2]} -eq 0 ]]; then + IFS='.' read -ra VERSION <<< "${TAG_REF#v}" + PATCH_VERSION=${VERSION[2]} + if [[ $PATCH_VERSION -eq 0 || $PATCH_VERSION -eq 5 ]]; then echo "ENVIRONMENT=master" >> $GITHUB_ENV echo "cache-prefix=master" >> $GITHUB_ENV echo "::set-output name=cache-prefix::master" @@ -71,4 +72,4 @@ jobs: sdFile=$(find ./bin/ -name "*difos*" | grep sdcard | head -n1) sqFile=$(find ./bin/ -name "*difos*" | grep squash | head -n1) curl -X POST -H 'Content-Type: multipart/form-data' -F "file=@$sdFile" http://$PORTAL_ENDPOINT/software/upload/sd/$ENVIRONMENT/${{ env.PORTAL_API_KEY }} - curl -X POST -H 'Content-Type: multipart/form-data' -F "file=@$sqFile" http://$PORTAL_ENDPOINT/software/upload/sysupgrade/$ENVIRONMENT/${{ env.PORTAL_API_KEY }} \ No newline at end of file + curl -X POST -H 'Content-Type: multipart/form-data' -F "file=@$sqFile" http://$PORTAL_ENDPOINT/software/upload/sysupgrade/$ENVIRONMENT/${{ env.PORTAL_API_KEY }} diff --git a/configs/dmsbg100.config b/configs/dmsbg100.config index b3a5d4f2aa..ec923493b7 100644 --- a/configs/dmsbg100.config +++ b/configs/dmsbg100.config @@ -476,9 +476,20 @@ CONFIG_PACKAGE_kmod-fs-ntfs3=y CONFIG_PACKAGE_kmod-fs-vfat=y CONFIG_PACKAGE_kmod-fuse=y CONFIG_PACKAGE_kmod-gpio-beeper=y +CONFIG_PACKAGE_kmod-hid=m +CONFIG_PACKAGE_kmod-hid-generic=m CONFIG_PACKAGE_kmod-ifb=y CONFIG_PACKAGE_kmod-ikconfig=m CONFIG_PACKAGE_kmod-input-core=y +CONFIG_PACKAGE_kmod-input-evdev=m +CONFIG_PACKAGE_kmod-input-gpio-encoder=m +CONFIG_PACKAGE_kmod-input-gpio-keys=m +CONFIG_PACKAGE_kmod-input-gpio-keys-polled=m +CONFIG_PACKAGE_kmod-input-joydev=m +CONFIG_PACKAGE_kmod-input-matrixkmap=m +CONFIG_PACKAGE_kmod-input-touchscreen-ads7846=m +CONFIG_PACKAGE_kmod-input-touchscreen-edt-ft5x06=m +CONFIG_PACKAGE_kmod-input-uinput=m CONFIG_PACKAGE_kmod-ip-vti=y CONFIG_PACKAGE_kmod-ip6-tunnel=y CONFIG_PACKAGE_kmod-ip6-vti=y @@ -533,6 +544,7 @@ CONFIG_PACKAGE_kmod-sched-cake=y CONFIG_PACKAGE_kmod-sched-core=y CONFIG_PACKAGE_kmod-sit=y CONFIG_PACKAGE_kmod-sound-core=y +CONFIG_PACKAGE_kmod-spi-bitbang=m CONFIG_PACKAGE_kmod-tpm=m CONFIG_PACKAGE_kmod-tun=y CONFIG_PACKAGE_kmod-udptunnel4=y @@ -910,6 +922,8 @@ CONFIG_PACKAGE_ucode-mod-math=y CONFIG_PACKAGE_unixodbc=y CONFIG_PACKAGE_uqmi=y CONFIG_PACKAGE_usb-modeswitch=y +CONFIG_PACKAGE_usbids=m +CONFIG_PACKAGE_usbutils=m CONFIG_PACKAGE_uw-imap=y CONFIG_PACKAGE_uwsgi=y CONFIG_PACKAGE_uwsgi-cgi-plugin=y @@ -976,7 +990,7 @@ CONFIG_VERSION_HOME_URL="https://difuse.io" CONFIG_VERSION_HWREV="v1" CONFIG_VERSION_MANUFACTURER="Difuse" CONFIG_VERSION_MANUFACTURER_URL="https://difuse.io" -CONFIG_VERSION_NUMBER="2.5.1" +CONFIG_VERSION_NUMBER="2.5.2" CONFIG_VERSION_PRODUCT="DMSBG-100" CONFIG_VERSION_REPO="https://difuse.io/releases" CONFIG_VERSION_SUPPORT_URL="https://docs.difuse.io"