diff options
| -rw-r--r-- | .github/workflows/macos.yml | 5 | ||||
| -rw-r--r-- | .github/workflows/openwrt-ci-master.yml | 51 | ||||
| -rw-r--r-- | .github/workflows/openwrt-ci-pull-request.yml | 52 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | openwrt/ucode/Makefile | 240 |
5 files changed, 328 insertions, 21 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 6632b48..6c9b02a 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -1,6 +1,9 @@ name: Build on macOS -on: [ push, pull_request ] +on: + push: + pull_request: + types: [opened, reopened] jobs: build: diff --git a/.github/workflows/openwrt-ci-master.yml b/.github/workflows/openwrt-ci-master.yml index a342e10..d50e7dc 100644 --- a/.github/workflows/openwrt-ci-master.yml +++ b/.github/workflows/openwrt-ci-master.yml @@ -34,23 +34,54 @@ jobs: tests/cram/**/*.t.err sdk_build: - name: Build with OpenWrt ${{ matrix.sdk_platform }} SDK (out of tree) + name: Build with OpenWrt ${{ matrix.arch }} SDK runs-on: ubuntu-latest strategy: fail-fast: false matrix: - sdk_platform: - - ath79-generic - - imx-cortexa9 - - malta-be - - mediatek-mt7622 + include: + - arch: mips_24kc + target: ath79-generic + + - arch: arm_cortex-a9_neon + target: imx-cortexa9 + + - arch: mipsel_24kc + target: malta-le + + - arch: aarch64_cortex-a53 + target: mediatek-mt7622 steps: - uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Determine branch name + run: | + BRANCH="${GITHUB_BASE_REF#refs/heads/}" + echo "Building for $BRANCH" + echo "BRANCH=$BRANCH" >> $GITHUB_ENV - - name: Out of tree build with OpenWrt ${{ matrix.sdk_platform }} SDK - uses: ynezz/gh-actions-openwrt-ci-sdk@v0.0.2 + - name: Build with OpenWrt ${{ matrix.arch }} SDK + uses: openwrt/gh-action-sdk@v5 env: - CI_TARGET_SDK_RELEASE: master - CI_TARGET_SDK_IMAGE: ${{ matrix.sdk_platform }} + ARCH: ${{ matrix.arch }} + FEEDNAME: ucode_ci + PACKAGES: ucode + + - name: Move created packages to project dir + run: cp bin/packages/${{ matrix.arch }}/ucode_ci/*.ipk . || true + + - name: Store packages + uses: actions/upload-artifact@v3 + with: + name: ${{ matrix.arch }}-packages + path: "*.ipk" + + - name: Store logs + uses: actions/upload-artifact@v3 + with: + name: ${{ matrix.arch }}-logs + path: logs/ diff --git a/.github/workflows/openwrt-ci-pull-request.yml b/.github/workflows/openwrt-ci-pull-request.yml index d33d11a..7a75d95 100644 --- a/.github/workflows/openwrt-ci-pull-request.yml +++ b/.github/workflows/openwrt-ci-pull-request.yml @@ -5,6 +5,7 @@ on: branches-ignore: - master pull_request: + types: [opened, reopened] env: CI_ENABLE_UNIT_TESTING: 1 @@ -38,23 +39,54 @@ jobs: tests/cram/**/*.t.err sdk_build: - name: Build with OpenWrt ${{ matrix.sdk_platform }} SDK (out of tree) + name: Build with OpenWrt ${{ matrix.arch }} SDK runs-on: ubuntu-latest strategy: fail-fast: false matrix: - sdk_platform: - - ath79-generic - - imx-cortexa9 - - malta-be - - mediatek-mt7622 + include: + - arch: mips_24kc + target: ath79-generic + + - arch: arm_cortex-a9_neon + target: imx-cortexa9 + + - arch: mipsel_24kc + target: malta-le + + - arch: aarch64_cortex-a53 + target: mediatek-mt7622 steps: - uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Determine branch name + run: | + BRANCH="${GITHUB_BASE_REF#refs/heads/}" + echo "Building for $BRANCH" + echo "BRANCH=$BRANCH" >> $GITHUB_ENV - - name: Out of tree build with OpenWrt ${{ matrix.sdk_platform }} SDK - uses: ynezz/gh-actions-openwrt-ci-sdk@v0.0.2 + - name: Build with OpenWrt ${{ matrix.arch }} SDK + uses: openwrt/gh-action-sdk@v5 env: - CI_TARGET_SDK_RELEASE: master - CI_TARGET_SDK_IMAGE: ${{ matrix.sdk_platform }} + ARCH: ${{ matrix.arch }} + FEEDNAME: ucode_ci + PACKAGES: ucode + + - name: Move created packages to project dir + run: cp bin/packages/${{ matrix.arch }}/ucode_ci/*.ipk . || true + + - name: Store packages + uses: actions/upload-artifact@v3 + with: + name: ${{ matrix.arch }}-packages + path: "*.ipk" + + - name: Store logs + uses: actions/upload-artifact@v3 + with: + name: ${{ matrix.arch }}-logs + path: logs/ @@ -1,4 +1,5 @@ Makefile +!/openwrt/ucode/Makefile CMakeCache.txt CMakeFiles *.cmake diff --git a/openwrt/ucode/Makefile b/openwrt/ucode/Makefile new file mode 100644 index 0000000..2158dba --- /dev/null +++ b/openwrt/ucode/Makefile @@ -0,0 +1,240 @@ +# +# Copyright (C) 2020-2023 Jo-Philipp Wich <jo@mein.io> +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=ucode +PKG_VERSION:=$(if $(DUMP),x,$(shell git log -1 --date=format:"%Y-%m-%d" --format=%cd)) +PKG_ABI_VERSION:=$(if $(DUMP),x,$(shell git log -1 --date=format:"%Y%m%d" --format=%cd)) + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/cmake.mk + +CMAKE_SOURCE_DIR=$(CURDIR)/../../ +CMAKE_OPTIONS += -DSOVERSION=$(PKG_ABI_VERSION) +CMAKE_HOST_OPTIONS += \ + -DSOVERSION=$(PKG_ABI_VERSION) \ + -DFS_SUPPORT=ON \ + -DMATH_SUPPORT=ON \ + -DNL80211_SUPPORT=OFF \ + -DRESOLV_SUPPORT=OFF \ + -DRTNL_SUPPORT=OFF \ + -DSTRUCT_SUPPORT=ON \ + -DUBUS_SUPPORT=OFF \ + -DUCI_SUPPORT=OFF \ + -DULOOP_SUPPORT=OFF + + +define Package/ucode/default + SUBMENU:=ucode + SECTION:=lang + CATEGORY:=Languages + TITLE:=Tiny scripting and templating language +endef + +define Package/ucode + $(Package/ucode/default) + DEPENDS:=+libucode +endef + +define Package/ucode/description + ucode is a tiny script interpreter featuring an ECMAScript oriented + script language and Jinja-inspired templating. +endef + + +define Package/libucode + $(Package/ucode/default) + SUBMENU:= + SECTION:=libs + CATEGORY:=Libraries + TITLE+= (library) + ABI_VERSION:=$(PKG_ABI_VERSION) + DEPENDS:=+libjson-c +endef + +define Package/libucode/description + The libucode package provides the shared runtime library for the ucode interpreter. +endef + + +define Package/ucode-mod-fs + $(Package/ucode/default) + TITLE+= (filesystem module) + DEPENDS:=ucode +endef + +define Package/ucode-mod-fs/description + The filesystem plugin module allows interaction with the local file system. +endef + + +define Package/ucode-mod-math + $(Package/ucode/default) + TITLE+= (math module) + DEPENDS:=ucode +endef + +define Package/ucode-mod-math/description + The math plugin provides access to various <math.h> procedures. +endef + + +define Package/ucode-mod-nl80211 + $(Package/ucode/default) + TITLE+= (nl80211 module) + DEPENDS:=ucode +libnl-tiny +libubox +endef + +define Package/ucode-mod-nl80211/description + The nl80211 plugin provides access to the Linux wireless 802.11 netlink API. +endef + + +define Package/ucode-mod-resolv + $(Package/ucode/default) + TITLE+= (resolv module) + DEPENDS:=ucode +endef + +define Package/ucode-mod-resolv/description + The resolv plugin implements simple DNS resolving. +endef + + +define Package/ucode-mod-rtnl + $(Package/ucode/default) + TITLE+= (rtnl module) + DEPENDS:=ucode +libnl-tiny +libubox +endef + +define Package/ucode-mod-rtnl/description + The rtnl plugin provides access to the Linux routing netlink API. +endef + + +define Package/ucode-mod-struct + $(Package/ucode/default) + TITLE+= (struct module) + DEPENDS:=ucode +endef + +define Package/ucode-mod-struct/description + The struct plugin implements Python 3 compatible struct.pack/unpack functionality. +endef + + +define Package/ucode-mod-ubus + $(Package/ucode/default) + TITLE+= (ubus module) + DEPENDS:=ucode +libubus +libblobmsg-json +endef + +define Package/ucode-mod-ubus/description + The ubus module allows ucode template scripts to enumerate and invoke ubus + procedures. +endef + + +define Package/ucode-mod-uci + $(Package/ucode/default) + TITLE+= (uci module) + DEPENDS:=ucode +libuci +endef + +define Package/ucode-mod-uci/description + The uci module allows templates to read and modify uci configuration. +endef + + +define Package/ucode-mod-uloop + $(Package/ucode/default) + TITLE+= (uloop module) + DEPENDS:=ucode +libubox +endef + +define Package/ucode-mod-uloop/description + The uloop module allows ucode scripts to interact with OpenWrt uloop event + loop implementation. +endef + + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/lib $(1)/usr/include/ucode + $(CP) $(PKG_INSTALL_DIR)/usr/include/ucode/*.h $(1)/usr/include/ucode/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libucode.so* $(1)/usr/lib/ +endef + + +define Package/ucode/install + $(INSTALL_DIR) $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/u* $(1)/usr/bin/ +endef + +define Package/libucode/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libucode.so.* $(1)/usr/lib/ +endef + +define Package/ucode-mod-fs/install + $(INSTALL_DIR) $(1)/usr/lib/ucode + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ucode/fs.so $(1)/usr/lib/ucode/ +endef + +define Package/ucode-mod-math/install + $(INSTALL_DIR) $(1)/usr/lib/ucode + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ucode/math.so $(1)/usr/lib/ucode/ +endef + +define Package/ucode-mod-nl80211/install + $(INSTALL_DIR) $(1)/usr/lib/ucode + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ucode/nl80211.so $(1)/usr/lib/ucode/ +endef + +define Package/ucode-mod-resolv/install + $(INSTALL_DIR) $(1)/usr/lib/ucode + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ucode/resolv.so $(1)/usr/lib/ucode/ +endef + +define Package/ucode-mod-rtnl/install + $(INSTALL_DIR) $(1)/usr/lib/ucode + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ucode/rtnl.so $(1)/usr/lib/ucode/ +endef + +define Package/ucode-mod-struct/install + $(INSTALL_DIR) $(1)/usr/lib/ucode + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ucode/struct.so $(1)/usr/lib/ucode/ +endef + +define Package/ucode-mod-ubus/install + $(INSTALL_DIR) $(1)/usr/lib/ucode + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ucode/ubus.so $(1)/usr/lib/ucode/ +endef + +define Package/ucode-mod-uci/install + $(INSTALL_DIR) $(1)/usr/lib/ucode + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ucode/uci.so $(1)/usr/lib/ucode/ +endef + +define Package/ucode-mod-uloop/install + $(INSTALL_DIR) $(1)/usr/lib/ucode + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ucode/uloop.so $(1)/usr/lib/ucode/ +endef + +$(eval $(call BuildPackage,libucode)) +$(eval $(call BuildPackage,ucode)) +$(eval $(call BuildPackage,ucode-mod-fs)) +$(eval $(call BuildPackage,ucode-mod-math)) +$(eval $(call BuildPackage,ucode-mod-nl80211)) +$(eval $(call BuildPackage,ucode-mod-resolv)) +$(eval $(call BuildPackage,ucode-mod-rtnl)) +$(eval $(call BuildPackage,ucode-mod-struct)) +$(eval $(call BuildPackage,ucode-mod-ubus)) +$(eval $(call BuildPackage,ucode-mod-uci)) +$(eval $(call BuildPackage,ucode-mod-uloop)) +$(eval $(call HostBuild)) |