From 6b5e615dc850f84d9a164ac0c8c6d097f414508a Mon Sep 17 00:00:00 2001 From: LibretroAdmin Date: Thu, 29 Oct 2026 17:23:16 +0100 Subject: [PATCH] webOS: packaging moves to pkg/webos The webOS ipk packaging - the icon, its build script, the aarch64 repack script and the notes - lives under pkg/webos with the other platforms' packaging. Makefile.webos stages and packages the ipk there, the webOS workflow collects its artifacts from there, and the Homebrew Channel manifest takes its icon from pkg/webos on master. --- .github/workflows/webOS.yml | 38 +++++++++---------- Makefile.webos | 34 ++++++++--------- {webos => pkg/webos}/.gitignore | 0 {webos => pkg/webos}/README.md | 0 {webos => pkg/webos}/build-icon.sh | 2 +- {webos => pkg/webos}/icon160.png | Bin {webos => pkg/webos}/patch-aarch64-in-ipk.sh | 0 7 files changed, 37 insertions(+), 37 deletions(-) rename {webos => pkg/webos}/.gitignore (100%) rename {webos => pkg/webos}/README.md (100%) rename {webos => pkg/webos}/build-icon.sh (66%) rename {webos => pkg/webos}/icon160.png (100%) rename {webos => pkg/webos}/patch-aarch64-in-ipk.sh (100%) diff --git a/.github/workflows/webOS.yml b/.github/workflows/webOS.yml index 8d3498a6bb..f37150ae6e 100644 --- a/.github/workflows/webOS.yml +++ b/.github/workflows/webOS.yml @@ -159,9 +159,9 @@ jobs: bash .github/workflows/scripts/ccache-make.sh -f Makefile.webos ipk PACKAGE_NAME=${PACKAGE_NAME} ADD_SDL2_LIB=1 \ SDL2_PREBUILT_ARCHIVE="file:///tmp/sdl2-prebuilt/${SDL2_NAME}" \ -j"$(getconf _NPROCESSORS_ONLN)" - mkdir -p webos/arm - mv webos/com.retroarch.webos_${RARCH_VERSION}_arm.ipk \ - webos/arm/com.retroarch.webos-legacy-gles2-no-wayland_${RARCH_VERSION}_arm.ipk + mkdir -p pkg/webos/arm + mv pkg/webos/com.retroarch.webos_${RARCH_VERSION}_arm.ipk \ + pkg/webos/arm/com.retroarch.webos-legacy-gles2-no-wayland_${RARCH_VERSION}_arm.ipk env: DEBUG: ${{ github.event_name == 'release' && '0' || '1' }} SDL2_NAME: ${{ steps.sdl2.outputs.name }} @@ -170,7 +170,7 @@ jobs: uses: actions/upload-artifact@v7 with: name: com.retroarch.webos-legacy-gles2-no-wayland_${{ env.RARCH_VERSION }}_${{ github.sha }}_arm.ipk - path: webos/arm/com.retroarch.webos-legacy-gles2-no-wayland_${{ env.RARCH_VERSION }}_arm.ipk + path: pkg/webos/arm/com.retroarch.webos-legacy-gles2-no-wayland_${{ env.RARCH_VERSION }}_arm.ipk archive: false - name: Compile RA (default) @@ -184,9 +184,9 @@ jobs: SDL2_PREBUILT_ARCHIVE="file:///tmp/sdl2-prebuilt/${SDL2_NAME}" \ HAVE_XKBCOMMON=1 HAVE_USERLAND=1 HAVE_EGL=1 HAVE_WAYLAND=1 \ HAVE_OPENGLES3=1 HAVE_OPENGLES3_1=1 HAVE_OPENGLES3_2=1 -j"$(getconf _NPROCESSORS_ONLN)" - mkdir -p webos/arm - mv webos/com.retroarch.webos_${RARCH_VERSION}_arm.ipk \ - webos/arm/com.retroarch.webos_${RARCH_VERSION}_arm.ipk + mkdir -p pkg/webos/arm + mv pkg/webos/com.retroarch.webos_${RARCH_VERSION}_arm.ipk \ + pkg/webos/arm/com.retroarch.webos_${RARCH_VERSION}_arm.ipk env: DEBUG: ${{ github.event_name == 'release' && '0' || '1' }} SDL2_NAME: ${{ steps.sdl2.outputs.name }} @@ -195,16 +195,16 @@ jobs: uses: actions/upload-artifact@v7 with: name: com.retroarch.webos_${{ env.RARCH_VERSION }}_${{ github.sha }}_arm.ipk - path: webos/arm/com.retroarch.webos_${{ env.RARCH_VERSION }}_arm.ipk + path: pkg/webos/arm/com.retroarch.webos_${{ env.RARCH_VERSION }}_arm.ipk archive: false - name: Generate Manifest (default only) if: github.repository == 'webosbrew/Retroarch' shell: bash run: | - webosbrew-gen-manifest -o webos/${PACKAGE_NAME}.manifest.json \ - -p webos/arm/${PACKAGE_NAME}_${RARCH_VERSION}_arm.ipk \ - -i https://github.com/webosbrew/RetroArch/raw/webos/webos/icon160.png \ + webosbrew-gen-manifest -o pkg/webos/${PACKAGE_NAME}.manifest.json \ + -p pkg/webos/arm/${PACKAGE_NAME}_${RARCH_VERSION}_arm.ipk \ + -i https://github.com/libretro/RetroArch/raw/master/pkg/webos/icon160.png \ -l https://github.com/webosbrew/RetroArch - name: Compile RA (aarch64) @@ -220,9 +220,9 @@ jobs: HAVE_OPENGLES3=1 HAVE_OPENGLES3_1=1 HAVE_OPENGLES3_2=1 \ HAVE_WAYLAND_BACKPORT=0 HAVE_64TO32BIT_BRIDGE=1 SET_ELF_INTERPRETER=1 HAVE_UDEV=1 \ ARES_PACKAGE_ARGS="-A arm" -j"$(getconf _NPROCESSORS_ONLN)" - mkdir -p webos/aarch64 - mv webos/com.retroarch.webos_${{ env.RARCH_VERSION }}_arm.ipk \ - webos/aarch64/com.retroarch.webos_${{ env.RARCH_VERSION }}_aarch64.ipk + mkdir -p pkg/webos/aarch64 + mv pkg/webos/com.retroarch.webos_${{ env.RARCH_VERSION }}_arm.ipk \ + pkg/webos/aarch64/com.retroarch.webos_${{ env.RARCH_VERSION }}_aarch64.ipk env: DEBUG: ${{ github.event_name == 'release' && '0' || '1' }} @@ -244,7 +244,7 @@ jobs: uses: actions/upload-artifact@v7 with: name: com.retroarch.webos_${{ env.RARCH_VERSION }}_${{ github.sha }}_aarch64.ipk - path: webos/aarch64/com.retroarch.webos_${{ env.RARCH_VERSION }}_aarch64.ipk + path: pkg/webos/aarch64/com.retroarch.webos_${{ env.RARCH_VERSION }}_aarch64.ipk archive: false - name: Release @@ -258,7 +258,7 @@ jobs: omitBody: true omitPrereleaseDuringUpdate: true artifacts: | - webos/arm/com.retroarch.webos_${{ env.RARCH_VERSION }}_arm.ipk - webos/arm/com.retroarch.webos-legacy-gles2-no-wayland_${{ env.RARCH_VERSION }}_arm.ipk - webos/aarch64/com.retroarch.webos_${{ env.RARCH_VERSION }}_aarch64.ipk - webos/${{ env.PACKAGE_NAME }}.manifest.json + pkg/webos/arm/com.retroarch.webos_${{ env.RARCH_VERSION }}_arm.ipk + pkg/webos/arm/com.retroarch.webos-legacy-gles2-no-wayland_${{ env.RARCH_VERSION }}_arm.ipk + pkg/webos/aarch64/com.retroarch.webos_${{ env.RARCH_VERSION }}_aarch64.ipk + pkg/webos/${{ env.PACKAGE_NAME }}.manifest.json diff --git a/Makefile.webos b/Makefile.webos index d1a24259d9..a4c3a8905f 100644 --- a/Makefile.webos +++ b/Makefile.webos @@ -388,8 +388,8 @@ clean: $(Q)rm -rf SDL3 $(Q)rm -rf SDL3.tmp $(Q)rm -f SDL3-prebuilt.tar.gz.tmp - $(Q)rm -rf webos/*.ipk - $(Q)rm -rf webos/dist + $(Q)rm -rf pkg/webos/*.ipk + $(Q)rm -rf pkg/webos/dist sdl2: $(TARGET) ifeq ($(ADD_SDL2_LIB), 1) @@ -432,37 +432,37 @@ ifeq ($(ADD_SDL3_LIB), 1) endif ipk: prebuild $(TARGET) sdl2 sdl3 - rm -rf webos/dist - mkdir -p webos/dist/lib + rm -rf pkg/webos/dist + mkdir -p pkg/webos/dist/lib ifeq ($(SET_ELF_INTERPRETER), 1) patchelf --set-interpreter $(ELF_INTERPRETER) $(TARGET) endif - echo "$$APPINFO" > webos/dist/appinfo.json + echo "$$APPINFO" > pkg/webos/dist/appinfo.json # BSD cp (macOS) has no -t; put the destination last. - cp -vf $(TARGET) webos/icon160.png webos/dist/ - cp -vf $(WEBOS_USR_LIB_DIR)/libstdc++.so.6 webos/dist/lib/ + cp -vf $(TARGET) pkg/webos/icon160.png pkg/webos/dist/ + cp -vf $(WEBOS_USR_LIB_DIR)/libstdc++.so.6 pkg/webos/dist/lib/ ifeq ($(HAVE_XKBCOMMON), 1) - cp -vf $(WEBOS_USR_LIB_DIR)/libxkbcommon.so.0 webos/dist/lib/ + cp -vf $(WEBOS_USR_LIB_DIR)/libxkbcommon.so.0 pkg/webos/dist/lib/ endif - cp -vf $(WEBOS_LIB_DIR)/libatomic.so.1 webos/dist/lib/ + cp -vf $(WEBOS_LIB_DIR)/libatomic.so.1 pkg/webos/dist/lib/ ifeq ($(ADD_SDL2_LIB), 1) - cp -vf SDL/lib/libSDL2-2.0.so.0 webos/dist/lib/ + cp -vf SDL/lib/libSDL2-2.0.so.0 pkg/webos/dist/lib/ endif ifeq ($(ADD_SDL3_LIB), 1) - cp -vf SDL3/lib/libSDL3.so.0 webos/dist/lib/ + cp -vf SDL3/lib/libSDL3.so.0 pkg/webos/dist/lib/ endif ifneq ($(DEBUG), 1) - $(STRIP) webos/dist/$(TARGET) + $(STRIP) pkg/webos/dist/$(TARGET) endif - cd webos && ares-package dist $(ARES_PACKAGE_ARGS) + cd pkg/webos && ares-package dist $(ARES_PACKAGE_ARGS) ifeq ($(REPACK_64_IPK_FOR_MENU), 1) - ./webos/patch-aarch64-in-ipk.sh webos/$(APP_PACKAGE_NAME)_$(IPK_VERSION)_$(IPK_ARCH).ipk - rm webos/$(APP_PACKAGE_NAME)_$(IPK_VERSION)_$(IPK_ARCH).ipk - mv webos/$(APP_PACKAGE_NAME)_$(IPK_VERSION)_$(IPK_ARCH)-patched.ipk webos/$(APP_PACKAGE_NAME)_$(IPK_VERSION)_$(IPK_ARCH).ipk + ./pkg/webos/patch-aarch64-in-ipk.sh pkg/webos/$(APP_PACKAGE_NAME)_$(IPK_VERSION)_$(IPK_ARCH).ipk + rm pkg/webos/$(APP_PACKAGE_NAME)_$(IPK_VERSION)_$(IPK_ARCH).ipk + mv pkg/webos/$(APP_PACKAGE_NAME)_$(IPK_VERSION)_$(IPK_ARCH)-patched.ipk pkg/webos/$(APP_PACKAGE_NAME)_$(IPK_VERSION)_$(IPK_ARCH).ipk endif install: ipk - ares-install webos/$(APP_PACKAGE_NAME)_$(IPK_VERSION)_$(ARCH).ipk + ares-install pkg/webos/$(APP_PACKAGE_NAME)_$(IPK_VERSION)_$(ARCH).ipk launch: install ares-launch $(APP_PACKAGE_NAME) diff --git a/webos/.gitignore b/pkg/webos/.gitignore similarity index 100% rename from webos/.gitignore rename to pkg/webos/.gitignore diff --git a/webos/README.md b/pkg/webos/README.md similarity index 100% rename from webos/README.md rename to pkg/webos/README.md diff --git a/webos/build-icon.sh b/pkg/webos/build-icon.sh similarity index 66% rename from webos/build-icon.sh rename to pkg/webos/build-icon.sh index ccc5959938..eba4771681 100644 --- a/webos/build-icon.sh +++ b/pkg/webos/build-icon.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -convert -background none media/com.libretro.RetroArch.svg -resize 160x160 -negate webos/icon160.png +convert -background none media/com.libretro.RetroArch.svg -resize 160x160 -negate pkg/webos/icon160.png diff --git a/webos/icon160.png b/pkg/webos/icon160.png similarity index 100% rename from webos/icon160.png rename to pkg/webos/icon160.png diff --git a/webos/patch-aarch64-in-ipk.sh b/pkg/webos/patch-aarch64-in-ipk.sh similarity index 100% rename from webos/patch-aarch64-in-ipk.sh rename to pkg/webos/patch-aarch64-in-ipk.sh