diff --git a/.gitignore b/.gitignore index 5a6642bd861..9cb85551f45 100644 --- a/.gitignore +++ b/.gitignore @@ -26,7 +26,7 @@ batocera.mk reglinux.mk .vscode/* make.log -package/emulationstation/batocera-emulationstation/keys.txt +package/batocera/emulationstation/batocera-emulationstation/keys.txt package/reglinux/reglinux-emulationstation/keys.txt .directory *.po~ diff --git a/Config.in b/Config.in index 8eb766af7e2..8c32771a04d 100644 --- a/Config.in +++ b/Config.in @@ -1,118 +1,118 @@ menu "batocera.linux" menu "System" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/core/batocera-system/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/core/batocera-configgen/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/core/batocera-desktopapps/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/core/batocera-scripts/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/core/batocera-triggerhappy/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/core/batocera-settings/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/core/batocera-udev-rules/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/core/batocera-audio/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/core/batocera-audio-alsa/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/core/batocera-bluetooth/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/core/batocera-notice/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/core/batocera-drminfo/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/core/batocera-controller-overlays/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/core/batocera-resolution/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/core/batocera-system/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/core/batocera-configgen/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/core/batocera-desktopapps/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/core/batocera-scripts/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/core/batocera-triggerhappy/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/core/batocera-settings/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/core/batocera-udev-rules/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/core/batocera-audio/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/core/batocera-audio-alsa/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/core/batocera-bluetooth/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/core/batocera-notice/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/core/batocera-drminfo/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/core/batocera-controller-overlays/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/core/batocera-resolution/Config.in" menu "Boot" - #source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/batocera-initramfs/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/batocera-shim/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/batocera-shim-signed-efi-x64/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/batocera-shim-signed-efi-ia32/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/batocera-shim-signed-efi-helpers-ia32/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/batocera-syslinux-efi/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/uboot-odroid-xu4/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/uboot-odroid-goa/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/uboot-rk3588/Config.in" -# source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/uboot-a3gen2/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/uboot-ps5000/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/uboot-ps7000/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/uboot-powkiddy-a13/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/uboot-odroid-m1/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/uboot-rock-3a/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/uboot-rock-3c/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/uboot-firefly-station-m2/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/uboot-firefly-station-p2/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/uboot-anbernic-rgxx3/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/uboot-vim4/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/uboot-vim1s/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/uboot-orangepi-5-plus/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/uboot-orangepi-800/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/uboot-orangepi-4-lts/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/uboot-khadas-edge-2/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/uboot-bananapi-m7/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/uboot-visionfive2/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/rockpro64-blobs/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/uboot-hugsun-x99/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/uboot-evb-rk3399/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/rk3128-blobs/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/uboot-multiboard/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/boot/uboot-rock-5c/Config.in" + #source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/batocera-initramfs/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/batocera-shim/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/batocera-shim-signed-efi-x64/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/batocera-shim-signed-efi-ia32/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/batocera-shim-signed-efi-helpers-ia32/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/batocera-syslinux-efi/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-odroid-xu4/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-odroid-goa/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-rk3588/Config.in" +# source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-a3gen2/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-ps5000/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-ps7000/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-powkiddy-a13/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-odroid-m1/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-rock-3a/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-rock-3c/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-firefly-station-m2/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-firefly-station-p2/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-anbernic-rgxx3/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-vim4/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-vim1s/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-orangepi-5-plus/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-orangepi-800/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-orangepi-4-lts/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-khadas-edge-2/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-bananapi-m7/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-visionfive2/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/rockpro64-blobs/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-hugsun-x99/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-evb-rk3399/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/rk3128-blobs/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-multiboard/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-rock-5c/Config.in" endmenu menu "Toolchain" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/toolchain/toolchain-optional-linaro-aarch64/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/toolchain/toolchain-optional-linaro-aarch64/Config.in" endmenu menu "Fonts" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/fonts/nanum-font/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/fonts/noto-cjk-fonts/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/fonts/nanum-font/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/fonts/noto-cjk-fonts/Config.in" endmenu menu "Firmwares" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/firmwares/alllinuxfirmwares/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/firmwares/extralinuxfirmwares/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/firmwares/firmware-armbian/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/firmwares/firmware-orangepi/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/firmwares/firmware-khadas-vim4/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/firmwares/firmware-rk3588/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/firmwares/sound-open-firmware/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/firmwares/alllinuxfirmwares/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/firmwares/extralinuxfirmwares/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/firmwares/firmware-armbian/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/firmwares/firmware-orangepi/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/firmwares/firmware-khadas-vim4/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/firmwares/firmware-rk3588/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/firmwares/sound-open-firmware/Config.in" endmenu menu "GPU" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/gpu/libmali/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/gpu/img-gpu-powervr/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/gpu/img-mesa3d/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/gpu/mali-G52/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/gpu/mali-G31/Config.in" - #source "$BR2_EXTERNAL_BATOCERA_PATH/package/gpu/mali-g31-gbm/Config.in" - #source "$BR2_EXTERNAL_BATOCERA_PATH/package/gpu/mali-mp400-wayland/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/gpu/mali-mp400-gbm/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/gpu/batocera-nvidia/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/gpu/batocera-nvidia-driver/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/gpu/batocera-nvidia-legacy-driver/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/gpu/batocera-nvidia340-legacy-driver/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/gpu/batocera-nvidia390-legacy-driver/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/gpu/rockchip-mpp/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/gpu/rockchip-rga/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/gpu/vulkan/glslang/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/gpu/vulkan/spirv-cross/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/gpu/vulkan/vulkan-samples/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/gpu/batocera-nvidia-lists/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/gpu/batocera-amd/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/gpu/gl4es/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/gpu/intel-clc/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/gpu/nv-codec-headers/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/libmali/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/img-gpu-powervr/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/img-mesa3d/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/mali-G52/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/mali-G31/Config.in" + #source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/mali-g31-gbm/Config.in" + #source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/mali-mp400-wayland/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/mali-mp400-gbm/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/batocera-nvidia/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/batocera-nvidia-driver/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/batocera-nvidia-legacy-driver/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/batocera-nvidia340-legacy-driver/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/batocera-nvidia390-legacy-driver/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/rockchip-mpp/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/rockchip-rga/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/vulkan/glslang/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/vulkan/spirv-cross/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/vulkan/vulkan-samples/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/batocera-nvidia-lists/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/batocera-amd/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/gl4es/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/intel-clc/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/gpu/nv-codec-headers/Config.in" endmenu menu "Network" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/network/rtl8812au/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/network/rtl8821au-morrownr/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/network/rtl88x2bu/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/network/qualcomm/pd-mapper/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/network/qualcomm/qrtr/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/network/qualcomm/rmtfs/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/network/qualcomm/tqftpserv/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/network/r8125/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/network/r8168/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/network/aic8800/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/network/rtl8812au/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/network/rtl8821au-morrownr/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/network/rtl88x2bu/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/network/qualcomm/pd-mapper/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/network/qualcomm/qrtr/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/network/qualcomm/rmtfs/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/network/qualcomm/tqftpserv/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/network/r8125/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/network/r8168/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/network/aic8800/Config.in" endmenu menu "LED" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/leds/ayn-platform/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/leds/ayaneo-platform/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/leds/ayn-platform/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/leds/ayaneo-platform/Config.in" endmenu menu "Device trees" @@ -120,270 +120,270 @@ menu "System" endmenu menu "Emulationstation" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulationstation/batocera-emulationstation/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulationstation/batocera-es-system/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulationstation/es-theme-carbon/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulationstation/es-background-musics/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulationstation/batocera-emulationstation/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulationstation/batocera-es-system/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulationstation/es-theme-carbon/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulationstation/es-background-musics/Config.in" endmenu menu "Controllers" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/anbernic-gpio-pad/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/db9_gpio_rpi/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/gamecon_gpio_rpi/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/mk_arcade_joystick_rpi/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/qtsixa/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/qtsixa-shanwan/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/xarcade2jstick/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/retrogame/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/uinput-joystick/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/input-wrapper/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/umtool/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/xone/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/xpad-noone/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/xpadneo/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/xow/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/aimtrak-guns/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/samco-guns/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/fusion-lightguns/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/retroshooter-guns/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/dolphinbar-guns/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/sinden-guns/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/sinden-guns-libs/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/gun4ir-guns/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/steamdeckgun/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/guncon/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/guncon3/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/wiimotes-rules/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/wiimote-3rdparty/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/dolphinCrosshairsPack/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/aelightgun/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/lightguns-games-precalibrations/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/batocera-gun-calibrator/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/batocera-wheel-calibrator/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/fun-r1-gamepad/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/hid-nx/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/joycond/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/jammasd/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/controllers/new-lg4ff/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/anbernic-gpio-pad/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/db9_gpio_rpi/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/gamecon_gpio_rpi/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/mk_arcade_joystick_rpi/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/qtsixa/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/qtsixa-shanwan/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/xarcade2jstick/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/retrogame/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/uinput-joystick/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/input-wrapper/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/umtool/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/xone/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/xpad-noone/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/xpadneo/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/xow/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/aimtrak-guns/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/samco-guns/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/fusion-lightguns/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/retroshooter-guns/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/dolphinbar-guns/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/sinden-guns/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/sinden-guns-libs/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/gun4ir-guns/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/steamdeckgun/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/guncon/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/guncon3/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/wiimotes-rules/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/wiimote-3rdparty/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/dolphinCrosshairsPack/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/aelightgun/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/lightguns-games-precalibrations/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/batocera-gun-calibrator/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/batocera-wheel-calibrator/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/fun-r1-gamepad/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/hid-nx/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/joycond/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/jammasd/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/controllers/new-lg4ff/Config.in" endmenu menu "Emulators" menu "Retroarch" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/retroarch/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/retroarch-assets/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro-core-info/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/batocera-retroachievements-sounds/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/retroarch/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/retroarch-assets/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro-core-info/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/batocera-retroachievements-sounds/Config.in" menu "Shaders" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/shaders/common-shaders/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/shaders/slang-shaders/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/shaders/glsl-shaders/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/shaders/common-shaders/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/shaders/slang-shaders/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/shaders/glsl-shaders/Config.in" endmenu menu "cores" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-atari800/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-a5200/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-pocketsnes/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-beetle-vb/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-snes9x/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-snes9x-next/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-desmume/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-picodrive/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-genesisplusgx/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-blastem/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-gambatte/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-stella/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-stella2014/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-pcsx/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-beetle-psx/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-beetle-saturn/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-fceumm/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-nestopia/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-imame/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-beetle-pce/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-beetle-pce-fast/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-beetle-pcfx/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-virtualjaguar/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-bluemsx/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-gpsp/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-fbalpha/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-fbneo/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-gw/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-prboom/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-mrboom/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-tyrquake/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-beetle-ngp/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-vecx/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-beetle-lynx/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-lutro/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-beetle-wswan/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-parallel-n64/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-beetle-supergrafx/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-nxengine/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-freechaf/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-prosystem/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-tgbdual/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-mgba/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-mame2003-plus/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-mame2010/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-fuse/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-cap32/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-81/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-o2em/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-hatari/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-yabasanshiro/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-freeintv/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-mupen64plus-next/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-flycast/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-flycastvl/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-px68k/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-vice/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-vba-m/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-mame/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-kronos/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-neocd/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-pokemini/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-handy/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-bsnes/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-bsnes-hd/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-dosbox-pure/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-scummvm/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-theodore/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-pc88/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-pc98/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-puae/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-uae4arm/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-ppsspp/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-opera/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-tic80/Config.in" -# source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-retro8/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-fake08/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-easyrpg/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-melonds/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-xmil/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-fmsx/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-watara/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-genesisplusgx-wide/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-swanstation/Config.in" -# source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-ecwolf/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-mesens/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-emuscv/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-uzem/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-play/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-chailove/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-craft/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-reminiscence/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-sameduck/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-superflappybirds/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-xrick/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-zc210/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-minivmac/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-mesen/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-same-cdi/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-superbroswar/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-smsplus-gx/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-dolphin/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-lowresnx/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-arduous/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-wasm4/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-gearsystem/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-hatarib/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/retroarch/libretro/libretro-melonds-ds/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-atari800/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-a5200/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-pocketsnes/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-beetle-vb/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-snes9x/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-snes9x-next/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-desmume/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-picodrive/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-genesisplusgx/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-blastem/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-gambatte/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-stella/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-stella2014/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-pcsx/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-beetle-psx/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-beetle-saturn/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-fceumm/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-nestopia/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-imame/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-beetle-pce/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-beetle-pce-fast/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-beetle-pcfx/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-virtualjaguar/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-bluemsx/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-gpsp/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-fbalpha/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-fbneo/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-gw/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-prboom/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-mrboom/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-tyrquake/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-beetle-ngp/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-vecx/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-beetle-lynx/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-lutro/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-beetle-wswan/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-parallel-n64/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-beetle-supergrafx/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-nxengine/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-freechaf/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-prosystem/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-tgbdual/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-mgba/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-mame2003-plus/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-mame2010/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-fuse/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-cap32/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-81/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-o2em/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-hatari/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-yabasanshiro/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-freeintv/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-mupen64plus-next/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-flycast/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-flycastvl/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-px68k/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-vice/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-vba-m/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-mame/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-kronos/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-neocd/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-pokemini/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-handy/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-bsnes/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-bsnes-hd/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-dosbox-pure/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-scummvm/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-theodore/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-pc88/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-pc98/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-puae/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-uae4arm/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-ppsspp/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-opera/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-tic80/Config.in" +# source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-retro8/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-fake08/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-easyrpg/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-melonds/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-xmil/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-fmsx/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-watara/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-genesisplusgx-wide/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-swanstation/Config.in" +# source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-ecwolf/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-mesens/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-emuscv/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-uzem/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-play/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-chailove/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-craft/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-reminiscence/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-sameduck/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-superflappybirds/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-xrick/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-zc210/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-minivmac/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-mesen/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-same-cdi/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-superbroswar/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-smsplus-gx/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-dolphin/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-lowresnx/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-arduous/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-wasm4/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-gearsystem/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-hatarib/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/retroarch/libretro/libretro-melonds-ds/Config.in" endmenu endmenu menu "Standalone Emulators" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/amiberry/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/hatari/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/dolphin-triforce/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/dosbox-staging/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/dosbox-x/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/fsuae/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/moonlight-embedded/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/supermodel/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/supermodel-legacy/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/supermodel-es/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/model2emu/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/mame/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/ryujinx/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/fpinball/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/lightspark/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/ruffle/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/drastic/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/lexaloffle-pico8/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/lexaloffle-voxatron/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/simcoupe/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/demul/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/xenia/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/xenia-canary/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/pcsx2/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/rpcs3/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/ppsspp/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/flycast/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/scummvm/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/vice/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/lime3ds/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/citra/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/hypseus-singe/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/openbor/openbor4432/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/openbor/openbor6330/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/openbor/openbor6412/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/openbor/openbor6510/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/openbor/openbor7142/Config.in" - #source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/python-pygame2/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/easyrpg/liblcf/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/easyrpg/easyrpg-player/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/solarus-engine/Config.in" -# source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/redream/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/tsugaru/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/xemu/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/gsplus/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/play/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/vita3k/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/ikemen/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/bigpemu/Config.in" - #source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/python-pyxel/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/vpinball/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/duckstation-legacy/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/openbor/openbor7530/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/openmsx/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/amiberry/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/hatari/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/dolphin-triforce/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/dosbox-staging/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/dosbox-x/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/fsuae/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/moonlight-embedded/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/supermodel/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/supermodel-legacy/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/supermodel-es/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/model2emu/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/mame/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/ryujinx/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/fpinball/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/lightspark/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/ruffle/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/drastic/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/lexaloffle-pico8/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/lexaloffle-voxatron/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/simcoupe/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/demul/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/xenia/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/xenia-canary/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/pcsx2/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/rpcs3/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/ppsspp/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/flycast/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/scummvm/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/vice/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/lime3ds/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/citra/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/hypseus-singe/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/openbor/openbor4432/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/openbor/openbor6330/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/openbor/openbor6412/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/openbor/openbor6510/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/openbor/openbor7142/Config.in" + #source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/python-pygame2/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/easyrpg/liblcf/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/easyrpg/easyrpg-player/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/solarus-engine/Config.in" +# source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/redream/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/tsugaru/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/xemu/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/gsplus/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/play/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/vita3k/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/ikemen/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/bigpemu/Config.in" + #source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/python-pyxel/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/vpinball/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/duckstation-legacy/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/openbor/openbor7530/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/openmsx/Config.in" endmenu menu "WINE" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/wine/dxvk/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/wine/dxvk-nvapi/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/wine/mf/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/wine/vkd3d-proton/Config.in" - #source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/wine/vkd3d/Config.in" - #source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/wine/wine-mono-proton/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/wine/rtkit/Config.in" - #source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/wine/wine-proton/Config.in" - #source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/wine/wine-proton-wow64_32/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/wine-x86/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/wine/d8vk/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/wine/wine-ge-custom/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/wine/wine-ge-custom-wow64_32/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/emulators/wine/wine-mono-ge-custom/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/wine/dxvk/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/wine/dxvk-nvapi/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/wine/mf/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/wine/vkd3d-proton/Config.in" + #source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/wine/vkd3d/Config.in" + #source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/wine/wine-mono-proton/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/wine/rtkit/Config.in" + #source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/wine/wine-proton/Config.in" + #source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/wine/wine-proton-wow64_32/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/wine-x86/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/wine/d8vk/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/wine/wine-ge-custom/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/wine/wine-ge-custom-wow64_32/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/wine/wine-mono-ge-custom/Config.in" endmenu menu "ports" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/ports/sdlpop/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/ports/cannonball/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/ports/ecwolf/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/ports/sonic2013/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/ports/soniccd/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/ports/cdogs/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/ports/abuse-data/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/ports/abuse/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/ports/hcl/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/ports/gzdoom/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/ports/eduke32/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/ports/raze/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/ports/corsixth/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/ports/tyrian/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/ports/fallout1-ce/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/ports/fallout2-ce/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/ports/theforceengine/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/ports/sonic3-air/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/ports/uqm/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/ports/sdlpop/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/ports/cannonball/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/ports/ecwolf/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/ports/sonic2013/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/ports/soniccd/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/ports/cdogs/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/ports/abuse-data/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/ports/abuse/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/ports/hcl/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/ports/gzdoom/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/ports/eduke32/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/ports/raze/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/ports/corsixth/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/ports/tyrian/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/ports/fallout1-ce/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/ports/fallout2-ce/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/ports/theforceengine/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/ports/sonic3-air/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/ports/uqm/Config.in" endmenu menu "mupen64plus" @@ -400,135 +400,135 @@ menu "Emulators" endmenu menu "Looks" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/looks/adwaita-icon-theme-light/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/looks/hypseus-singe-bezels/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/looks/adwaita-icon-theme-light/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/looks/hypseus-singe-bezels/Config.in" endmenu menu "Utils" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/raspi2png/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/rpigpioswitch/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/jstest2/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/xosd/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/unclutter/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/winetricks/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/batocera-wine/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/batocera-pygame/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/cabextract/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/re2c/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/xxd/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/pacman/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/wii-u-gc-adapter/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/evmapy/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/evsieve/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/evmapy-system-config/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/l3afpad/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/switchres/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/bauh/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/batocera-steam/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/pm-utils/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/mangohud/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/ryzenadj/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/syncthing/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/rclone/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/piboy/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/batocera-ethtool/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/batocera-battery-checker/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/btop/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/picade/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/od-commander/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/xwiimote/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/batocera-test/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/touchegg/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/imgui/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/grim/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/wf-recorder/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/wlr-randr/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/vdpauinfo/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/ledspicer/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/innoextract/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/mokutil/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/utils/zramswap/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/raspi2png/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/rpigpioswitch/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/jstest2/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/xosd/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/unclutter/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/winetricks/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/batocera-wine/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/batocera-pygame/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/cabextract/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/re2c/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/xxd/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/pacman/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/wii-u-gc-adapter/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/evmapy/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/evsieve/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/evmapy-system-config/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/l3afpad/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/switchres/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/bauh/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/batocera-steam/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/pm-utils/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/mangohud/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/ryzenadj/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/syncthing/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/rclone/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/piboy/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/batocera-ethtool/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/batocera-battery-checker/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/btop/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/picade/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/od-commander/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/xwiimote/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/batocera-test/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/touchegg/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/imgui/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/grim/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/wf-recorder/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/wlr-randr/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/vdpauinfo/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/ledspicer/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/innoextract/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/mokutil/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/zramswap/Config.in" endmenu menu "Cases" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/cases/roshambo-case/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/cases/deskpipro-case/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/cases/element14-pi-desktop/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/cases/pironman/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/cases/pironman5/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/cases/roshambo-case/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/cases/deskpipro-case/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/cases/element14-pi-desktop/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/cases/pironman/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/cases/pironman5/Config.in" endmenu menu "Screens" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/screens/dmd-simulator/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/screens/batocera-backglass/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/screens/dmd-simulator/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/screens/batocera-backglass/Config.in" endmenu menu "Libraries" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/libopenmpt/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/libcapsimage/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/libenet/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/python-autobreadcrumbs/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/wxwidgets/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/ecm/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/iir/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/libxmp/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/projectm/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/wildmidi/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/python3-pyparsing/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/python-adafruit-blinka/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/python-adafruit-circuitpython-busdevice/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/python-adafruit-circuitpython-typing/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/python-adafruit-circuitpython-ws2801/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/python-adafruit-platformdetect/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/python-adafruit-pureio/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/python-pyftdi/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/python-sysv-ipc/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/python-pyqt5-sip/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/python-hidapi/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/libliftoff/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/python3-configobj/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/libjpeg-bato/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/faudio/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/sockpp/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/cargs/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/libzedmd/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/libserum/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/libpupdmd/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/libdmdutil/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/libdof/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/libpinmame/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/libaltsound/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/python3-gpiod/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/libgraphene/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/libportmidi/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/shaderc/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/python-proxy-tools/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/pywebview/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/ffmpeg-python/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/pm_auto/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/pm_dashboard/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/sf_rpi_status/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/python-adafruit-circuitpython-neopixel-spi/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/python-adafruit-circuitpython-pixelbuf/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/python-smbus2/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/python-adafruit-circuitpython-connectionmanager/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/python-adafruit-circuitpython-requests/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/liblgpio/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/python-lgpio/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/python-binho-host-adapter/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/libopenmpt/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/libcapsimage/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/libenet/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-autobreadcrumbs/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/wxwidgets/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/ecm/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/iir/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/libxmp/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/projectm/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/wildmidi/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python3-pyparsing/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-adafruit-blinka/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-adafruit-circuitpython-busdevice/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-adafruit-circuitpython-typing/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-adafruit-circuitpython-ws2801/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-adafruit-platformdetect/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-adafruit-pureio/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-pyftdi/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-sysv-ipc/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-pyqt5-sip/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-hidapi/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/libliftoff/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python3-configobj/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/libjpeg-bato/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/faudio/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/sockpp/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/cargs/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/libzedmd/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/libserum/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/libpupdmd/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/libdmdutil/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/libdof/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/libpinmame/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/libaltsound/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python3-gpiod/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/libgraphene/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/libportmidi/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/shaderc/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-proxy-tools/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/pywebview/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/ffmpeg-python/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/pm_auto/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/pm_dashboard/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/sf_rpi_status/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-adafruit-circuitpython-neopixel-spi/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-adafruit-circuitpython-pixelbuf/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-smbus2/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-adafruit-circuitpython-connectionmanager/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-adafruit-circuitpython-requests/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/liblgpio/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-lgpio/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-binho-host-adapter/Config.in" endmenu menu "Audio" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/audio/rtmidi/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/audio/chromebook-ucm-conf/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/audio/chromebook-linux-audio/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/audio/alsa-topology-conf/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/audio/alsa-ucm-conf/Config.in" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/audio/zmusic/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/audio/rtmidi/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/audio/chromebook-ucm-conf/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/audio/chromebook-linux-audio/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/audio/alsa-topology-conf/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/audio/alsa-ucm-conf/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/audio/zmusic/Config.in" endmenu menu "Database" - source "$BR2_EXTERNAL_BATOCERA_PATH/package/database/influxdb/Config.in" + source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/database/influxdb/Config.in" endmenu endmenu diff --git a/board/README.md b/board/batocera/README.md similarity index 91% rename from board/README.md rename to board/batocera/README.md index 342ab5297dd..62878eddeaa 100644 --- a/board/README.md +++ b/board/batocera/README.md @@ -1,3 +1,3 @@ Platform-specific build configuration. -The `fsoverlay` folders contain the files copied over to the boot partition, there is one for each platform and [one for global files](https://github.com/batocera-linux/batocera.linux/tree/master/board/batocera/fsoverlay). Try to keep this as small as possible, only the minimum required to boot the device, and handle the rest with [packages](https://github.com/batocera-linux/batocera.linux/tree/master/package). +The `fsoverlay` folders contain the files copied over to the boot partition, there is one for each platform and [one for global files](https://github.com/batocera-linux/batocera.linux/tree/master/board/batocera/fsoverlay). Try to keep this as small as possible, only the minimum required to boot the device, and handle the rest with [packages](https://github.com/batocera-linux/batocera.linux/tree/master/package/batocera). diff --git a/board/allwinner/h3/bananapi-m2-zero/boot/extlinux.conf b/board/batocera/allwinner/h3/bananapi-m2-zero/boot/extlinux.conf similarity index 100% rename from board/allwinner/h3/bananapi-m2-zero/boot/extlinux.conf rename to board/batocera/allwinner/h3/bananapi-m2-zero/boot/extlinux.conf diff --git a/board/allwinner/h3/bananapi-m2-zero/create-boot-script.sh b/board/batocera/allwinner/h3/bananapi-m2-zero/create-boot-script.sh similarity index 100% rename from board/allwinner/h3/bananapi-m2-zero/create-boot-script.sh rename to board/batocera/allwinner/h3/bananapi-m2-zero/create-boot-script.sh diff --git a/board/allwinner/h3/bananapi-m2-zero/genimage.cfg b/board/batocera/allwinner/h3/bananapi-m2-zero/genimage.cfg similarity index 100% rename from board/allwinner/h3/bananapi-m2-zero/genimage.cfg rename to board/batocera/allwinner/h3/bananapi-m2-zero/genimage.cfg diff --git a/board/allwinner/h3/cha/boot/extlinux.conf b/board/batocera/allwinner/h3/cha/boot/extlinux.conf similarity index 100% rename from board/allwinner/h3/cha/boot/extlinux.conf rename to board/batocera/allwinner/h3/cha/boot/extlinux.conf diff --git a/board/allwinner/h3/cha/create-boot-script.sh b/board/batocera/allwinner/h3/cha/create-boot-script.sh similarity index 100% rename from board/allwinner/h3/cha/create-boot-script.sh rename to board/batocera/allwinner/h3/cha/create-boot-script.sh diff --git a/board/allwinner/h3/cha/genimage.cfg b/board/batocera/allwinner/h3/cha/genimage.cfg similarity index 100% rename from board/allwinner/h3/cha/genimage.cfg rename to board/batocera/allwinner/h3/cha/genimage.cfg diff --git a/board/allwinner/h3/fsoverlay/etc/asound.conf b/board/batocera/allwinner/h3/fsoverlay/etc/asound.conf similarity index 100% rename from board/allwinner/h3/fsoverlay/etc/asound.conf rename to board/batocera/allwinner/h3/fsoverlay/etc/asound.conf diff --git a/board/allwinner/h3/fsoverlay/usr/bin/cputemp b/board/batocera/allwinner/h3/fsoverlay/usr/bin/cputemp similarity index 100% rename from board/allwinner/h3/fsoverlay/usr/bin/cputemp rename to board/batocera/allwinner/h3/fsoverlay/usr/bin/cputemp diff --git a/board/allwinner/h3/fsoverlay/usr/bin/gputemp b/board/batocera/allwinner/h3/fsoverlay/usr/bin/gputemp similarity index 100% rename from board/allwinner/h3/fsoverlay/usr/bin/gputemp rename to board/batocera/allwinner/h3/fsoverlay/usr/bin/gputemp diff --git a/board/allwinner/h3/fsoverlay/usr/share/alsa/cards/H3_Audio_Codec.conf b/board/batocera/allwinner/h3/fsoverlay/usr/share/alsa/cards/H3_Audio_Codec.conf similarity index 100% rename from board/allwinner/h3/fsoverlay/usr/share/alsa/cards/H3_Audio_Codec.conf rename to board/batocera/allwinner/h3/fsoverlay/usr/share/alsa/cards/H3_Audio_Codec.conf diff --git a/board/allwinner/h3/orangepi-one/boot/extlinux.conf b/board/batocera/allwinner/h3/orangepi-one/boot/extlinux.conf similarity index 100% rename from board/allwinner/h3/orangepi-one/boot/extlinux.conf rename to board/batocera/allwinner/h3/orangepi-one/boot/extlinux.conf diff --git a/board/allwinner/h3/orangepi-one/create-boot-script.sh b/board/batocera/allwinner/h3/orangepi-one/create-boot-script.sh similarity index 100% rename from board/allwinner/h3/orangepi-one/create-boot-script.sh rename to board/batocera/allwinner/h3/orangepi-one/create-boot-script.sh diff --git a/board/allwinner/h3/orangepi-one/genimage.cfg b/board/batocera/allwinner/h3/orangepi-one/genimage.cfg similarity index 100% rename from board/allwinner/h3/orangepi-one/genimage.cfg rename to board/batocera/allwinner/h3/orangepi-one/genimage.cfg diff --git a/board/allwinner/h3/orangepi-pc-plus/boot/extlinux.conf b/board/batocera/allwinner/h3/orangepi-pc-plus/boot/extlinux.conf similarity index 100% rename from board/allwinner/h3/orangepi-pc-plus/boot/extlinux.conf rename to board/batocera/allwinner/h3/orangepi-pc-plus/boot/extlinux.conf diff --git a/board/allwinner/h3/orangepi-pc-plus/create-boot-script.sh b/board/batocera/allwinner/h3/orangepi-pc-plus/create-boot-script.sh similarity index 100% rename from board/allwinner/h3/orangepi-pc-plus/create-boot-script.sh rename to board/batocera/allwinner/h3/orangepi-pc-plus/create-boot-script.sh diff --git a/board/allwinner/h3/orangepi-pc-plus/genimage.cfg b/board/batocera/allwinner/h3/orangepi-pc-plus/genimage.cfg similarity index 100% rename from board/allwinner/h3/orangepi-pc-plus/genimage.cfg rename to board/batocera/allwinner/h3/orangepi-pc-plus/genimage.cfg diff --git a/board/allwinner/h3/orangepi-pc/boot/extlinux.conf b/board/batocera/allwinner/h3/orangepi-pc/boot/extlinux.conf similarity index 100% rename from board/allwinner/h3/orangepi-pc/boot/extlinux.conf rename to board/batocera/allwinner/h3/orangepi-pc/boot/extlinux.conf diff --git a/board/allwinner/h3/orangepi-pc/create-boot-script.sh b/board/batocera/allwinner/h3/orangepi-pc/create-boot-script.sh similarity index 100% rename from board/allwinner/h3/orangepi-pc/create-boot-script.sh rename to board/batocera/allwinner/h3/orangepi-pc/create-boot-script.sh diff --git a/board/allwinner/h3/orangepi-pc/genimage.cfg b/board/batocera/allwinner/h3/orangepi-pc/genimage.cfg similarity index 100% rename from board/allwinner/h3/orangepi-pc/genimage.cfg rename to board/batocera/allwinner/h3/orangepi-pc/genimage.cfg diff --git a/board/allwinner/h3/orangepi-plus2e/boot/extlinux.conf b/board/batocera/allwinner/h3/orangepi-plus2e/boot/extlinux.conf similarity index 100% rename from board/allwinner/h3/orangepi-plus2e/boot/extlinux.conf rename to board/batocera/allwinner/h3/orangepi-plus2e/boot/extlinux.conf diff --git a/board/allwinner/h3/orangepi-plus2e/create-boot-script.sh b/board/batocera/allwinner/h3/orangepi-plus2e/create-boot-script.sh similarity index 100% rename from board/allwinner/h3/orangepi-plus2e/create-boot-script.sh rename to board/batocera/allwinner/h3/orangepi-plus2e/create-boot-script.sh diff --git a/board/allwinner/h3/orangepi-plus2e/genimage.cfg b/board/batocera/allwinner/h3/orangepi-plus2e/genimage.cfg similarity index 100% rename from board/allwinner/h3/orangepi-plus2e/genimage.cfg rename to board/batocera/allwinner/h3/orangepi-plus2e/genimage.cfg diff --git a/board/allwinner/h3/patches/ppsspp/001-eglx11.patch b/board/batocera/allwinner/h3/patches/ppsspp/001-eglx11.patch similarity index 100% rename from board/allwinner/h3/patches/ppsspp/001-eglx11.patch rename to board/batocera/allwinner/h3/patches/ppsspp/001-eglx11.patch diff --git a/board/allwinner/h3/patches/ppsspp/002-force-gles20-lima.patch b/board/batocera/allwinner/h3/patches/ppsspp/002-force-gles20-lima.patch similarity index 100% rename from board/allwinner/h3/patches/ppsspp/002-force-gles20-lima.patch rename to board/batocera/allwinner/h3/patches/ppsspp/002-force-gles20-lima.patch diff --git a/board/allwinner/h3/patches/sdl2/sdl2_have_rle.patch b/board/batocera/allwinner/h3/patches/sdl2/sdl2_have_rle.patch similarity index 100% rename from board/allwinner/h3/patches/sdl2/sdl2_have_rle.patch rename to board/batocera/allwinner/h3/patches/sdl2/sdl2_have_rle.patch diff --git a/board/allwinner/h5/fsoverlay/etc/asound.conf b/board/batocera/allwinner/h5/fsoverlay/etc/asound.conf similarity index 100% rename from board/allwinner/h5/fsoverlay/etc/asound.conf rename to board/batocera/allwinner/h5/fsoverlay/etc/asound.conf diff --git a/board/allwinner/h5/fsoverlay/usr/bin/cputemp b/board/batocera/allwinner/h5/fsoverlay/usr/bin/cputemp similarity index 100% rename from board/allwinner/h5/fsoverlay/usr/bin/cputemp rename to board/batocera/allwinner/h5/fsoverlay/usr/bin/cputemp diff --git a/board/allwinner/h5/fsoverlay/usr/bin/gputemp b/board/batocera/allwinner/h5/fsoverlay/usr/bin/gputemp similarity index 100% rename from board/allwinner/h5/fsoverlay/usr/bin/gputemp rename to board/batocera/allwinner/h5/fsoverlay/usr/bin/gputemp diff --git a/board/allwinner/h5/fsoverlay/usr/share/alsa/cards/H3_Audio_Codec.conf b/board/batocera/allwinner/h5/fsoverlay/usr/share/alsa/cards/H3_Audio_Codec.conf similarity index 100% rename from board/allwinner/h5/fsoverlay/usr/share/alsa/cards/H3_Audio_Codec.conf rename to board/batocera/allwinner/h5/fsoverlay/usr/share/alsa/cards/H3_Audio_Codec.conf diff --git a/board/allwinner/h5/fsoverlay/usr/share/alsa/cards/allwinner-hdmi.conf b/board/batocera/allwinner/h5/fsoverlay/usr/share/alsa/cards/allwinner-hdmi.conf similarity index 100% rename from board/allwinner/h5/fsoverlay/usr/share/alsa/cards/allwinner-hdmi.conf rename to board/batocera/allwinner/h5/fsoverlay/usr/share/alsa/cards/allwinner-hdmi.conf diff --git a/board/allwinner/h5/fsoverlay/usr/share/alsa/cards/allwinner-spdif.conf b/board/batocera/allwinner/h5/fsoverlay/usr/share/alsa/cards/allwinner-spdif.conf similarity index 100% rename from board/allwinner/h5/fsoverlay/usr/share/alsa/cards/allwinner-spdif.conf rename to board/batocera/allwinner/h5/fsoverlay/usr/share/alsa/cards/allwinner-spdif.conf diff --git a/board/allwinner/h5/orangepi-pc2/boot/extlinux.conf b/board/batocera/allwinner/h5/orangepi-pc2/boot/extlinux.conf similarity index 100% rename from board/allwinner/h5/orangepi-pc2/boot/extlinux.conf rename to board/batocera/allwinner/h5/orangepi-pc2/boot/extlinux.conf diff --git a/board/allwinner/h5/orangepi-pc2/create-boot-script.sh b/board/batocera/allwinner/h5/orangepi-pc2/create-boot-script.sh similarity index 100% rename from board/allwinner/h5/orangepi-pc2/create-boot-script.sh rename to board/batocera/allwinner/h5/orangepi-pc2/create-boot-script.sh diff --git a/board/allwinner/h5/orangepi-pc2/genimage.cfg b/board/batocera/allwinner/h5/orangepi-pc2/genimage.cfg similarity index 100% rename from board/allwinner/h5/orangepi-pc2/genimage.cfg rename to board/batocera/allwinner/h5/orangepi-pc2/genimage.cfg diff --git a/board/allwinner/h5/patches/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-aarch64-render.patch b/board/batocera/allwinner/h5/patches/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-aarch64-render.patch similarity index 100% rename from board/allwinner/h5/patches/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-aarch64-render.patch rename to board/batocera/allwinner/h5/patches/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-aarch64-render.patch diff --git a/board/allwinner/h5/patches/ppsspp/002-force-gles20-lima.patch b/board/batocera/allwinner/h5/patches/ppsspp/002-force-gles20-lima.patch similarity index 100% rename from board/allwinner/h5/patches/ppsspp/002-force-gles20-lima.patch rename to board/batocera/allwinner/h5/patches/ppsspp/002-force-gles20-lima.patch diff --git a/board/allwinner/h5/tritium-h5/boot/extlinux.conf b/board/batocera/allwinner/h5/tritium-h5/boot/extlinux.conf similarity index 100% rename from board/allwinner/h5/tritium-h5/boot/extlinux.conf rename to board/batocera/allwinner/h5/tritium-h5/boot/extlinux.conf diff --git a/board/allwinner/h5/tritium-h5/create-boot-script.sh b/board/batocera/allwinner/h5/tritium-h5/create-boot-script.sh similarity index 100% rename from board/allwinner/h5/tritium-h5/create-boot-script.sh rename to board/batocera/allwinner/h5/tritium-h5/create-boot-script.sh diff --git a/board/allwinner/h5/tritium-h5/genimage.cfg b/board/batocera/allwinner/h5/tritium-h5/genimage.cfg similarity index 100% rename from board/allwinner/h5/tritium-h5/genimage.cfg rename to board/batocera/allwinner/h5/tritium-h5/genimage.cfg diff --git a/board/allwinner/h6/fsoverlay/etc/modules.conf b/board/batocera/allwinner/h6/fsoverlay/etc/modules.conf similarity index 100% rename from board/allwinner/h6/fsoverlay/etc/modules.conf rename to board/batocera/allwinner/h6/fsoverlay/etc/modules.conf diff --git a/board/allwinner/h6/fsoverlay/usr/bin/cputemp b/board/batocera/allwinner/h6/fsoverlay/usr/bin/cputemp similarity index 100% rename from board/allwinner/h6/fsoverlay/usr/bin/cputemp rename to board/batocera/allwinner/h6/fsoverlay/usr/bin/cputemp diff --git a/board/allwinner/h6/fsoverlay/usr/bin/gputemp b/board/batocera/allwinner/h6/fsoverlay/usr/bin/gputemp similarity index 100% rename from board/allwinner/h6/fsoverlay/usr/bin/gputemp rename to board/batocera/allwinner/h6/fsoverlay/usr/bin/gputemp diff --git a/board/allwinner/h6/fsoverlay/usr/bin/hciattach_opi b/board/batocera/allwinner/h6/fsoverlay/usr/bin/hciattach_opi similarity index 100% rename from board/allwinner/h6/fsoverlay/usr/bin/hciattach_opi rename to board/batocera/allwinner/h6/fsoverlay/usr/bin/hciattach_opi diff --git a/board/allwinner/h6/fsoverlay/usr/bin/install2emmc b/board/batocera/allwinner/h6/fsoverlay/usr/bin/install2emmc similarity index 100% rename from board/allwinner/h6/fsoverlay/usr/bin/install2emmc rename to board/batocera/allwinner/h6/fsoverlay/usr/bin/install2emmc diff --git a/board/allwinner/h6/fsoverlay/usr/share/alsa/cards/H3_Audio_Codec.conf b/board/batocera/allwinner/h6/fsoverlay/usr/share/alsa/cards/H3_Audio_Codec.conf similarity index 100% rename from board/allwinner/h6/fsoverlay/usr/share/alsa/cards/H3_Audio_Codec.conf rename to board/batocera/allwinner/h6/fsoverlay/usr/share/alsa/cards/H3_Audio_Codec.conf diff --git a/board/allwinner/h6/fsoverlay/usr/share/alsa/cards/simple-card.conf b/board/batocera/allwinner/h6/fsoverlay/usr/share/alsa/cards/simple-card.conf similarity index 100% rename from board/allwinner/h6/fsoverlay/usr/share/alsa/cards/simple-card.conf rename to board/batocera/allwinner/h6/fsoverlay/usr/share/alsa/cards/simple-card.conf diff --git a/board/allwinner/h6/fsoverlay/usr/share/alsa/cards/sun50i-a64-audi.conf b/board/batocera/allwinner/h6/fsoverlay/usr/share/alsa/cards/sun50i-a64-audi.conf similarity index 100% rename from board/allwinner/h6/fsoverlay/usr/share/alsa/cards/sun50i-a64-audi.conf rename to board/batocera/allwinner/h6/fsoverlay/usr/share/alsa/cards/sun50i-a64-audi.conf diff --git a/board/allwinner/h6/orangepi-3-lts/boot/extlinux.conf b/board/batocera/allwinner/h6/orangepi-3-lts/boot/extlinux.conf similarity index 100% rename from board/allwinner/h6/orangepi-3-lts/boot/extlinux.conf rename to board/batocera/allwinner/h6/orangepi-3-lts/boot/extlinux.conf diff --git a/board/allwinner/h6/orangepi-3-lts/create-boot-script.sh b/board/batocera/allwinner/h6/orangepi-3-lts/create-boot-script.sh similarity index 100% rename from board/allwinner/h6/orangepi-3-lts/create-boot-script.sh rename to board/batocera/allwinner/h6/orangepi-3-lts/create-boot-script.sh diff --git a/board/allwinner/h6/orangepi-3-lts/genimage.cfg b/board/batocera/allwinner/h6/orangepi-3-lts/genimage.cfg similarity index 100% rename from board/allwinner/h6/orangepi-3-lts/genimage.cfg rename to board/batocera/allwinner/h6/orangepi-3-lts/genimage.cfg diff --git a/board/allwinner/h6/orangepi-3/boot/extlinux.conf b/board/batocera/allwinner/h6/orangepi-3/boot/extlinux.conf similarity index 100% rename from board/allwinner/h6/orangepi-3/boot/extlinux.conf rename to board/batocera/allwinner/h6/orangepi-3/boot/extlinux.conf diff --git a/board/allwinner/h6/orangepi-3/create-boot-script.sh b/board/batocera/allwinner/h6/orangepi-3/create-boot-script.sh similarity index 100% rename from board/allwinner/h6/orangepi-3/create-boot-script.sh rename to board/batocera/allwinner/h6/orangepi-3/create-boot-script.sh diff --git a/board/allwinner/h6/orangepi-3/genimage.cfg b/board/batocera/allwinner/h6/orangepi-3/genimage.cfg similarity index 100% rename from board/allwinner/h6/orangepi-3/genimage.cfg rename to board/batocera/allwinner/h6/orangepi-3/genimage.cfg diff --git a/board/allwinner/h6/orangepi-one-plus/boot/extlinux.conf b/board/batocera/allwinner/h6/orangepi-one-plus/boot/extlinux.conf similarity index 100% rename from board/allwinner/h6/orangepi-one-plus/boot/extlinux.conf rename to board/batocera/allwinner/h6/orangepi-one-plus/boot/extlinux.conf diff --git a/board/allwinner/h6/orangepi-one-plus/create-boot-script.sh b/board/batocera/allwinner/h6/orangepi-one-plus/create-boot-script.sh similarity index 100% rename from board/allwinner/h6/orangepi-one-plus/create-boot-script.sh rename to board/batocera/allwinner/h6/orangepi-one-plus/create-boot-script.sh diff --git a/board/allwinner/h6/orangepi-one-plus/genimage.cfg b/board/batocera/allwinner/h6/orangepi-one-plus/genimage.cfg similarity index 100% rename from board/allwinner/h6/orangepi-one-plus/genimage.cfg rename to board/batocera/allwinner/h6/orangepi-one-plus/genimage.cfg diff --git a/board/allwinner/h6/patches/ppsspp/001-eglx11.patch b/board/batocera/allwinner/h6/patches/ppsspp/001-eglx11.patch similarity index 100% rename from board/allwinner/h6/patches/ppsspp/001-eglx11.patch rename to board/batocera/allwinner/h6/patches/ppsspp/001-eglx11.patch diff --git a/board/allwinner/h616/anbernic-rg35xx/boot/extlinux.conf b/board/batocera/allwinner/h616/anbernic-rg35xx/boot/extlinux.conf similarity index 100% rename from board/allwinner/h616/anbernic-rg35xx/boot/extlinux.conf rename to board/batocera/allwinner/h616/anbernic-rg35xx/boot/extlinux.conf diff --git a/board/allwinner/h616/anbernic-rg35xx/build-uboot.sh b/board/batocera/allwinner/h616/anbernic-rg35xx/build-uboot.sh similarity index 100% rename from board/allwinner/h616/anbernic-rg35xx/build-uboot.sh rename to board/batocera/allwinner/h616/anbernic-rg35xx/build-uboot.sh diff --git a/board/allwinner/h616/anbernic-rg35xx/create-boot-script.sh b/board/batocera/allwinner/h616/anbernic-rg35xx/create-boot-script.sh similarity index 100% rename from board/allwinner/h616/anbernic-rg35xx/create-boot-script.sh rename to board/batocera/allwinner/h616/anbernic-rg35xx/create-boot-script.sh diff --git a/board/allwinner/h616/anbernic-rg35xx/genimage.cfg b/board/batocera/allwinner/h616/anbernic-rg35xx/genimage.cfg similarity index 100% rename from board/allwinner/h616/anbernic-rg35xx/genimage.cfg rename to board/batocera/allwinner/h616/anbernic-rg35xx/genimage.cfg diff --git a/board/allwinner/h616/bananapi-m4-berry/boot/extlinux.conf b/board/batocera/allwinner/h616/bananapi-m4-berry/boot/extlinux.conf similarity index 100% rename from board/allwinner/h616/bananapi-m4-berry/boot/extlinux.conf rename to board/batocera/allwinner/h616/bananapi-m4-berry/boot/extlinux.conf diff --git a/board/allwinner/h616/bananapi-m4-berry/create-boot-script.sh b/board/batocera/allwinner/h616/bananapi-m4-berry/create-boot-script.sh similarity index 100% rename from board/allwinner/h616/bananapi-m4-berry/create-boot-script.sh rename to board/batocera/allwinner/h616/bananapi-m4-berry/create-boot-script.sh diff --git a/board/allwinner/h616/bananapi-m4-berry/genimage.cfg b/board/batocera/allwinner/h616/bananapi-m4-berry/genimage.cfg similarity index 100% rename from board/allwinner/h616/bananapi-m4-berry/genimage.cfg rename to board/batocera/allwinner/h616/bananapi-m4-berry/genimage.cfg diff --git a/board/allwinner/h616/dts/sun50i-h616-mangopi-mqquad.dts b/board/batocera/allwinner/h616/dts/sun50i-h616-mangopi-mqquad.dts similarity index 100% rename from board/allwinner/h616/dts/sun50i-h616-mangopi-mqquad.dts rename to board/batocera/allwinner/h616/dts/sun50i-h616-mangopi-mqquad.dts diff --git a/board/allwinner/h616/dts/sun50i-h618-bananapi-m4berry.dts b/board/batocera/allwinner/h616/dts/sun50i-h618-bananapi-m4berry.dts similarity index 100% rename from board/allwinner/h616/dts/sun50i-h618-bananapi-m4berry.dts rename to board/batocera/allwinner/h616/dts/sun50i-h618-bananapi-m4berry.dts diff --git a/board/allwinner/h616/dts/sun50i-h618-bananapi-m4zero.dts b/board/batocera/allwinner/h616/dts/sun50i-h618-bananapi-m4zero.dts similarity index 100% rename from board/allwinner/h616/dts/sun50i-h618-bananapi-m4zero.dts rename to board/batocera/allwinner/h616/dts/sun50i-h618-bananapi-m4zero.dts diff --git a/board/allwinner/h616/dts/sun50i-h618-orangepi-zero2w.dts b/board/batocera/allwinner/h616/dts/sun50i-h618-orangepi-zero2w.dts similarity index 100% rename from board/allwinner/h616/dts/sun50i-h618-orangepi-zero2w.dts rename to board/batocera/allwinner/h616/dts/sun50i-h618-orangepi-zero2w.dts diff --git a/board/allwinner/h616/dts/sun50i-h700-anbernic-rg35xx-2024.dts b/board/batocera/allwinner/h616/dts/sun50i-h700-anbernic-rg35xx-2024.dts similarity index 100% rename from board/allwinner/h616/dts/sun50i-h700-anbernic-rg35xx-2024.dts rename to board/batocera/allwinner/h616/dts/sun50i-h700-anbernic-rg35xx-2024.dts diff --git a/board/allwinner/h616/dts/sun50i-h700-anbernic-rg35xx-h.dts b/board/batocera/allwinner/h616/dts/sun50i-h700-anbernic-rg35xx-h.dts similarity index 100% rename from board/allwinner/h616/dts/sun50i-h700-anbernic-rg35xx-h.dts rename to board/batocera/allwinner/h616/dts/sun50i-h700-anbernic-rg35xx-h.dts diff --git a/board/allwinner/h616/dts/sun50i-h700-anbernic-rg35xx-plus.dts b/board/batocera/allwinner/h616/dts/sun50i-h700-anbernic-rg35xx-plus.dts similarity index 100% rename from board/allwinner/h616/dts/sun50i-h700-anbernic-rg35xx-plus.dts rename to board/batocera/allwinner/h616/dts/sun50i-h700-anbernic-rg35xx-plus.dts diff --git a/board/allwinner/h616/fsoverlay/etc/modules.conf b/board/batocera/allwinner/h616/fsoverlay/etc/modules.conf similarity index 100% rename from board/allwinner/h616/fsoverlay/etc/modules.conf rename to board/batocera/allwinner/h616/fsoverlay/etc/modules.conf diff --git a/board/allwinner/h616/fsoverlay/usr/bin/cputemp b/board/batocera/allwinner/h616/fsoverlay/usr/bin/cputemp similarity index 100% rename from board/allwinner/h616/fsoverlay/usr/bin/cputemp rename to board/batocera/allwinner/h616/fsoverlay/usr/bin/cputemp diff --git a/board/allwinner/h616/fsoverlay/usr/bin/gputemp b/board/batocera/allwinner/h616/fsoverlay/usr/bin/gputemp similarity index 100% rename from board/allwinner/h616/fsoverlay/usr/bin/gputemp rename to board/batocera/allwinner/h616/fsoverlay/usr/bin/gputemp diff --git a/board/allwinner/h616/fsoverlay/usr/bin/hciattach_opi b/board/batocera/allwinner/h616/fsoverlay/usr/bin/hciattach_opi similarity index 100% rename from board/allwinner/h616/fsoverlay/usr/bin/hciattach_opi rename to board/batocera/allwinner/h616/fsoverlay/usr/bin/hciattach_opi diff --git a/board/allwinner/h616/linux-defconfig-fragment.config b/board/batocera/allwinner/h616/linux-defconfig-fragment.config similarity index 100% rename from board/allwinner/h616/linux-defconfig-fragment.config rename to board/batocera/allwinner/h616/linux-defconfig-fragment.config diff --git a/board/allwinner/h616/linux-sunxi64-current.config b/board/batocera/allwinner/h616/linux-sunxi64-current.config similarity index 100% rename from board/allwinner/h616/linux-sunxi64-current.config rename to board/batocera/allwinner/h616/linux-sunxi64-current.config diff --git a/board/allwinner/h616/linux_patches/000-uwe5622-allwinner-v6.3.patch b/board/batocera/allwinner/h616/linux_patches/000-uwe5622-allwinner-v6.3.patch similarity index 100% rename from board/allwinner/h616/linux_patches/000-uwe5622-allwinner-v6.3.patch rename to board/batocera/allwinner/h616/linux_patches/000-uwe5622-allwinner-v6.3.patch diff --git a/board/allwinner/h616/linux_patches/001-uwe5622-allwinner-bugfix-v6.3.patch b/board/batocera/allwinner/h616/linux_patches/001-uwe5622-allwinner-bugfix-v6.3.patch similarity index 100% rename from board/allwinner/h616/linux_patches/001-uwe5622-allwinner-bugfix-v6.3.patch rename to board/batocera/allwinner/h616/linux_patches/001-uwe5622-allwinner-bugfix-v6.3.patch diff --git a/board/allwinner/h616/linux_patches/002-uwe5622-allwinner-v6.3-compilation-fix.patch b/board/batocera/allwinner/h616/linux_patches/002-uwe5622-allwinner-v6.3-compilation-fix.patch similarity index 100% rename from board/allwinner/h616/linux_patches/002-uwe5622-allwinner-v6.3-compilation-fix.patch rename to board/batocera/allwinner/h616/linux_patches/002-uwe5622-allwinner-v6.3-compilation-fix.patch diff --git a/board/allwinner/h616/linux_patches/003-uwe5622-v6.4-post.patch b/board/batocera/allwinner/h616/linux_patches/003-uwe5622-v6.4-post.patch similarity index 100% rename from board/allwinner/h616/linux_patches/003-uwe5622-v6.4-post.patch rename to board/batocera/allwinner/h616/linux_patches/003-uwe5622-v6.4-post.patch diff --git a/board/allwinner/h616/linux_patches/004-uwe5622-warnings.patch b/board/batocera/allwinner/h616/linux_patches/004-uwe5622-warnings.patch similarity index 100% rename from board/allwinner/h616/linux_patches/004-uwe5622-warnings.patch rename to board/batocera/allwinner/h616/linux_patches/004-uwe5622-warnings.patch diff --git a/board/allwinner/h616/linux_patches/005-uwe5622-park-link-v6.1-post.patch b/board/batocera/allwinner/h616/linux_patches/005-uwe5622-park-link-v6.1-post.patch similarity index 100% rename from board/allwinner/h616/linux_patches/005-uwe5622-park-link-v6.1-post.patch rename to board/batocera/allwinner/h616/linux_patches/005-uwe5622-park-link-v6.1-post.patch diff --git a/board/allwinner/h616/linux_patches/006-uwe5622-v6.1.patch b/board/batocera/allwinner/h616/linux_patches/006-uwe5622-v6.1.patch similarity index 100% rename from board/allwinner/h616/linux_patches/006-uwe5622-v6.1.patch rename to board/batocera/allwinner/h616/linux_patches/006-uwe5622-v6.1.patch diff --git a/board/allwinner/h616/linux_patches/007-uwe5622-v6.6-fix-tty-sdio.patch b/board/batocera/allwinner/h616/linux_patches/007-uwe5622-v6.6-fix-tty-sdio.patch similarity index 100% rename from board/allwinner/h616/linux_patches/007-uwe5622-v6.6-fix-tty-sdio.patch rename to board/batocera/allwinner/h616/linux_patches/007-uwe5622-v6.6-fix-tty-sdio.patch diff --git a/board/allwinner/h616/linux_patches/008-uwe5622-fix-setting-mac-address-for-netdev.patch b/board/batocera/allwinner/h616/linux_patches/008-uwe5622-fix-setting-mac-address-for-netdev.patch similarity index 100% rename from board/allwinner/h616/linux_patches/008-uwe5622-fix-setting-mac-address-for-netdev.patch rename to board/batocera/allwinner/h616/linux_patches/008-uwe5622-fix-setting-mac-address-for-netdev.patch diff --git a/board/allwinner/h616/linux_patches/009-wireless-uwe5622-Fix-compilation-with-6.7-kernel.patch b/board/batocera/allwinner/h616/linux_patches/009-wireless-uwe5622-Fix-compilation-with-6.7-kernel.patch similarity index 100% rename from board/allwinner/h616/linux_patches/009-wireless-uwe5622-Fix-compilation-with-6.7-kernel.patch rename to board/batocera/allwinner/h616/linux_patches/009-wireless-uwe5622-Fix-compilation-with-6.7-kernel.patch diff --git a/board/allwinner/h616/linux_patches/010-wireless-uwe5622-reduce-system-load.patch b/board/batocera/allwinner/h616/linux_patches/010-wireless-uwe5622-reduce-system-load.patch similarity index 100% rename from board/allwinner/h616/linux_patches/010-wireless-uwe5622-reduce-system-load.patch rename to board/batocera/allwinner/h616/linux_patches/010-wireless-uwe5622-reduce-system-load.patch diff --git a/board/allwinner/h616/linux_patches/011-Add-sunxi-addr-driver-Used-to-fix-uwe5622-bluetooth-MAC-address.patch b/board/batocera/allwinner/h616/linux_patches/011-Add-sunxi-addr-driver-Used-to-fix-uwe5622-bluetooth-MAC-address.patch similarity index 100% rename from board/allwinner/h616/linux_patches/011-Add-sunxi-addr-driver-Used-to-fix-uwe5622-bluetooth-MAC-address.patch rename to board/batocera/allwinner/h616/linux_patches/011-Add-sunxi-addr-driver-Used-to-fix-uwe5622-bluetooth-MAC-address.patch diff --git a/board/allwinner/h616/linux_patches/012-add-uwe5622-makefile.patch b/board/batocera/allwinner/h616/linux_patches/012-add-uwe5622-makefile.patch similarity index 100% rename from board/allwinner/h616/linux_patches/012-add-uwe5622-makefile.patch rename to board/batocera/allwinner/h616/linux_patches/012-add-uwe5622-makefile.patch diff --git a/board/allwinner/h616/linux_patches/013-update-sun50i-h616.dtsi-6_9.patch b/board/batocera/allwinner/h616/linux_patches/013-update-sun50i-h616.dtsi-6_9.patch similarity index 100% rename from board/allwinner/h616/linux_patches/013-update-sun50i-h616.dtsi-6_9.patch rename to board/batocera/allwinner/h616/linux_patches/013-update-sun50i-h616.dtsi-6_9.patch diff --git a/board/allwinner/h616/linux_patches/014-v5-1-8-firmware-smccc-Export-revision-soc_id-function.patch b/board/batocera/allwinner/h616/linux_patches/014-v5-1-8-firmware-smccc-Export-revision-soc_id-function.patch similarity index 100% rename from board/allwinner/h616/linux_patches/014-v5-1-8-firmware-smccc-Export-revision-soc_id-function.patch rename to board/batocera/allwinner/h616/linux_patches/014-v5-1-8-firmware-smccc-Export-revision-soc_id-function.patch diff --git a/board/allwinner/h616/linux_patches/015-v5-2-8-cpufreq-dt-platdev-Blocklist-Allwinner-H616-618-SoCs.patch b/board/batocera/allwinner/h616/linux_patches/015-v5-2-8-cpufreq-dt-platdev-Blocklist-Allwinner-H616-618-SoCs.patch similarity index 100% rename from board/allwinner/h616/linux_patches/015-v5-2-8-cpufreq-dt-platdev-Blocklist-Allwinner-H616-618-SoCs.patch rename to board/batocera/allwinner/h616/linux_patches/015-v5-2-8-cpufreq-dt-platdev-Blocklist-Allwinner-H616-618-SoCs.patch diff --git a/board/allwinner/h616/linux_patches/016-v5-3-8-dt-bindings-opp-Describe-H616-OPPs-and-opp-supported-hw.patch b/board/batocera/allwinner/h616/linux_patches/016-v5-3-8-dt-bindings-opp-Describe-H616-OPPs-and-opp-supported-hw.patch similarity index 100% rename from board/allwinner/h616/linux_patches/016-v5-3-8-dt-bindings-opp-Describe-H616-OPPs-and-opp-supported-hw.patch rename to board/batocera/allwinner/h616/linux_patches/016-v5-3-8-dt-bindings-opp-Describe-H616-OPPs-and-opp-supported-hw.patch diff --git a/board/allwinner/h616/linux_patches/017-v5-4-8-cpufreq-sun50i-Refactor-speed-bin-decoding.patch b/board/batocera/allwinner/h616/linux_patches/017-v5-4-8-cpufreq-sun50i-Refactor-speed-bin-decoding.patch similarity index 100% rename from board/allwinner/h616/linux_patches/017-v5-4-8-cpufreq-sun50i-Refactor-speed-bin-decoding.patch rename to board/batocera/allwinner/h616/linux_patches/017-v5-4-8-cpufreq-sun50i-Refactor-speed-bin-decoding.patch diff --git a/board/allwinner/h616/linux_patches/018-v5-5-8-cpufreq-sun50i-Add-support-for-opp_supported_hw.patch b/board/batocera/allwinner/h616/linux_patches/018-v5-5-8-cpufreq-sun50i-Add-support-for-opp_supported_hw.patch similarity index 100% rename from board/allwinner/h616/linux_patches/018-v5-5-8-cpufreq-sun50i-Add-support-for-opp_supported_hw.patch rename to board/batocera/allwinner/h616/linux_patches/018-v5-5-8-cpufreq-sun50i-Add-support-for-opp_supported_hw.patch diff --git a/board/allwinner/h616/linux_patches/019-v5-6-8-cpufreq-sun50i-Add-H616-support.patch b/board/batocera/allwinner/h616/linux_patches/019-v5-6-8-cpufreq-sun50i-Add-H616-support.patch similarity index 100% rename from board/allwinner/h616/linux_patches/019-v5-6-8-cpufreq-sun50i-Add-H616-support.patch rename to board/batocera/allwinner/h616/linux_patches/019-v5-6-8-cpufreq-sun50i-Add-H616-support.patch diff --git a/board/allwinner/h616/linux_patches/020-v5-7-8-arm64-dts-allwinner-h616-Add-CPU-OPPs-table.patch b/board/batocera/allwinner/h616/linux_patches/020-v5-7-8-arm64-dts-allwinner-h616-Add-CPU-OPPs-table.patch similarity index 100% rename from board/allwinner/h616/linux_patches/020-v5-7-8-arm64-dts-allwinner-h616-Add-CPU-OPPs-table.patch rename to board/batocera/allwinner/h616/linux_patches/020-v5-7-8-arm64-dts-allwinner-h616-Add-CPU-OPPs-table.patch diff --git a/board/allwinner/h616/linux_patches/021-v5-8-8-arm64-dts-allwinner-h616-enable-DVFS-for-all-boards.patch b/board/batocera/allwinner/h616/linux_patches/021-v5-8-8-arm64-dts-allwinner-h616-enable-DVFS-for-all-boards.patch similarity index 100% rename from board/allwinner/h616/linux_patches/021-v5-8-8-arm64-dts-allwinner-h616-enable-DVFS-for-all-boards.patch rename to board/batocera/allwinner/h616/linux_patches/021-v5-8-8-arm64-dts-allwinner-h616-enable-DVFS-for-all-boards.patch diff --git a/board/allwinner/h616/linux_patches/022-v2-1-2-dt-bindings-input-sun4i-lradc-keys-Add-H616-compatible.patch b/board/batocera/allwinner/h616/linux_patches/022-v2-1-2-dt-bindings-input-sun4i-lradc-keys-Add-H616-compatible.patch similarity index 100% rename from board/allwinner/h616/linux_patches/022-v2-1-2-dt-bindings-input-sun4i-lradc-keys-Add-H616-compatible.patch rename to board/batocera/allwinner/h616/linux_patches/022-v2-1-2-dt-bindings-input-sun4i-lradc-keys-Add-H616-compatible.patch diff --git a/board/allwinner/h616/linux_patches/023-v2-2-2-ARM-dts-sun50i-Add-LRADC-node.patch b/board/batocera/allwinner/h616/linux_patches/023-v2-2-2-ARM-dts-sun50i-Add-LRADC-node.patch similarity index 100% rename from board/allwinner/h616/linux_patches/023-v2-2-2-ARM-dts-sun50i-Add-LRADC-node.patch rename to board/batocera/allwinner/h616/linux_patches/023-v2-2-2-ARM-dts-sun50i-Add-LRADC-node.patch diff --git a/board/allwinner/h616/linux_patches/024-v2-arm64-dts-allwinner-Add-cache-information-to-the-SoC-dtsi-for-H616.patch b/board/batocera/allwinner/h616/linux_patches/024-v2-arm64-dts-allwinner-Add-cache-information-to-the-SoC-dtsi-for-H616.patch similarity index 100% rename from board/allwinner/h616/linux_patches/024-v2-arm64-dts-allwinner-Add-cache-information-to-the-SoC-dtsi-for-H616.patch rename to board/batocera/allwinner/h616/linux_patches/024-v2-arm64-dts-allwinner-Add-cache-information-to-the-SoC-dtsi-for-H616.patch diff --git a/board/allwinner/h616/linux_patches/025-arm64-dts-allwinner-sun50i-h616-Add-GPU-node.patch b/board/batocera/allwinner/h616/linux_patches/025-arm64-dts-allwinner-sun50i-h616-Add-GPU-node.patch similarity index 100% rename from board/allwinner/h616/linux_patches/025-arm64-dts-allwinner-sun50i-h616-Add-GPU-node.patch rename to board/batocera/allwinner/h616/linux_patches/025-arm64-dts-allwinner-sun50i-h616-Add-GPU-node.patch diff --git a/board/allwinner/h616/linux_patches/026-arm64-dts-h616-add-hdmi-support-for-zero2-and-zero3.patch b/board/batocera/allwinner/h616/linux_patches/026-arm64-dts-h616-add-hdmi-support-for-zero2-and-zero3.patch similarity index 100% rename from board/allwinner/h616/linux_patches/026-arm64-dts-h616-add-hdmi-support-for-zero2-and-zero3.patch rename to board/batocera/allwinner/h616/linux_patches/026-arm64-dts-h616-add-hdmi-support-for-zero2-and-zero3.patch diff --git a/board/allwinner/h616/linux_patches/027-arm64-dts-allwinner-sun50i-h616-Add-VPU-node.patch b/board/batocera/allwinner/h616/linux_patches/027-arm64-dts-allwinner-sun50i-h616-Add-VPU-node.patch similarity index 100% rename from board/allwinner/h616/linux_patches/027-arm64-dts-allwinner-sun50i-h616-Add-VPU-node.patch rename to board/batocera/allwinner/h616/linux_patches/027-arm64-dts-allwinner-sun50i-h616-Add-VPU-node.patch diff --git a/board/allwinner/h616/linux_patches/028-arm64-dts-sun50i-h616-orangepi-zero2-Enable-GPU-mali.patch b/board/batocera/allwinner/h616/linux_patches/028-arm64-dts-sun50i-h616-orangepi-zero2-Enable-GPU-mali.patch similarity index 100% rename from board/allwinner/h616/linux_patches/028-arm64-dts-sun50i-h616-orangepi-zero2-Enable-GPU-mali.patch rename to board/batocera/allwinner/h616/linux_patches/028-arm64-dts-sun50i-h616-orangepi-zero2-Enable-GPU-mali.patch diff --git a/board/allwinner/h616/linux_patches/029-drm-sun4i-Add-more-parameters-to-sunxi_engine-commit-callback.patch b/board/batocera/allwinner/h616/linux_patches/029-drm-sun4i-Add-more-parameters-to-sunxi_engine-commit-callback.patch similarity index 100% rename from board/allwinner/h616/linux_patches/029-drm-sun4i-Add-more-parameters-to-sunxi_engine-commit-callback.patch rename to board/batocera/allwinner/h616/linux_patches/029-drm-sun4i-Add-more-parameters-to-sunxi_engine-commit-callback.patch diff --git a/board/allwinner/h616/linux_patches/030-drm-sun4i-Unify-sun8i_-_layer-structs.patch b/board/batocera/allwinner/h616/linux_patches/030-drm-sun4i-Unify-sun8i_-_layer-structs.patch similarity index 100% rename from board/allwinner/h616/linux_patches/030-drm-sun4i-Unify-sun8i_-_layer-structs.patch rename to board/batocera/allwinner/h616/linux_patches/030-drm-sun4i-Unify-sun8i_-_layer-structs.patch diff --git a/board/allwinner/h616/linux_patches/031-drm-sun4i-Fix-layer-zpos-change-atomic-modesetting.patch b/board/batocera/allwinner/h616/linux_patches/031-drm-sun4i-Fix-layer-zpos-change-atomic-modesetting.patch similarity index 100% rename from board/allwinner/h616/linux_patches/031-drm-sun4i-Fix-layer-zpos-change-atomic-modesetting.patch rename to board/batocera/allwinner/h616/linux_patches/031-drm-sun4i-Fix-layer-zpos-change-atomic-modesetting.patch diff --git a/board/allwinner/h616/linux_patches/032-drm-sun4i-Implement-gamma-correction.patch b/board/batocera/allwinner/h616/linux_patches/032-drm-sun4i-Implement-gamma-correction.patch similarity index 100% rename from board/allwinner/h616/linux_patches/032-drm-sun4i-Implement-gamma-correction.patch rename to board/batocera/allwinner/h616/linux_patches/032-drm-sun4i-Implement-gamma-correction.patch diff --git a/board/allwinner/h616/linux_patches/033-drm-sun4i-Support-taking-over-display-pipeline-state-from-p-boo.patch b/board/batocera/allwinner/h616/linux_patches/033-drm-sun4i-Support-taking-over-display-pipeline-state-from-p-boo.patch similarity index 100% rename from board/allwinner/h616/linux_patches/033-drm-sun4i-Support-taking-over-display-pipeline-state-from-p-boo.patch rename to board/batocera/allwinner/h616/linux_patches/033-drm-sun4i-Support-taking-over-display-pipeline-state-from-p-boo.patch diff --git a/board/allwinner/h616/linux_patches/034-drivers-hack-for-h616-hdmi-video-output.patch b/board/batocera/allwinner/h616/linux_patches/034-drivers-hack-for-h616-hdmi-video-output.patch similarity index 100% rename from board/allwinner/h616/linux_patches/034-drivers-hack-for-h616-hdmi-video-output.patch rename to board/batocera/allwinner/h616/linux_patches/034-drivers-hack-for-h616-hdmi-video-output.patch diff --git a/board/allwinner/h616/linux_patches/035-arm64-dts-allwinner-h616-LED-green_power_on-red_status_heartbeat.patch b/board/batocera/allwinner/h616/linux_patches/035-arm64-dts-allwinner-h616-LED-green_power_on-red_status_heartbeat.patch similarity index 100% rename from board/allwinner/h616/linux_patches/035-arm64-dts-allwinner-h616-LED-green_power_on-red_status_heartbeat.patch rename to board/batocera/allwinner/h616/linux_patches/035-arm64-dts-allwinner-h616-LED-green_power_on-red_status_heartbeat.patch diff --git a/board/allwinner/h616/linux_patches/036-Add-dump_reg-and-sunxi-sysinfo-drivers.patch b/board/batocera/allwinner/h616/linux_patches/036-Add-dump_reg-and-sunxi-sysinfo-drivers.patch similarity index 100% rename from board/allwinner/h616/linux_patches/036-Add-dump_reg-and-sunxi-sysinfo-drivers.patch rename to board/batocera/allwinner/h616/linux_patches/036-Add-dump_reg-and-sunxi-sysinfo-drivers.patch diff --git a/board/allwinner/h616/linux_patches/037-add-nodes-for-sunxi-info-addr-dump-reg.patch b/board/batocera/allwinner/h616/linux_patches/037-add-nodes-for-sunxi-info-addr-dump-reg.patch similarity index 100% rename from board/allwinner/h616/linux_patches/037-add-nodes-for-sunxi-info-addr-dump-reg.patch rename to board/batocera/allwinner/h616/linux_patches/037-add-nodes-for-sunxi-info-addr-dump-reg.patch diff --git a/board/allwinner/h616/linux_patches/038-dt-bindings-thermal-sun8i-Add-H616-THS-controller.patch b/board/batocera/allwinner/h616/linux_patches/038-dt-bindings-thermal-sun8i-Add-H616-THS-controller.patch similarity index 100% rename from board/allwinner/h616/linux_patches/038-dt-bindings-thermal-sun8i-Add-H616-THS-controller.patch rename to board/batocera/allwinner/h616/linux_patches/038-dt-bindings-thermal-sun8i-Add-H616-THS-controller.patch diff --git a/board/allwinner/h616/linux_patches/039-nvmem-sunxi_sid-add-sunxi_get_soc_chipid-sunxi_get_serial.patch b/board/batocera/allwinner/h616/linux_patches/039-nvmem-sunxi_sid-add-sunxi_get_soc_chipid-sunxi_get_serial.patch similarity index 100% rename from board/allwinner/h616/linux_patches/039-nvmem-sunxi_sid-add-sunxi_get_soc_chipid-sunxi_get_serial.patch rename to board/batocera/allwinner/h616/linux_patches/039-nvmem-sunxi_sid-add-sunxi_get_soc_chipid-sunxi_get_serial.patch diff --git a/board/allwinner/h616/linux_patches/040-arm64-dts-allwinner-h616-orangepi-zero2-Enable-expansion-board-USB-ports.patch b/board/batocera/allwinner/h616/linux_patches/040-arm64-dts-allwinner-h616-orangepi-zero2-Enable-expansion-board-USB-ports.patch similarity index 100% rename from board/allwinner/h616/linux_patches/040-arm64-dts-allwinner-h616-orangepi-zero2-Enable-expansion-board-USB-ports.patch rename to board/batocera/allwinner/h616/linux_patches/040-arm64-dts-allwinner-h616-orangepi-zero2-Enable-expansion-board-USB-ports.patch diff --git a/board/allwinner/h616/linux_patches/041-arm64-dts-allwiner-sun50i-h616.dtsi-add-usb-ehci-ohc.patch b/board/batocera/allwinner/h616/linux_patches/041-arm64-dts-allwiner-sun50i-h616.dtsi-add-usb-ehci-ohc.patch similarity index 100% rename from board/allwinner/h616/linux_patches/041-arm64-dts-allwiner-sun50i-h616.dtsi-add-usb-ehci-ohc.patch rename to board/batocera/allwinner/h616/linux_patches/041-arm64-dts-allwiner-sun50i-h616.dtsi-add-usb-ehci-ohc.patch diff --git a/board/allwinner/h616/linux_patches/042-arm64-dts-allwinner-sun50i-h616-PG-12c-pins.patch b/board/batocera/allwinner/h616/linux_patches/042-arm64-dts-allwinner-sun50i-h616-PG-12c-pins.patch similarity index 100% rename from board/allwinner/h616/linux_patches/042-arm64-dts-allwinner-sun50i-h616-PG-12c-pins.patch rename to board/batocera/allwinner/h616/linux_patches/042-arm64-dts-allwinner-sun50i-h616-PG-12c-pins.patch diff --git a/board/allwinner/h616/linux_patches/043-arm64-dts-allwinner-sun50i-h616-spi1-cs1-pin.patch b/board/batocera/allwinner/h616/linux_patches/043-arm64-dts-allwinner-sun50i-h616-spi1-cs1-pin.patch similarity index 100% rename from board/allwinner/h616/linux_patches/043-arm64-dts-allwinner-sun50i-h616-spi1-cs1-pin.patch rename to board/batocera/allwinner/h616/linux_patches/043-arm64-dts-allwinner-sun50i-h616-spi1-cs1-pin.patch diff --git a/board/allwinner/h616/linux_patches/044-arm64-dts-sun50i-h616-orangepi-zero2-reg_usb1_vbus-status-ok.patch b/board/batocera/allwinner/h616/linux_patches/044-arm64-dts-sun50i-h616-orangepi-zero2-reg_usb1_vbus-status-ok.patch similarity index 100% rename from board/allwinner/h616/linux_patches/044-arm64-dts-sun50i-h616-orangepi-zero2-reg_usb1_vbus-status-ok.patch rename to board/batocera/allwinner/h616/linux_patches/044-arm64-dts-sun50i-h616-orangepi-zero2-reg_usb1_vbus-status-ok.patch diff --git a/board/allwinner/h616/linux_patches/045-arm64-dts-sun50i-h616-x96-mate-add-hdmi.patch b/board/batocera/allwinner/h616/linux_patches/045-arm64-dts-sun50i-h616-x96-mate-add-hdmi.patch similarity index 100% rename from board/allwinner/h616/linux_patches/045-arm64-dts-sun50i-h616-x96-mate-add-hdmi.patch rename to board/batocera/allwinner/h616/linux_patches/045-arm64-dts-sun50i-h616-x96-mate-add-hdmi.patch diff --git a/board/allwinner/h616/linux_patches/046-arm64-dts-sun50i-h616-x96-mate-T95-eth-sd-card-hack.patch b/board/batocera/allwinner/h616/linux_patches/046-arm64-dts-sun50i-h616-x96-mate-T95-eth-sd-card-hack.patch similarity index 100% rename from board/allwinner/h616/linux_patches/046-arm64-dts-sun50i-h616-x96-mate-T95-eth-sd-card-hack.patch rename to board/batocera/allwinner/h616/linux_patches/046-arm64-dts-sun50i-h616-x96-mate-T95-eth-sd-card-hack.patch diff --git a/board/allwinner/h616/linux_patches/047-drv-staging-media-sunxi-cedrus-add-H616-variant.patch b/board/batocera/allwinner/h616/linux_patches/047-drv-staging-media-sunxi-cedrus-add-H616-variant.patch similarity index 100% rename from board/allwinner/h616/linux_patches/047-drv-staging-media-sunxi-cedrus-add-H616-variant.patch rename to board/batocera/allwinner/h616/linux_patches/047-drv-staging-media-sunxi-cedrus-add-H616-variant.patch diff --git a/board/allwinner/h616/linux_patches/048-drv-soc-sunxi-sram-Add-SRAM-C1-H616-handling.patch b/board/batocera/allwinner/h616/linux_patches/048-drv-soc-sunxi-sram-Add-SRAM-C1-H616-handling.patch similarity index 100% rename from board/allwinner/h616/linux_patches/048-drv-soc-sunxi-sram-Add-SRAM-C1-H616-handling.patch rename to board/batocera/allwinner/h616/linux_patches/048-drv-soc-sunxi-sram-Add-SRAM-C1-H616-handling.patch diff --git a/board/allwinner/h616/linux_patches/049-drv-rtc-sun6i-Add-Allwinner-H616-support.patch b/board/batocera/allwinner/h616/linux_patches/049-drv-rtc-sun6i-Add-Allwinner-H616-support.patch similarity index 100% rename from board/allwinner/h616/linux_patches/049-drv-rtc-sun6i-Add-Allwinner-H616-support.patch rename to board/batocera/allwinner/h616/linux_patches/049-drv-rtc-sun6i-Add-Allwinner-H616-support.patch diff --git a/board/allwinner/h616/linux_patches/050-drv-rtc-sun6i-support-RTCs-without-external-LOSCs.patch b/board/batocera/allwinner/h616/linux_patches/050-drv-rtc-sun6i-support-RTCs-without-external-LOSCs.patch similarity index 100% rename from board/allwinner/h616/linux_patches/050-drv-rtc-sun6i-support-RTCs-without-external-LOSCs.patch rename to board/batocera/allwinner/h616/linux_patches/050-drv-rtc-sun6i-support-RTCs-without-external-LOSCs.patch diff --git a/board/allwinner/h616/linux_patches/051-drv-nvmem-sunxi_sid-Support-SID-on-H616.patch b/board/batocera/allwinner/h616/linux_patches/051-drv-nvmem-sunxi_sid-Support-SID-on-H616.patch similarity index 100% rename from board/allwinner/h616/linux_patches/051-drv-nvmem-sunxi_sid-Support-SID-on-H616.patch rename to board/batocera/allwinner/h616/linux_patches/051-drv-nvmem-sunxi_sid-Support-SID-on-H616.patch diff --git a/board/allwinner/h616/linux_patches/052-drv-thermal-sun8i_thermal-Add-for-H616.patch b/board/batocera/allwinner/h616/linux_patches/052-drv-thermal-sun8i_thermal-Add-for-H616.patch similarity index 100% rename from board/allwinner/h616/linux_patches/052-drv-thermal-sun8i_thermal-Add-for-H616.patch rename to board/batocera/allwinner/h616/linux_patches/052-drv-thermal-sun8i_thermal-Add-for-H616.patch diff --git a/board/allwinner/h616/linux_patches/053-arm64-dts-h616-add-wifi-support-for-orange-pi-zero-2.patch b/board/batocera/allwinner/h616/linux_patches/053-arm64-dts-h616-add-wifi-support-for-orange-pi-zero-2.patch similarity index 100% rename from board/allwinner/h616/linux_patches/053-arm64-dts-h616-add-wifi-support-for-orange-pi-zero-2.patch rename to board/batocera/allwinner/h616/linux_patches/053-arm64-dts-h616-add-wifi-support-for-orange-pi-zero-2.patch diff --git a/board/allwinner/h616/linux_patches/054-h616-adding-sunxi_v2-sound.patch b/board/batocera/allwinner/h616/linux_patches/054-h616-adding-sunxi_v2-sound.patch similarity index 100% rename from board/allwinner/h616/linux_patches/054-h616-adding-sunxi_v2-sound.patch rename to board/batocera/allwinner/h616/linux_patches/054-h616-adding-sunxi_v2-sound.patch diff --git a/board/allwinner/h616/linux_patches/055-arm64-dts-allwinner-h616-Add-NMI-device-node.patch b/board/batocera/allwinner/h616/linux_patches/055-arm64-dts-allwinner-h616-Add-NMI-device-node.patch similarity index 100% rename from board/allwinner/h616/linux_patches/055-arm64-dts-allwinner-h616-Add-NMI-device-node.patch rename to board/batocera/allwinner/h616/linux_patches/055-arm64-dts-allwinner-h616-Add-NMI-device-node.patch diff --git a/board/allwinner/h616/linux_patches/056-arm64-dts-sun50i-h618-orangepi-zero3-Enable-GPU-mali.patch b/board/batocera/allwinner/h616/linux_patches/056-arm64-dts-sun50i-h618-orangepi-zero3-Enable-GPU-mali.patch similarity index 100% rename from board/allwinner/h616/linux_patches/056-arm64-dts-sun50i-h618-orangepi-zero3-Enable-GPU-mali.patch rename to board/batocera/allwinner/h616/linux_patches/056-arm64-dts-sun50i-h618-orangepi-zero3-Enable-GPU-mali.patch diff --git a/board/allwinner/h616/linux_patches/057-arm64-sun50i-h616-add-iommu.patch b/board/batocera/allwinner/h616/linux_patches/057-arm64-sun50i-h616-add-iommu.patch similarity index 100% rename from board/allwinner/h616/linux_patches/057-arm64-sun50i-h616-add-iommu.patch rename to board/batocera/allwinner/h616/linux_patches/057-arm64-sun50i-h616-add-iommu.patch diff --git a/board/allwinner/h616/linux_patches/058-rg35xx-regulator-axp20x-fix-typo-ed-identifier.patch b/board/batocera/allwinner/h616/linux_patches/058-rg35xx-regulator-axp20x-fix-typo-ed-identifier.patch similarity index 100% rename from board/allwinner/h616/linux_patches/058-rg35xx-regulator-axp20x-fix-typo-ed-identifier.patch rename to board/batocera/allwinner/h616/linux_patches/058-rg35xx-regulator-axp20x-fix-typo-ed-identifier.patch diff --git a/board/allwinner/h616/linux_patches/059-rg35xx-dt-bindings-mfd-x-powers-axp152-Document-AXP717.patch b/board/batocera/allwinner/h616/linux_patches/059-rg35xx-dt-bindings-mfd-x-powers-axp152-Document-AXP717.patch similarity index 100% rename from board/allwinner/h616/linux_patches/059-rg35xx-dt-bindings-mfd-x-powers-axp152-Document-AXP717.patch rename to board/batocera/allwinner/h616/linux_patches/059-rg35xx-dt-bindings-mfd-x-powers-axp152-Document-AXP717.patch diff --git a/board/allwinner/h616/linux_patches/060-rg35xx-mfd-axp20x-Add-support-for-AXP717-PMIC.patch b/board/batocera/allwinner/h616/linux_patches/060-rg35xx-mfd-axp20x-Add-support-for-AXP717-PMIC.patch similarity index 100% rename from board/allwinner/h616/linux_patches/060-rg35xx-mfd-axp20x-Add-support-for-AXP717-PMIC.patch rename to board/batocera/allwinner/h616/linux_patches/060-rg35xx-mfd-axp20x-Add-support-for-AXP717-PMIC.patch diff --git a/board/allwinner/h616/linux_patches/061-rg35xx-regulator-axp20x-add-support-for-the-AXP717.patch b/board/batocera/allwinner/h616/linux_patches/061-rg35xx-regulator-axp20x-add-support-for-the-AXP717.patch similarity index 100% rename from board/allwinner/h616/linux_patches/061-rg35xx-regulator-axp20x-add-support-for-the-AXP717.patch rename to board/batocera/allwinner/h616/linux_patches/061-rg35xx-regulator-axp20x-add-support-for-the-AXP717.patch diff --git a/board/allwinner/h616/linux_patches/062-rg35xx-dt-bindings-nvmem-SID-Add-binding-for-H616-SID-controller.patch b/board/batocera/allwinner/h616/linux_patches/062-rg35xx-dt-bindings-nvmem-SID-Add-binding-for-H616-SID-controller.patch similarity index 100% rename from board/allwinner/h616/linux_patches/062-rg35xx-dt-bindings-nvmem-SID-Add-binding-for-H616-SID-controller.patch rename to board/batocera/allwinner/h616/linux_patches/062-rg35xx-dt-bindings-nvmem-SID-Add-binding-for-H616-SID-controller.patch diff --git a/board/allwinner/h616/linux_patches/063-rg35xx-mfd-axp20x-AXP717-Fix-missing-IRQ-status-registers-r.patch b/board/batocera/allwinner/h616/linux_patches/063-rg35xx-mfd-axp20x-AXP717-Fix-missing-IRQ-status-registers-r.patch similarity index 100% rename from board/allwinner/h616/linux_patches/063-rg35xx-mfd-axp20x-AXP717-Fix-missing-IRQ-status-registers-r.patch rename to board/batocera/allwinner/h616/linux_patches/063-rg35xx-mfd-axp20x-AXP717-Fix-missing-IRQ-status-registers-r.patch diff --git a/board/allwinner/h616/linux_patches/064-rg35xx-regulator-axp20x-AXP717-fix-LDO-supply-rails-and-off.patch b/board/batocera/allwinner/h616/linux_patches/064-rg35xx-regulator-axp20x-AXP717-fix-LDO-supply-rails-and-off.patch similarity index 100% rename from board/allwinner/h616/linux_patches/064-rg35xx-regulator-axp20x-AXP717-fix-LDO-supply-rails-and-off.patch rename to board/batocera/allwinner/h616/linux_patches/064-rg35xx-regulator-axp20x-AXP717-fix-LDO-supply-rails-and-off.patch diff --git a/board/allwinner/h616/linux_patches/065-rg35xx-dt-bindings-mfd-x-powers-axp152-add-boost-regulator.patch b/board/batocera/allwinner/h616/linux_patches/065-rg35xx-dt-bindings-mfd-x-powers-axp152-add-boost-regulator.patch similarity index 100% rename from board/allwinner/h616/linux_patches/065-rg35xx-dt-bindings-mfd-x-powers-axp152-add-boost-regulator.patch rename to board/batocera/allwinner/h616/linux_patches/065-rg35xx-dt-bindings-mfd-x-powers-axp152-add-boost-regulator.patch diff --git a/board/allwinner/h616/linux_patches/066-rg35xx-mfd-axp20x-AXP717-Add-support-for-boost-regulator.patch b/board/batocera/allwinner/h616/linux_patches/066-rg35xx-mfd-axp20x-AXP717-Add-support-for-boost-regulator.patch similarity index 100% rename from board/allwinner/h616/linux_patches/066-rg35xx-mfd-axp20x-AXP717-Add-support-for-boost-regulator.patch rename to board/batocera/allwinner/h616/linux_patches/066-rg35xx-mfd-axp20x-AXP717-Add-support-for-boost-regulator.patch diff --git a/board/allwinner/h616/linux_patches/067-rg35xx-regulator-axp20x-AXP717-Add-boost-regulator.patch b/board/batocera/allwinner/h616/linux_patches/067-rg35xx-regulator-axp20x-AXP717-Add-boost-regulator.patch similarity index 100% rename from board/allwinner/h616/linux_patches/067-rg35xx-regulator-axp20x-AXP717-Add-boost-regulator.patch rename to board/batocera/allwinner/h616/linux_patches/067-rg35xx-regulator-axp20x-AXP717-Add-boost-regulator.patch diff --git a/board/allwinner/h616/linux_patches/068-rg35xx-clk-sunxi-ng-h616-Add-clock-reset-for-GPADC.patch b/board/batocera/allwinner/h616/linux_patches/068-rg35xx-clk-sunxi-ng-h616-Add-clock-reset-for-GPADC.patch similarity index 100% rename from board/allwinner/h616/linux_patches/068-rg35xx-clk-sunxi-ng-h616-Add-clock-reset-for-GPADC.patch rename to board/batocera/allwinner/h616/linux_patches/068-rg35xx-clk-sunxi-ng-h616-Add-clock-reset-for-GPADC.patch diff --git a/board/allwinner/h616/linux_patches/069-rg35xx-arm64-dts-allwinner-h616-Add-GPADC-device-node.patch b/board/batocera/allwinner/h616/linux_patches/069-rg35xx-arm64-dts-allwinner-h616-Add-GPADC-device-node.patch similarity index 100% rename from board/allwinner/h616/linux_patches/069-rg35xx-arm64-dts-allwinner-h616-Add-GPADC-device-node.patch rename to board/batocera/allwinner/h616/linux_patches/069-rg35xx-arm64-dts-allwinner-h616-Add-GPADC-device-node.patch diff --git a/board/allwinner/h616/linux_patches/070-rg35xx-power-supply-axp20x_usb_power-Annotate-struct-axp20x_usb_power.patch b/board/batocera/allwinner/h616/linux_patches/070-rg35xx-power-supply-axp20x_usb_power-Annotate-struct-axp20x_usb_power.patch similarity index 100% rename from board/allwinner/h616/linux_patches/070-rg35xx-power-supply-axp20x_usb_power-Annotate-struct-axp20x_usb_power.patch rename to board/batocera/allwinner/h616/linux_patches/070-rg35xx-power-supply-axp20x_usb_power-Annotate-struct-axp20x_usb_power.patch diff --git a/board/allwinner/h616/linux_patches/071-rg35xx-power-supply-axp20x_usb_power-replace-current_max-with-input_current_limit.patch b/board/batocera/allwinner/h616/linux_patches/071-rg35xx-power-supply-axp20x_usb_power-replace-current_max-with-input_current_limit.patch similarity index 100% rename from board/allwinner/h616/linux_patches/071-rg35xx-power-supply-axp20x_usb_power-replace-current_max-with-input_current_limit.patch rename to board/batocera/allwinner/h616/linux_patches/071-rg35xx-power-supply-axp20x_usb_power-replace-current_max-with-input_current_limit.patch diff --git a/board/allwinner/h616/linux_patches/072-rg35xx-power-supply-axp20x_usb_power-use-correct-register-for-input-current-limit.patch b/board/batocera/allwinner/h616/linux_patches/072-rg35xx-power-supply-axp20x_usb_power-use-correct-register-for-input-current-limit.patch similarity index 100% rename from board/allwinner/h616/linux_patches/072-rg35xx-power-supply-axp20x_usb_power-use-correct-register-for-input-current-limit.patch rename to board/batocera/allwinner/h616/linux_patches/072-rg35xx-power-supply-axp20x_usb_power-use-correct-register-for-input-current-limit.patch diff --git a/board/allwinner/h616/linux_patches/073-rg35xx-power-supply-axp20x_usb_power-fix-race-condition-with-usb-bc.patch b/board/batocera/allwinner/h616/linux_patches/073-rg35xx-power-supply-axp20x_usb_power-fix-race-condition-with-usb-bc.patch similarity index 100% rename from board/allwinner/h616/linux_patches/073-rg35xx-power-supply-axp20x_usb_power-fix-race-condition-with-usb-bc.patch rename to board/batocera/allwinner/h616/linux_patches/073-rg35xx-power-supply-axp20x_usb_power-fix-race-condition-with-usb-bc.patch diff --git a/board/allwinner/h616/linux_patches/074-rg35xx-power-supply-axp20x_usb_power-enable-usb_type-reporting.patch b/board/batocera/allwinner/h616/linux_patches/074-rg35xx-power-supply-axp20x_usb_power-enable-usb_type-reporting.patch similarity index 100% rename from board/allwinner/h616/linux_patches/074-rg35xx-power-supply-axp20x_usb_power-enable-usb_type-reporting.patch rename to board/batocera/allwinner/h616/linux_patches/074-rg35xx-power-supply-axp20x_usb_power-enable-usb_type-reporting.patch diff --git a/board/allwinner/h616/linux_patches/075-rg35xx-iio-adc-axp20x-Convert-to-platform-remove-callback-returning-void.patch b/board/batocera/allwinner/h616/linux_patches/075-rg35xx-iio-adc-axp20x-Convert-to-platform-remove-callback-returning-void.patch similarity index 100% rename from board/allwinner/h616/linux_patches/075-rg35xx-iio-adc-axp20x-Convert-to-platform-remove-callback-returning-void.patch rename to board/batocera/allwinner/h616/linux_patches/075-rg35xx-iio-adc-axp20x-Convert-to-platform-remove-callback-returning-void.patch diff --git a/board/allwinner/h616/linux_patches/076-rg35xx-iio-adc-axp20x_adc-Add-support-for-AXP192.patch b/board/batocera/allwinner/h616/linux_patches/076-rg35xx-iio-adc-axp20x_adc-Add-support-for-AXP192.patch similarity index 100% rename from board/allwinner/h616/linux_patches/076-rg35xx-iio-adc-axp20x_adc-Add-support-for-AXP192.patch rename to board/batocera/allwinner/h616/linux_patches/076-rg35xx-iio-adc-axp20x_adc-Add-support-for-AXP192.patch diff --git a/board/allwinner/h616/linux_patches/077-rg35xx-iio-adc-axp20x_adc-make-use-of-regmap_set_bits.patch b/board/batocera/allwinner/h616/linux_patches/077-rg35xx-iio-adc-axp20x_adc-make-use-of-regmap_set_bits.patch similarity index 100% rename from board/allwinner/h616/linux_patches/077-rg35xx-iio-adc-axp20x_adc-make-use-of-regmap_set_bits.patch rename to board/batocera/allwinner/h616/linux_patches/077-rg35xx-iio-adc-axp20x_adc-make-use-of-regmap_set_bits.patch diff --git a/board/allwinner/h616/linux_patches/078-rg35xx-mfd-axp20x-Convert-to-use-Maple-Tree-register-cache.patch b/board/batocera/allwinner/h616/linux_patches/078-rg35xx-mfd-axp20x-Convert-to-use-Maple-Tree-register-cache.patch similarity index 100% rename from board/allwinner/h616/linux_patches/078-rg35xx-mfd-axp20x-Convert-to-use-Maple-Tree-register-cache.patch rename to board/batocera/allwinner/h616/linux_patches/078-rg35xx-mfd-axp20x-Convert-to-use-Maple-Tree-register-cache.patch diff --git a/board/allwinner/h616/linux_patches/079-rg35xx-dt-bindings-iio-adc-Add-AXP717-compatible.patch b/board/batocera/allwinner/h616/linux_patches/079-rg35xx-dt-bindings-iio-adc-Add-AXP717-compatible.patch similarity index 100% rename from board/allwinner/h616/linux_patches/079-rg35xx-dt-bindings-iio-adc-Add-AXP717-compatible.patch rename to board/batocera/allwinner/h616/linux_patches/079-rg35xx-dt-bindings-iio-adc-Add-AXP717-compatible.patch diff --git a/board/allwinner/h616/linux_patches/080-rg35xx-power-supply-axp20x_usb_power-Add-support-for-AXP717.patch b/board/batocera/allwinner/h616/linux_patches/080-rg35xx-power-supply-axp20x_usb_power-Add-support-for-AXP717.patch similarity index 100% rename from board/allwinner/h616/linux_patches/080-rg35xx-power-supply-axp20x_usb_power-Add-support-for-AXP717.patch rename to board/batocera/allwinner/h616/linux_patches/080-rg35xx-power-supply-axp20x_usb_power-Add-support-for-AXP717.patch diff --git a/board/allwinner/h616/linux_patches/081-rg35xx-power-supply-axp20x_battery-add-support-for-AXP717.patch b/board/batocera/allwinner/h616/linux_patches/081-rg35xx-power-supply-axp20x_battery-add-support-for-AXP717.patch similarity index 100% rename from board/allwinner/h616/linux_patches/081-rg35xx-power-supply-axp20x_battery-add-support-for-AXP717.patch rename to board/batocera/allwinner/h616/linux_patches/081-rg35xx-power-supply-axp20x_battery-add-support-for-AXP717.patch diff --git a/board/allwinner/h616/linux_patches/082-rg35xx-mfd-axp20x-Add-ADC-BAT-and-USB-cells-for-AXP717.patch b/board/batocera/allwinner/h616/linux_patches/082-rg35xx-mfd-axp20x-Add-ADC-BAT-and-USB-cells-for-AXP717.patch similarity index 100% rename from board/allwinner/h616/linux_patches/082-rg35xx-mfd-axp20x-Add-ADC-BAT-and-USB-cells-for-AXP717.patch rename to board/batocera/allwinner/h616/linux_patches/082-rg35xx-mfd-axp20x-Add-ADC-BAT-and-USB-cells-for-AXP717.patch diff --git a/board/allwinner/h616/linux_patches/083-rg35xx-iio-adc-axp20x_adc-add-support-for-AXP717-ADC.patch b/board/batocera/allwinner/h616/linux_patches/083-rg35xx-iio-adc-axp20x_adc-add-support-for-AXP717-ADC.patch similarity index 100% rename from board/allwinner/h616/linux_patches/083-rg35xx-iio-adc-axp20x_adc-add-support-for-AXP717-ADC.patch rename to board/batocera/allwinner/h616/linux_patches/083-rg35xx-iio-adc-axp20x_adc-add-support-for-AXP717-ADC.patch diff --git a/board/allwinner/h616/linux_patches/084-rg35xx-power-supply-axp20x_usb_power-Add-support-for-AXP717.patch b/board/batocera/allwinner/h616/linux_patches/084-rg35xx-power-supply-axp20x_usb_power-Add-support-for-AXP717.patch similarity index 100% rename from board/allwinner/h616/linux_patches/084-rg35xx-power-supply-axp20x_usb_power-Add-support-for-AXP717.patch rename to board/batocera/allwinner/h616/linux_patches/084-rg35xx-power-supply-axp20x_usb_power-Add-support-for-AXP717.patch diff --git a/board/allwinner/h616/linux_patches/085-rg35xx-power-supply-axp20x_battery-add-support-for-AXP717.patch b/board/batocera/allwinner/h616/linux_patches/085-rg35xx-power-supply-axp20x_battery-add-support-for-AXP717.patch similarity index 100% rename from board/allwinner/h616/linux_patches/085-rg35xx-power-supply-axp20x_battery-add-support-for-AXP717.patch rename to board/batocera/allwinner/h616/linux_patches/085-rg35xx-power-supply-axp20x_battery-add-support-for-AXP717.patch diff --git a/board/allwinner/h616/linux_patches/086-clk-sunxi-ng-h616-Add-TCON_LCD-clocks-to-CCU-driver.patch b/board/batocera/allwinner/h616/linux_patches/086-clk-sunxi-ng-h616-Add-TCON_LCD-clocks-to-CCU-driver.patch similarity index 100% rename from board/allwinner/h616/linux_patches/086-clk-sunxi-ng-h616-Add-TCON_LCD-clocks-to-CCU-driver.patch rename to board/batocera/allwinner/h616/linux_patches/086-clk-sunxi-ng-h616-Add-TCON_LCD-clocks-to-CCU-driver.patch diff --git a/board/allwinner/h616/linux_patches/087-arm64-dts-allwinner-h616-add-LCD-LVDS-and-PWM-pins.patch b/board/batocera/allwinner/h616/linux_patches/087-arm64-dts-allwinner-h616-add-LCD-LVDS-and-PWM-pins.patch similarity index 100% rename from board/allwinner/h616/linux_patches/087-arm64-dts-allwinner-h616-add-LCD-LVDS-and-PWM-pins.patch rename to board/batocera/allwinner/h616/linux_patches/087-arm64-dts-allwinner-h616-add-LCD-LVDS-and-PWM-pins.patch diff --git a/board/allwinner/h616/linux_patches/088-drm-sun4i-tcon-Add-support-for-R40-LCD.patch b/board/batocera/allwinner/h616/linux_patches/088-drm-sun4i-tcon-Add-support-for-R40-LCD.patch similarity index 100% rename from board/allwinner/h616/linux_patches/088-drm-sun4i-tcon-Add-support-for-R40-LCD.patch rename to board/batocera/allwinner/h616/linux_patches/088-drm-sun4i-tcon-Add-support-for-R40-LCD.patch diff --git a/board/allwinner/h616/linux_patches/089-arm64-dts-h616-add-ccu-gpu-power-domain.patch b/board/batocera/allwinner/h616/linux_patches/089-arm64-dts-h616-add-ccu-gpu-power-domain.patch similarity index 100% rename from board/allwinner/h616/linux_patches/089-arm64-dts-h616-add-ccu-gpu-power-domain.patch rename to board/batocera/allwinner/h616/linux_patches/089-arm64-dts-h616-add-ccu-gpu-power-domain.patch diff --git a/board/allwinner/h616/linux_patches/090-rg35xx-arm64-dts-allwinner-h616-Add-missing-tcon-nodes.patch b/board/batocera/allwinner/h616/linux_patches/090-rg35xx-arm64-dts-allwinner-h616-Add-missing-tcon-nodes.patch similarity index 100% rename from board/allwinner/h616/linux_patches/090-rg35xx-arm64-dts-allwinner-h616-Add-missing-tcon-nodes.patch rename to board/batocera/allwinner/h616/linux_patches/090-rg35xx-arm64-dts-allwinner-h616-Add-missing-tcon-nodes.patch diff --git a/board/allwinner/h616/linux_patches/091-rg35xx-dt-bindings-allwinner-Add-TCON-LCD-clock-reset.patch b/board/batocera/allwinner/h616/linux_patches/091-rg35xx-dt-bindings-allwinner-Add-TCON-LCD-clock-reset.patch similarity index 100% rename from board/allwinner/h616/linux_patches/091-rg35xx-dt-bindings-allwinner-Add-TCON-LCD-clock-reset.patch rename to board/batocera/allwinner/h616/linux_patches/091-rg35xx-dt-bindings-allwinner-Add-TCON-LCD-clock-reset.patch diff --git a/board/allwinner/h616/linux_patches/092-rg35xx-arm64-dts-allwinner-h616-add-additional-CPU-OPPs-for-the-H700.patch b/board/batocera/allwinner/h616/linux_patches/092-rg35xx-arm64-dts-allwinner-h616-add-additional-CPU-OPPs-for-the-H700.patch similarity index 100% rename from board/allwinner/h616/linux_patches/092-rg35xx-arm64-dts-allwinner-h616-add-additional-CPU-OPPs-for-the-H700.patch rename to board/batocera/allwinner/h616/linux_patches/092-rg35xx-arm64-dts-allwinner-h616-add-additional-CPU-OPPs-for-the-H700.patch diff --git a/board/allwinner/h616/linux_patches/linux-usbhid-quircks.patch b/board/batocera/allwinner/h616/linux_patches/linux-usbhid-quircks.patch similarity index 100% rename from board/allwinner/h616/linux_patches/linux-usbhid-quircks.patch rename to board/batocera/allwinner/h616/linux_patches/linux-usbhid-quircks.patch diff --git a/board/allwinner/h616/linux_patches/linux-wiimote-abs-not-hat.patch b/board/batocera/allwinner/h616/linux_patches/linux-wiimote-abs-not-hat.patch similarity index 100% rename from board/allwinner/h616/linux_patches/linux-wiimote-abs-not-hat.patch rename to board/batocera/allwinner/h616/linux_patches/linux-wiimote-abs-not-hat.patch diff --git a/board/allwinner/h616/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch b/board/batocera/allwinner/h616/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch similarity index 100% rename from board/allwinner/h616/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch rename to board/batocera/allwinner/h616/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch diff --git a/board/allwinner/h616/orangepi-zero2/boot/extlinux.conf b/board/batocera/allwinner/h616/orangepi-zero2/boot/extlinux.conf similarity index 100% rename from board/allwinner/h616/orangepi-zero2/boot/extlinux.conf rename to board/batocera/allwinner/h616/orangepi-zero2/boot/extlinux.conf diff --git a/board/allwinner/h616/orangepi-zero2/create-boot-script.sh b/board/batocera/allwinner/h616/orangepi-zero2/create-boot-script.sh similarity index 100% rename from board/allwinner/h616/orangepi-zero2/create-boot-script.sh rename to board/batocera/allwinner/h616/orangepi-zero2/create-boot-script.sh diff --git a/board/allwinner/h616/orangepi-zero2/genimage.cfg b/board/batocera/allwinner/h616/orangepi-zero2/genimage.cfg similarity index 100% rename from board/allwinner/h616/orangepi-zero2/genimage.cfg rename to board/batocera/allwinner/h616/orangepi-zero2/genimage.cfg diff --git a/board/allwinner/h616/orangepi-zero2w/boot/extlinux.conf b/board/batocera/allwinner/h616/orangepi-zero2w/boot/extlinux.conf similarity index 100% rename from board/allwinner/h616/orangepi-zero2w/boot/extlinux.conf rename to board/batocera/allwinner/h616/orangepi-zero2w/boot/extlinux.conf diff --git a/board/allwinner/h616/orangepi-zero2w/create-boot-script.sh b/board/batocera/allwinner/h616/orangepi-zero2w/create-boot-script.sh similarity index 100% rename from board/allwinner/h616/orangepi-zero2w/create-boot-script.sh rename to board/batocera/allwinner/h616/orangepi-zero2w/create-boot-script.sh diff --git a/board/allwinner/h616/orangepi-zero2w/genimage.cfg b/board/batocera/allwinner/h616/orangepi-zero2w/genimage.cfg similarity index 100% rename from board/allwinner/h616/orangepi-zero2w/genimage.cfg rename to board/batocera/allwinner/h616/orangepi-zero2w/genimage.cfg diff --git a/board/allwinner/h616/orangepi-zero3/boot/extlinux.conf b/board/batocera/allwinner/h616/orangepi-zero3/boot/extlinux.conf similarity index 100% rename from board/allwinner/h616/orangepi-zero3/boot/extlinux.conf rename to board/batocera/allwinner/h616/orangepi-zero3/boot/extlinux.conf diff --git a/board/allwinner/h616/orangepi-zero3/create-boot-script.sh b/board/batocera/allwinner/h616/orangepi-zero3/create-boot-script.sh similarity index 100% rename from board/allwinner/h616/orangepi-zero3/create-boot-script.sh rename to board/batocera/allwinner/h616/orangepi-zero3/create-boot-script.sh diff --git a/board/allwinner/h616/orangepi-zero3/genimage.cfg b/board/batocera/allwinner/h616/orangepi-zero3/genimage.cfg similarity index 100% rename from board/allwinner/h616/orangepi-zero3/genimage.cfg rename to board/batocera/allwinner/h616/orangepi-zero3/genimage.cfg diff --git a/board/allwinner/h616/patches/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-aarch64-render.patch b/board/batocera/allwinner/h616/patches/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-aarch64-render.patch similarity index 100% rename from board/allwinner/h616/patches/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-aarch64-render.patch rename to board/batocera/allwinner/h616/patches/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-aarch64-render.patch diff --git a/board/allwinner/h616/x96-mate/boot/boot.cmd b/board/batocera/allwinner/h616/x96-mate/boot/boot.cmd similarity index 100% rename from board/allwinner/h616/x96-mate/boot/boot.cmd rename to board/batocera/allwinner/h616/x96-mate/boot/boot.cmd diff --git a/board/allwinner/h616/x96-mate/boot/boot.scr b/board/batocera/allwinner/h616/x96-mate/boot/boot.scr similarity index 100% rename from board/allwinner/h616/x96-mate/boot/boot.scr rename to board/batocera/allwinner/h616/x96-mate/boot/boot.scr diff --git a/board/allwinner/h616/x96-mate/boot/extlinux.conf b/board/batocera/allwinner/h616/x96-mate/boot/extlinux.conf similarity index 100% rename from board/allwinner/h616/x96-mate/boot/extlinux.conf rename to board/batocera/allwinner/h616/x96-mate/boot/extlinux.conf diff --git a/board/allwinner/h616/x96-mate/create-boot-script.sh b/board/batocera/allwinner/h616/x96-mate/create-boot-script.sh similarity index 100% rename from board/allwinner/h616/x96-mate/create-boot-script.sh rename to board/batocera/allwinner/h616/x96-mate/create-boot-script.sh diff --git a/board/allwinner/h616/x96-mate/genimage.cfg b/board/batocera/allwinner/h616/x96-mate/genimage.cfg similarity index 100% rename from board/allwinner/h616/x96-mate/genimage.cfg rename to board/batocera/allwinner/h616/x96-mate/genimage.cfg diff --git a/board/allwinner/linux-defconfig-fragment.config b/board/batocera/allwinner/linux-defconfig-fragment.config similarity index 100% rename from board/allwinner/linux-defconfig-fragment.config rename to board/batocera/allwinner/linux-defconfig-fragment.config diff --git a/board/allwinner/linux-sunxi32-current.config b/board/batocera/allwinner/linux-sunxi32-current.config similarity index 100% rename from board/allwinner/linux-sunxi32-current.config rename to board/batocera/allwinner/linux-sunxi32-current.config diff --git a/board/allwinner/linux-sunxi64-current.config b/board/batocera/allwinner/linux-sunxi64-current.config similarity index 100% rename from board/allwinner/linux-sunxi64-current.config rename to board/batocera/allwinner/linux-sunxi64-current.config diff --git a/board/allwinner/linux_patches/0000-Adjust-model-for-cha.patch b/board/batocera/allwinner/linux_patches/0000-Adjust-model-for-cha.patch similarity index 100% rename from board/allwinner/linux_patches/0000-Adjust-model-for-cha.patch rename to board/batocera/allwinner/linux_patches/0000-Adjust-model-for-cha.patch diff --git a/board/allwinner/linux_patches/0001-Input-axp20x-pek-allow-wakeup-after-shutdown.patch b/board/batocera/allwinner/linux_patches/0001-Input-axp20x-pek-allow-wakeup-after-shutdown.patch similarity index 100% rename from board/allwinner/linux_patches/0001-Input-axp20x-pek-allow-wakeup-after-shutdown.patch rename to board/batocera/allwinner/linux_patches/0001-Input-axp20x-pek-allow-wakeup-after-shutdown.patch diff --git a/board/allwinner/linux_patches/0002-clk-Implement-protected-clocks-for-all-OF-clock-prov.patch b/board/batocera/allwinner/linux_patches/0002-clk-Implement-protected-clocks-for-all-OF-clock-prov.patch similarity index 100% rename from board/allwinner/linux_patches/0002-clk-Implement-protected-clocks-for-all-OF-clock-prov.patch rename to board/batocera/allwinner/linux_patches/0002-clk-Implement-protected-clocks-for-all-OF-clock-prov.patch diff --git a/board/allwinner/linux_patches/0003-Revert-clk-qcom-Support-protected-clocks-property.patch b/board/batocera/allwinner/linux_patches/0003-Revert-clk-qcom-Support-protected-clocks-property.patch similarity index 100% rename from board/allwinner/linux_patches/0003-Revert-clk-qcom-Support-protected-clocks-property.patch rename to board/batocera/allwinner/linux_patches/0003-Revert-clk-qcom-Support-protected-clocks-property.patch diff --git a/board/allwinner/linux_patches/0004-DO-NOT-MERGE-ARM-dts-sunxi-h3-h5-Protect-SCP-clocks.patch b/board/batocera/allwinner/linux_patches/0004-DO-NOT-MERGE-ARM-dts-sunxi-h3-h5-Protect-SCP-clocks.patch similarity index 100% rename from board/allwinner/linux_patches/0004-DO-NOT-MERGE-ARM-dts-sunxi-h3-h5-Protect-SCP-clocks.patch rename to board/batocera/allwinner/linux_patches/0004-DO-NOT-MERGE-ARM-dts-sunxi-h3-h5-Protect-SCP-clocks.patch diff --git a/board/allwinner/linux_patches/0005-DO-NOT-MERGE-arm64-dts-allwinner-a64-Protect-SCP-clo.patch b/board/batocera/allwinner/linux_patches/0005-DO-NOT-MERGE-arm64-dts-allwinner-a64-Protect-SCP-clo.patch similarity index 100% rename from board/allwinner/linux_patches/0005-DO-NOT-MERGE-arm64-dts-allwinner-a64-Protect-SCP-clo.patch rename to board/batocera/allwinner/linux_patches/0005-DO-NOT-MERGE-arm64-dts-allwinner-a64-Protect-SCP-clo.patch diff --git a/board/allwinner/linux_patches/0006-DO-NOT-MERGE-arm64-dts-allwinner-h6-Protect-SCP-cloc.patch b/board/batocera/allwinner/linux_patches/0006-DO-NOT-MERGE-arm64-dts-allwinner-h6-Protect-SCP-cloc.patch similarity index 100% rename from board/allwinner/linux_patches/0006-DO-NOT-MERGE-arm64-dts-allwinner-h6-Protect-SCP-cloc.patch rename to board/batocera/allwinner/linux_patches/0006-DO-NOT-MERGE-arm64-dts-allwinner-h6-Protect-SCP-cloc.patch diff --git a/board/allwinner/linux_patches/0007-rtc-sun6i-Allow-RTC-wakeup-after-shutdown.patch b/board/batocera/allwinner/linux_patches/0007-rtc-sun6i-Allow-RTC-wakeup-after-shutdown.patch similarity index 100% rename from board/allwinner/linux_patches/0007-rtc-sun6i-Allow-RTC-wakeup-after-shutdown.patch rename to board/batocera/allwinner/linux_patches/0007-rtc-sun6i-Allow-RTC-wakeup-after-shutdown.patch diff --git a/board/allwinner/linux_patches/0008-firmware-arm_scpi-Support-unidirectional-mailbox-cha.patch b/board/batocera/allwinner/linux_patches/0008-firmware-arm_scpi-Support-unidirectional-mailbox-cha.patch similarity index 100% rename from board/allwinner/linux_patches/0008-firmware-arm_scpi-Support-unidirectional-mailbox-cha.patch rename to board/batocera/allwinner/linux_patches/0008-firmware-arm_scpi-Support-unidirectional-mailbox-cha.patch diff --git a/board/allwinner/linux_patches/0009-ARM-dts-sunxi-h3-h5-Add-SCPI-protocol.patch b/board/batocera/allwinner/linux_patches/0009-ARM-dts-sunxi-h3-h5-Add-SCPI-protocol.patch similarity index 100% rename from board/allwinner/linux_patches/0009-ARM-dts-sunxi-h3-h5-Add-SCPI-protocol.patch rename to board/batocera/allwinner/linux_patches/0009-ARM-dts-sunxi-h3-h5-Add-SCPI-protocol.patch diff --git a/board/allwinner/linux_patches/0010-arm64-dts-allwinner-a64-Add-SCPI-protocol.patch b/board/batocera/allwinner/linux_patches/0010-arm64-dts-allwinner-a64-Add-SCPI-protocol.patch similarity index 100% rename from board/allwinner/linux_patches/0010-arm64-dts-allwinner-a64-Add-SCPI-protocol.patch rename to board/batocera/allwinner/linux_patches/0010-arm64-dts-allwinner-a64-Add-SCPI-protocol.patch diff --git a/board/allwinner/linux_patches/0011-arm64-dts-allwinner-h6-Add-SCPI-protocol.patch b/board/batocera/allwinner/linux_patches/0011-arm64-dts-allwinner-h6-Add-SCPI-protocol.patch similarity index 100% rename from board/allwinner/linux_patches/0011-arm64-dts-allwinner-h6-Add-SCPI-protocol.patch rename to board/batocera/allwinner/linux_patches/0011-arm64-dts-allwinner-h6-Add-SCPI-protocol.patch diff --git a/board/allwinner/linux_patches/0012-ASoC-hdmi-codec-fix-channel-allocation.patch b/board/batocera/allwinner/linux_patches/0012-ASoC-hdmi-codec-fix-channel-allocation.patch similarity index 100% rename from board/allwinner/linux_patches/0012-ASoC-hdmi-codec-fix-channel-allocation.patch rename to board/batocera/allwinner/linux_patches/0012-ASoC-hdmi-codec-fix-channel-allocation.patch diff --git a/board/allwinner/linux_patches/0013-drm_call_drm_atomic_helper_shutdown_at_shutdown.patch b/board/batocera/allwinner/linux_patches/0013-drm_call_drm_atomic_helper_shutdown_at_shutdown.patch similarity index 100% rename from board/allwinner/linux_patches/0013-drm_call_drm_atomic_helper_shutdown_at_shutdown.patch rename to board/batocera/allwinner/linux_patches/0013-drm_call_drm_atomic_helper_shutdown_at_shutdown.patch diff --git a/board/allwinner/linux_patches/0014-WIP-dw-hdmi-cec-sleep-100ms-on-error.patch b/board/batocera/allwinner/linux_patches/0014-WIP-dw-hdmi-cec-sleep-100ms-on-error.patch similarity index 100% rename from board/allwinner/linux_patches/0014-WIP-dw-hdmi-cec-sleep-100ms-on-error.patch rename to board/batocera/allwinner/linux_patches/0014-WIP-dw-hdmi-cec-sleep-100ms-on-error.patch diff --git a/board/allwinner/linux_patches/0015-drm-sun4i-mixer-Add-caching-support.patch b/board/batocera/allwinner/linux_patches/0015-drm-sun4i-mixer-Add-caching-support.patch similarity index 100% rename from board/allwinner/linux_patches/0015-drm-sun4i-mixer-Add-caching-support.patch rename to board/batocera/allwinner/linux_patches/0015-drm-sun4i-mixer-Add-caching-support.patch diff --git a/board/allwinner/linux_patches/0016-mfd-Add-support-for-AC200.patch b/board/batocera/allwinner/linux_patches/0016-mfd-Add-support-for-AC200.patch similarity index 100% rename from board/allwinner/linux_patches/0016-mfd-Add-support-for-AC200.patch rename to board/batocera/allwinner/linux_patches/0016-mfd-Add-support-for-AC200.patch diff --git a/board/allwinner/linux_patches/0017-net-phy-Add-support-for-AC200-EPHY.patch b/board/batocera/allwinner/linux_patches/0017-net-phy-Add-support-for-AC200-EPHY.patch similarity index 100% rename from board/allwinner/linux_patches/0017-net-phy-Add-support-for-AC200-EPHY.patch rename to board/batocera/allwinner/linux_patches/0017-net-phy-Add-support-for-AC200-EPHY.patch diff --git a/board/allwinner/linux_patches/0018-wip-H6-deinterlace.patch b/board/batocera/allwinner/linux_patches/0018-wip-H6-deinterlace.patch similarity index 100% rename from board/allwinner/linux_patches/0018-wip-H6-deinterlace.patch rename to board/batocera/allwinner/linux_patches/0018-wip-H6-deinterlace.patch diff --git a/board/allwinner/linux_patches/0019-arm64-dts-h6-deinterlace.patch b/board/batocera/allwinner/linux_patches/0019-arm64-dts-h6-deinterlace.patch similarity index 100% rename from board/allwinner/linux_patches/0019-arm64-dts-h6-deinterlace.patch rename to board/batocera/allwinner/linux_patches/0019-arm64-dts-h6-deinterlace.patch diff --git a/board/allwinner/linux_patches/0020-WIP-I2S-multi-channel.patch b/board/batocera/allwinner/linux_patches/0020-WIP-I2S-multi-channel.patch similarity index 100% rename from board/allwinner/linux_patches/0020-WIP-I2S-multi-channel.patch rename to board/batocera/allwinner/linux_patches/0020-WIP-I2S-multi-channel.patch diff --git a/board/allwinner/linux_patches/0021-HACK-h3-h5-Add-HDMI-sound-card.patch b/board/batocera/allwinner/linux_patches/0021-HACK-h3-h5-Add-HDMI-sound-card.patch similarity index 100% rename from board/allwinner/linux_patches/0021-HACK-h3-h5-Add-HDMI-sound-card.patch rename to board/batocera/allwinner/linux_patches/0021-HACK-h3-h5-Add-HDMI-sound-card.patch diff --git a/board/allwinner/linux_patches/0022-HACK-a64-Add-HDMI-sound-card.patch b/board/batocera/allwinner/linux_patches/0022-HACK-a64-Add-HDMI-sound-card.patch similarity index 100% rename from board/allwinner/linux_patches/0022-HACK-a64-Add-HDMI-sound-card.patch rename to board/batocera/allwinner/linux_patches/0022-HACK-a64-Add-HDMI-sound-card.patch diff --git a/board/allwinner/linux_patches/0023-bpi-m2u-analog-codec.patch b/board/batocera/allwinner/linux_patches/0023-bpi-m2u-analog-codec.patch similarity index 100% rename from board/allwinner/linux_patches/0023-bpi-m2u-analog-codec.patch rename to board/batocera/allwinner/linux_patches/0023-bpi-m2u-analog-codec.patch diff --git a/board/allwinner/linux_patches/0024-r40-hdmi-audio-wip.patch b/board/batocera/allwinner/linux_patches/0024-r40-hdmi-audio-wip.patch similarity index 100% rename from board/allwinner/linux_patches/0024-r40-hdmi-audio-wip.patch rename to board/batocera/allwinner/linux_patches/0024-r40-hdmi-audio-wip.patch diff --git a/board/allwinner/linux_patches/0025-HACK-h6-Add-HDMI-sound-card.patch b/board/batocera/allwinner/linux_patches/0025-HACK-h6-Add-HDMI-sound-card.patch similarity index 100% rename from board/allwinner/linux_patches/0025-HACK-h6-Add-HDMI-sound-card.patch rename to board/batocera/allwinner/linux_patches/0025-HACK-h6-Add-HDMI-sound-card.patch diff --git a/board/allwinner/linux_patches/0026-phy-handle-optional-regulator-for-PHY.patch b/board/batocera/allwinner/linux_patches/0026-phy-handle-optional-regulator-for-PHY.patch similarity index 100% rename from board/allwinner/linux_patches/0026-phy-handle-optional-regulator-for-PHY.patch rename to board/batocera/allwinner/linux_patches/0026-phy-handle-optional-regulator-for-PHY.patch diff --git a/board/allwinner/linux_patches/0027-arm64-dts-allwinner-orange-pi-3-Enable-ethernet.patch b/board/batocera/allwinner/linux_patches/0027-arm64-dts-allwinner-orange-pi-3-Enable-ethernet.patch similarity index 100% rename from board/allwinner/linux_patches/0027-arm64-dts-allwinner-orange-pi-3-Enable-ethernet.patch rename to board/batocera/allwinner/linux_patches/0027-arm64-dts-allwinner-orange-pi-3-Enable-ethernet.patch diff --git a/board/allwinner/linux_patches/0028-arm64-allwinner-dts-h6-enable-USB3-port-on-Pine-H64.patch b/board/batocera/allwinner/linux_patches/0028-arm64-allwinner-dts-h6-enable-USB3-port-on-Pine-H64.patch similarity index 100% rename from board/allwinner/linux_patches/0028-arm64-allwinner-dts-h6-enable-USB3-port-on-Pine-H64.patch rename to board/batocera/allwinner/linux_patches/0028-arm64-allwinner-dts-h6-enable-USB3-port-on-Pine-H64.patch diff --git a/board/allwinner/linux_patches/0029-arm64-dts-allwinner-h6-Add-AC200-EPHY-related-nodes.patch b/board/batocera/allwinner/linux_patches/0029-arm64-dts-allwinner-h6-Add-AC200-EPHY-related-nodes.patch similarity index 100% rename from board/allwinner/linux_patches/0029-arm64-dts-allwinner-h6-Add-AC200-EPHY-related-nodes.patch rename to board/batocera/allwinner/linux_patches/0029-arm64-dts-allwinner-h6-Add-AC200-EPHY-related-nodes.patch diff --git a/board/allwinner/linux_patches/0030-arm64-dts-allwinner-h6-tanix-tx6-enable-ethernet.patch b/board/batocera/allwinner/linux_patches/0030-arm64-dts-allwinner-h6-tanix-tx6-enable-ethernet.patch similarity index 100% rename from board/allwinner/linux_patches/0030-arm64-dts-allwinner-h6-tanix-tx6-enable-ethernet.patch rename to board/batocera/allwinner/linux_patches/0030-arm64-dts-allwinner-h6-tanix-tx6-enable-ethernet.patch diff --git a/board/allwinner/linux_patches/0031-arm64-allwinner-h6-Enable-USB3-for-OrangePi-Lite2.patch b/board/batocera/allwinner/linux_patches/0031-arm64-allwinner-h6-Enable-USB3-for-OrangePi-Lite2.patch similarity index 100% rename from board/allwinner/linux_patches/0031-arm64-allwinner-h6-Enable-USB3-for-OrangePi-Lite2.patch rename to board/batocera/allwinner/linux_patches/0031-arm64-allwinner-h6-Enable-USB3-for-OrangePi-Lite2.patch diff --git a/board/allwinner/linux_patches/0032-mmc-sunxi-fix-unusuable-eMMC-on-some-H6-boards-by-di.patch b/board/batocera/allwinner/linux_patches/0032-mmc-sunxi-fix-unusuable-eMMC-on-some-H6-boards-by-di.patch similarity index 100% rename from board/allwinner/linux_patches/0032-mmc-sunxi-fix-unusuable-eMMC-on-some-H6-boards-by-di.patch rename to board/batocera/allwinner/linux_patches/0032-mmc-sunxi-fix-unusuable-eMMC-on-some-H6-boards-by-di.patch diff --git a/board/allwinner/linux_patches/0033-bluetooth-btrtl-add-hci-ver-rtl8822cs.patch b/board/batocera/allwinner/linux_patches/0033-bluetooth-btrtl-add-hci-ver-rtl8822cs.patch similarity index 100% rename from board/allwinner/linux_patches/0033-bluetooth-btrtl-add-hci-ver-rtl8822cs.patch rename to board/batocera/allwinner/linux_patches/0033-bluetooth-btrtl-add-hci-ver-rtl8822cs.patch diff --git a/board/allwinner/linux_patches/0034-HACK-Disable-MBUS-due-to-fw_devlink-on.patch b/board/batocera/allwinner/linux_patches/0034-HACK-Disable-MBUS-due-to-fw_devlink-on.patch similarity index 100% rename from board/allwinner/linux_patches/0034-HACK-Disable-MBUS-due-to-fw_devlink-on.patch rename to board/batocera/allwinner/linux_patches/0034-HACK-Disable-MBUS-due-to-fw_devlink-on.patch diff --git a/board/allwinner/linux_patches/0035-WIP-OPi3-DT-fixes.patch b/board/batocera/allwinner/linux_patches/0035-WIP-OPi3-DT-fixes.patch similarity index 100% rename from board/allwinner/linux_patches/0035-WIP-OPi3-DT-fixes.patch rename to board/batocera/allwinner/linux_patches/0035-WIP-OPi3-DT-fixes.patch diff --git a/board/allwinner/linux_patches/0036-WIP-drm-bridge-synopsys-Fix-CEC-not-working-after-power.patch b/board/batocera/allwinner/linux_patches/0036-WIP-drm-bridge-synopsys-Fix-CEC-not-working-after-power.patch similarity index 100% rename from board/allwinner/linux_patches/0036-WIP-drm-bridge-synopsys-Fix-CEC-not-working-after-power.patch rename to board/batocera/allwinner/linux_patches/0036-WIP-drm-bridge-synopsys-Fix-CEC-not-working-after-power.patch diff --git a/board/allwinner/linux_patches/0037-media--cedrus--Don-t-CPU-map-source-buffers.patch b/board/batocera/allwinner/linux_patches/0037-media--cedrus--Don-t-CPU-map-source-buffers.patch similarity index 100% rename from board/allwinner/linux_patches/0037-media--cedrus--Don-t-CPU-map-source-buffers.patch rename to board/batocera/allwinner/linux_patches/0037-media--cedrus--Don-t-CPU-map-source-buffers.patch diff --git a/board/allwinner/linux_patches/0038-wip-fix-H6-4k-60.patch b/board/batocera/allwinner/linux_patches/0038-wip-fix-H6-4k-60.patch similarity index 100% rename from board/allwinner/linux_patches/0038-wip-fix-H6-4k-60.patch rename to board/batocera/allwinner/linux_patches/0038-wip-fix-H6-4k-60.patch diff --git a/board/allwinner/linux_patches/0039-arm64-dts-allwinner-h6-Fix-Cedrus-IOMMU-again.patch b/board/batocera/allwinner/linux_patches/0039-arm64-dts-allwinner-h6-Fix-Cedrus-IOMMU-again.patch similarity index 100% rename from board/allwinner/linux_patches/0039-arm64-dts-allwinner-h6-Fix-Cedrus-IOMMU-again.patch rename to board/batocera/allwinner/linux_patches/0039-arm64-dts-allwinner-h6-Fix-Cedrus-IOMMU-again.patch diff --git a/board/allwinner/linux_patches/0040-iommu-sun50i-Allow-page-sizes-multiple-of-4096.patch b/board/batocera/allwinner/linux_patches/0040-iommu-sun50i-Allow-page-sizes-multiple-of-4096.patch similarity index 100% rename from board/allwinner/linux_patches/0040-iommu-sun50i-Allow-page-sizes-multiple-of-4096.patch rename to board/batocera/allwinner/linux_patches/0040-iommu-sun50i-Allow-page-sizes-multiple-of-4096.patch diff --git a/board/allwinner/linux_patches/0041-OrangePi-3-LTS-support.patch b/board/batocera/allwinner/linux_patches/0041-OrangePi-3-LTS-support.patch similarity index 100% rename from board/allwinner/linux_patches/0041-OrangePi-3-LTS-support.patch rename to board/batocera/allwinner/linux_patches/0041-OrangePi-3-LTS-support.patch diff --git a/board/allwinner/linux_patches/0042-tanix-mmc-rtw88-keep-power-in-suspend.patch b/board/batocera/allwinner/linux_patches/0042-tanix-mmc-rtw88-keep-power-in-suspend.patch similarity index 100% rename from board/allwinner/linux_patches/0042-tanix-mmc-rtw88-keep-power-in-suspend.patch rename to board/batocera/allwinner/linux_patches/0042-tanix-mmc-rtw88-keep-power-in-suspend.patch diff --git a/board/allwinner/linux_patches/0043-Bluetooth-btrtl-Add-support-for-RTL8822BS.patch b/board/batocera/allwinner/linux_patches/0043-Bluetooth-btrtl-Add-support-for-RTL8822BS.patch similarity index 100% rename from board/allwinner/linux_patches/0043-Bluetooth-btrtl-Add-support-for-RTL8822BS.patch rename to board/batocera/allwinner/linux_patches/0043-Bluetooth-btrtl-Add-support-for-RTL8822BS.patch diff --git a/board/allwinner/linux_patches/0044-ARM-dts-sun8i-r40-Add-interconnect-to-video-codec.patch b/board/batocera/allwinner/linux_patches/0044-ARM-dts-sun8i-r40-Add-interconnect-to-video-codec.patch similarity index 100% rename from board/allwinner/linux_patches/0044-ARM-dts-sun8i-r40-Add-interconnect-to-video-codec.patch rename to board/batocera/allwinner/linux_patches/0044-ARM-dts-sun8i-r40-Add-interconnect-to-video-codec.patch diff --git a/board/allwinner/linux_patches/0047-drm-sun4i-dw-hdmi-Deinit-PHY-in-fail-path.patch b/board/batocera/allwinner/linux_patches/0047-drm-sun4i-dw-hdmi-Deinit-PHY-in-fail-path.patch similarity index 100% rename from board/allwinner/linux_patches/0047-drm-sun4i-dw-hdmi-Deinit-PHY-in-fail-path.patch rename to board/batocera/allwinner/linux_patches/0047-drm-sun4i-dw-hdmi-Deinit-PHY-in-fail-path.patch diff --git a/board/allwinner/linux_patches/0048-drm-sun4i-dw-hdmi-Remove-double-encoder-cleanup.patch b/board/batocera/allwinner/linux_patches/0048-drm-sun4i-dw-hdmi-Remove-double-encoder-cleanup.patch similarity index 100% rename from board/allwinner/linux_patches/0048-drm-sun4i-dw-hdmi-Remove-double-encoder-cleanup.patch rename to board/batocera/allwinner/linux_patches/0048-drm-sun4i-dw-hdmi-Remove-double-encoder-cleanup.patch diff --git a/board/allwinner/linux_patches/0049-drm-sun4i-dw-hdmi-Switch-to-bridge-functions.patch b/board/batocera/allwinner/linux_patches/0049-drm-sun4i-dw-hdmi-Switch-to-bridge-functions.patch similarity index 100% rename from board/allwinner/linux_patches/0049-drm-sun4i-dw-hdmi-Switch-to-bridge-functions.patch rename to board/batocera/allwinner/linux_patches/0049-drm-sun4i-dw-hdmi-Switch-to-bridge-functions.patch diff --git a/board/allwinner/linux_patches/0050-drm-sun4i-Don-t-show-error-for-deferred-probes.patch b/board/batocera/allwinner/linux_patches/0050-drm-sun4i-Don-t-show-error-for-deferred-probes.patch similarity index 100% rename from board/allwinner/linux_patches/0050-drm-sun4i-Don-t-show-error-for-deferred-probes.patch rename to board/batocera/allwinner/linux_patches/0050-drm-sun4i-Don-t-show-error-for-deferred-probes.patch diff --git a/board/allwinner/linux_patches/0051-drm-sun4i-dw-hdmi-Make-sun8i_hdmi_phy_get-more-intui.patch b/board/batocera/allwinner/linux_patches/0051-drm-sun4i-dw-hdmi-Make-sun8i_hdmi_phy_get-more-intui.patch similarity index 100% rename from board/allwinner/linux_patches/0051-drm-sun4i-dw-hdmi-Make-sun8i_hdmi_phy_get-more-intui.patch rename to board/batocera/allwinner/linux_patches/0051-drm-sun4i-dw-hdmi-Make-sun8i_hdmi_phy_get-more-intui.patch diff --git a/board/allwinner/linux_patches/0052-drm-sun4i-dw-hdmi-check-for-phy-device-first.patch b/board/batocera/allwinner/linux_patches/0052-drm-sun4i-dw-hdmi-check-for-phy-device-first.patch similarity index 100% rename from board/allwinner/linux_patches/0052-drm-sun4i-dw-hdmi-check-for-phy-device-first.patch rename to board/batocera/allwinner/linux_patches/0052-drm-sun4i-dw-hdmi-check-for-phy-device-first.patch diff --git a/board/allwinner/linux_patches/0053-drm-sun4i-de2-de3-Change-CSC-argument.patch b/board/batocera/allwinner/linux_patches/0053-drm-sun4i-de2-de3-Change-CSC-argument.patch similarity index 100% rename from board/allwinner/linux_patches/0053-drm-sun4i-de2-de3-Change-CSC-argument.patch rename to board/batocera/allwinner/linux_patches/0053-drm-sun4i-de2-de3-Change-CSC-argument.patch diff --git a/board/allwinner/linux_patches/0054-drm-sun4i-de2-de3-Merge-CSC-functions-into-one.patch b/board/batocera/allwinner/linux_patches/0054-drm-sun4i-de2-de3-Merge-CSC-functions-into-one.patch similarity index 100% rename from board/allwinner/linux_patches/0054-drm-sun4i-de2-de3-Merge-CSC-functions-into-one.patch rename to board/batocera/allwinner/linux_patches/0054-drm-sun4i-de2-de3-Merge-CSC-functions-into-one.patch diff --git a/board/allwinner/linux_patches/0055-drm-sun4i-de2-de3-call-csc-setup-also-for-UI-layer.patch b/board/batocera/allwinner/linux_patches/0055-drm-sun4i-de2-de3-call-csc-setup-also-for-UI-layer.patch similarity index 100% rename from board/allwinner/linux_patches/0055-drm-sun4i-de2-de3-call-csc-setup-also-for-UI-layer.patch rename to board/batocera/allwinner/linux_patches/0055-drm-sun4i-de2-de3-call-csc-setup-also-for-UI-layer.patch diff --git a/board/allwinner/linux_patches/0056-drm-bridge-dw-hdmi-add-mtmdsclock-parameter-to-phy-c.patch b/board/batocera/allwinner/linux_patches/0056-drm-bridge-dw-hdmi-add-mtmdsclock-parameter-to-phy-c.patch similarity index 100% rename from board/allwinner/linux_patches/0056-drm-bridge-dw-hdmi-add-mtmdsclock-parameter-to-phy-c.patch rename to board/batocera/allwinner/linux_patches/0056-drm-bridge-dw-hdmi-add-mtmdsclock-parameter-to-phy-c.patch diff --git a/board/allwinner/linux_patches/0057-drm-bridge-dw-hdmi-support-configuring-phy-for-deep-.patch b/board/batocera/allwinner/linux_patches/0057-drm-bridge-dw-hdmi-support-configuring-phy-for-deep-.patch similarity index 100% rename from board/allwinner/linux_patches/0057-drm-bridge-dw-hdmi-support-configuring-phy-for-deep-.patch rename to board/batocera/allwinner/linux_patches/0057-drm-bridge-dw-hdmi-support-configuring-phy-for-deep-.patch diff --git a/board/allwinner/linux_patches/0059-WIP-drm-sun4i-de3-Add-support-for-YUV420-output.patch b/board/batocera/allwinner/linux_patches/0059-WIP-drm-sun4i-de3-Add-support-for-YUV420-output.patch similarity index 100% rename from board/allwinner/linux_patches/0059-WIP-drm-sun4i-de3-Add-support-for-YUV420-output.patch rename to board/batocera/allwinner/linux_patches/0059-WIP-drm-sun4i-de3-Add-support-for-YUV420-output.patch diff --git a/board/allwinner/linux_patches/0061-media-Add-NV12-and-P010-AFBC-compressed-formats.patch b/board/batocera/allwinner/linux_patches/0061-media-Add-NV12-and-P010-AFBC-compressed-formats.patch similarity index 100% rename from board/allwinner/linux_patches/0061-media-Add-NV12-and-P010-AFBC-compressed-formats.patch rename to board/batocera/allwinner/linux_patches/0061-media-Add-NV12-and-P010-AFBC-compressed-formats.patch diff --git a/board/allwinner/linux_patches/0062-media-cedrus-add-format-filtering-based-on-depth-and.patch b/board/batocera/allwinner/linux_patches/0062-media-cedrus-add-format-filtering-based-on-depth-and.patch similarity index 100% rename from board/allwinner/linux_patches/0062-media-cedrus-add-format-filtering-based-on-depth-and.patch rename to board/batocera/allwinner/linux_patches/0062-media-cedrus-add-format-filtering-based-on-depth-and.patch diff --git a/board/allwinner/linux_patches/0063-media-cedrus-Implement-AFBC-YUV420-formats-for-H265.patch b/board/batocera/allwinner/linux_patches/0063-media-cedrus-Implement-AFBC-YUV420-formats-for-H265.patch similarity index 100% rename from board/allwinner/linux_patches/0063-media-cedrus-Implement-AFBC-YUV420-formats-for-H265.patch rename to board/batocera/allwinner/linux_patches/0063-media-cedrus-Implement-AFBC-YUV420-formats-for-H265.patch diff --git a/board/allwinner/linux_patches/0064-drm-sun4i-de2-Initialize-layer-fields-earlier.patch b/board/batocera/allwinner/linux_patches/0064-drm-sun4i-de2-Initialize-layer-fields-earlier.patch similarity index 100% rename from board/allwinner/linux_patches/0064-drm-sun4i-de2-Initialize-layer-fields-earlier.patch rename to board/batocera/allwinner/linux_patches/0064-drm-sun4i-de2-Initialize-layer-fields-earlier.patch diff --git a/board/allwinner/linux_patches/0065-drm-sun4i-de3-Implement-AFBC-support.patch b/board/batocera/allwinner/linux_patches/0065-drm-sun4i-de3-Implement-AFBC-support.patch similarity index 100% rename from board/allwinner/linux_patches/0065-drm-sun4i-de3-Implement-AFBC-support.patch rename to board/batocera/allwinner/linux_patches/0065-drm-sun4i-de3-Implement-AFBC-support.patch diff --git a/board/allwinner/linux_patches/0066-media-cedrus-Increase-H6-clock-rate.patch b/board/batocera/allwinner/linux_patches/0066-media-cedrus-Increase-H6-clock-rate.patch similarity index 100% rename from board/allwinner/linux_patches/0066-media-cedrus-Increase-H6-clock-rate.patch rename to board/batocera/allwinner/linux_patches/0066-media-cedrus-Increase-H6-clock-rate.patch diff --git a/board/allwinner/linux_patches/0067-arm64-dts-allwinner-h6-Add-GPU-OPP-to-all-boards.patch b/board/batocera/allwinner/linux_patches/0067-arm64-dts-allwinner-h6-Add-GPU-OPP-to-all-boards.patch similarity index 100% rename from board/allwinner/linux_patches/0067-arm64-dts-allwinner-h6-Add-GPU-OPP-to-all-boards.patch rename to board/batocera/allwinner/linux_patches/0067-arm64-dts-allwinner-h6-Add-GPU-OPP-to-all-boards.patch diff --git a/board/allwinner/linux_patches/0070-wip-h3-h5-cvbs.patch b/board/batocera/allwinner/linux_patches/0070-wip-h3-h5-cvbs.patch similarity index 100% rename from board/allwinner/linux_patches/0070-wip-h3-h5-cvbs.patch rename to board/batocera/allwinner/linux_patches/0070-wip-h3-h5-cvbs.patch diff --git a/board/allwinner/linux_patches/0071-HACK-SW-CEC-implementation-for-H3.patch b/board/batocera/allwinner/linux_patches/0071-HACK-SW-CEC-implementation-for-H3.patch similarity index 100% rename from board/allwinner/linux_patches/0071-HACK-SW-CEC-implementation-for-H3.patch rename to board/batocera/allwinner/linux_patches/0071-HACK-SW-CEC-implementation-for-H3.patch diff --git a/board/allwinner/linux_patches/0072-HACK-clk-sunxi-ng-unify-parent-for-HDMI-clocks.patch b/board/batocera/allwinner/linux_patches/0072-HACK-clk-sunxi-ng-unify-parent-for-HDMI-clocks.patch similarity index 100% rename from board/allwinner/linux_patches/0072-HACK-clk-sunxi-ng-unify-parent-for-HDMI-clocks.patch rename to board/batocera/allwinner/linux_patches/0072-HACK-clk-sunxi-ng-unify-parent-for-HDMI-clocks.patch diff --git a/board/allwinner/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch b/board/batocera/allwinner/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch similarity index 100% rename from board/allwinner/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch rename to board/batocera/allwinner/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch diff --git a/board/allwinner/patches/ffmpeg/ffmpeg-001-v4l2-drmprime.patch b/board/batocera/allwinner/patches/ffmpeg/ffmpeg-001-v4l2-drmprime.patch similarity index 100% rename from board/allwinner/patches/ffmpeg/ffmpeg-001-v4l2-drmprime.patch rename to board/batocera/allwinner/patches/ffmpeg/ffmpeg-001-v4l2-drmprime.patch diff --git a/board/allwinner/patches/ffmpeg/ffmpeg-001-v4l2-request.patch b/board/batocera/allwinner/patches/ffmpeg/ffmpeg-001-v4l2-request.patch similarity index 100% rename from board/allwinner/patches/ffmpeg/ffmpeg-001-v4l2-request.patch rename to board/batocera/allwinner/patches/ffmpeg/ffmpeg-001-v4l2-request.patch diff --git a/board/allwinner/patches/ffmpeg/ffmpeg-001-vf-deinterlace-v4l2m2m.patch b/board/batocera/allwinner/patches/ffmpeg/ffmpeg-001-vf-deinterlace-v4l2m2m.patch similarity index 100% rename from board/allwinner/patches/ffmpeg/ffmpeg-001-vf-deinterlace-v4l2m2m.patch rename to board/batocera/allwinner/patches/ffmpeg/ffmpeg-001-vf-deinterlace-v4l2m2m.patch diff --git a/board/allwinner/patches/sugarbox/001-gles.patch b/board/batocera/allwinner/patches/sugarbox/001-gles.patch similarity index 100% rename from board/allwinner/patches/sugarbox/001-gles.patch rename to board/batocera/allwinner/patches/sugarbox/001-gles.patch diff --git a/board/allwinner/patches/switchres/001-relax-kmsdrm.patch b/board/batocera/allwinner/patches/switchres/001-relax-kmsdrm.patch similarity index 100% rename from board/allwinner/patches/switchres/001-relax-kmsdrm.patch rename to board/batocera/allwinner/patches/switchres/001-relax-kmsdrm.patch diff --git a/board/amlogic/a3gen2/fsoverlay/etc/modprobe.d/8188eu.conf b/board/batocera/amlogic/a3gen2/fsoverlay/etc/modprobe.d/8188eu.conf similarity index 100% rename from board/amlogic/a3gen2/fsoverlay/etc/modprobe.d/8188eu.conf rename to board/batocera/amlogic/a3gen2/fsoverlay/etc/modprobe.d/8188eu.conf diff --git a/board/amlogic/a3gen2/fsoverlay/etc/modules.conf b/board/batocera/amlogic/a3gen2/fsoverlay/etc/modules.conf similarity index 100% rename from board/amlogic/a3gen2/fsoverlay/etc/modules.conf rename to board/batocera/amlogic/a3gen2/fsoverlay/etc/modules.conf diff --git a/board/amlogic/a3gen2/fsoverlay/usr/share/alsa/alsa.conf b/board/batocera/amlogic/a3gen2/fsoverlay/usr/share/alsa/alsa.conf similarity index 100% rename from board/amlogic/a3gen2/fsoverlay/usr/share/alsa/alsa.conf rename to board/batocera/amlogic/a3gen2/fsoverlay/usr/share/alsa/alsa.conf diff --git a/board/amlogic/a3gen2/fsoverlay/usr/share/alsa/cards/HDMI.conf b/board/batocera/amlogic/a3gen2/fsoverlay/usr/share/alsa/cards/HDMI.conf similarity index 100% rename from board/amlogic/a3gen2/fsoverlay/usr/share/alsa/cards/HDMI.conf rename to board/batocera/amlogic/a3gen2/fsoverlay/usr/share/alsa/cards/HDMI.conf diff --git a/board/amlogic/a3gen2/khadas-vim4/boot/extlinux.conf b/board/batocera/amlogic/a3gen2/khadas-vim4/boot/extlinux.conf similarity index 100% rename from board/amlogic/a3gen2/khadas-vim4/boot/extlinux.conf rename to board/batocera/amlogic/a3gen2/khadas-vim4/boot/extlinux.conf diff --git a/board/amlogic/a3gen2/khadas-vim4/build-uboot.sh b/board/batocera/amlogic/a3gen2/khadas-vim4/build-uboot.sh similarity index 100% rename from board/amlogic/a3gen2/khadas-vim4/build-uboot.sh rename to board/batocera/amlogic/a3gen2/khadas-vim4/build-uboot.sh diff --git a/board/amlogic/a3gen2/khadas-vim4/create-boot-script.sh b/board/batocera/amlogic/a3gen2/khadas-vim4/create-boot-script.sh similarity index 100% rename from board/amlogic/a3gen2/khadas-vim4/create-boot-script.sh rename to board/batocera/amlogic/a3gen2/khadas-vim4/create-boot-script.sh diff --git a/board/amlogic/a3gen2/khadas-vim4/genimage.cfg b/board/batocera/amlogic/a3gen2/khadas-vim4/genimage.cfg similarity index 100% rename from board/amlogic/a3gen2/khadas-vim4/genimage.cfg rename to board/batocera/amlogic/a3gen2/khadas-vim4/genimage.cfg diff --git a/board/amlogic/a3gen2/linux-defconfig-fragment.config b/board/batocera/amlogic/a3gen2/linux-defconfig-fragment.config similarity index 100% rename from board/amlogic/a3gen2/linux-defconfig-fragment.config rename to board/batocera/amlogic/a3gen2/linux-defconfig-fragment.config diff --git a/board/amlogic/a3gen2/linux-kvim4-5.4.180.config b/board/batocera/amlogic/a3gen2/linux-kvim4-5.4.180.config similarity index 100% rename from board/amlogic/a3gen2/linux-kvim4-5.4.180.config rename to board/batocera/amlogic/a3gen2/linux-kvim4-5.4.180.config diff --git a/board/amlogic/a3gen2/linux_patches/001-fix-gcc13.patch b/board/batocera/amlogic/a3gen2/linux_patches/001-fix-gcc13.patch similarity index 100% rename from board/amlogic/a3gen2/linux_patches/001-fix-gcc13.patch rename to board/batocera/amlogic/a3gen2/linux_patches/001-fix-gcc13.patch diff --git a/board/amlogic/a3gen2/linux_patches/002-fix-Makefile.patch b/board/batocera/amlogic/a3gen2/linux_patches/002-fix-Makefile.patch similarity index 100% rename from board/amlogic/a3gen2/linux_patches/002-fix-Makefile.patch rename to board/batocera/amlogic/a3gen2/linux_patches/002-fix-Makefile.patch diff --git a/board/amlogic/a3gen2/linux_patches/003-null-Makefile-amlogic-isp_module.patch b/board/batocera/amlogic/a3gen2/linux_patches/003-null-Makefile-amlogic-isp_module.patch similarity index 100% rename from board/amlogic/a3gen2/linux_patches/003-null-Makefile-amlogic-isp_module.patch rename to board/batocera/amlogic/a3gen2/linux_patches/003-null-Makefile-amlogic-isp_module.patch diff --git a/board/amlogic/a3gen2/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch b/board/batocera/amlogic/a3gen2/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch similarity index 100% rename from board/amlogic/a3gen2/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch rename to board/batocera/amlogic/a3gen2/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch diff --git a/board/amlogic/a3gen2/patches/ffmpeg/libv4l-missing-v4l2-type-capture-type.patch b/board/batocera/amlogic/a3gen2/patches/ffmpeg/libv4l-missing-v4l2-type-capture-type.patch similarity index 100% rename from board/amlogic/a3gen2/patches/ffmpeg/libv4l-missing-v4l2-type-capture-type.patch rename to board/batocera/amlogic/a3gen2/patches/ffmpeg/libv4l-missing-v4l2-type-capture-type.patch diff --git a/board/amlogic/a3gen2/patches/new-lg4ff/force-define-config_logiwheels_ff.patch b/board/batocera/amlogic/a3gen2/patches/new-lg4ff/force-define-config_logiwheels_ff.patch similarity index 100% rename from board/amlogic/a3gen2/patches/new-lg4ff/force-define-config_logiwheels_ff.patch rename to board/batocera/amlogic/a3gen2/patches/new-lg4ff/force-define-config_logiwheels_ff.patch diff --git a/board/amlogic/a3gen2/patches/retroarch/001-fix-wayland-egl.patch b/board/batocera/amlogic/a3gen2/patches/retroarch/001-fix-wayland-egl.patch similarity index 100% rename from board/amlogic/a3gen2/patches/retroarch/001-fix-wayland-egl.patch rename to board/batocera/amlogic/a3gen2/patches/retroarch/001-fix-wayland-egl.patch diff --git a/board/amlogic/a3gen2/patches/sdl2/sdl2-fix-kmsdrm.patch b/board/batocera/amlogic/a3gen2/patches/sdl2/sdl2-fix-kmsdrm.patch similarity index 100% rename from board/amlogic/a3gen2/patches/sdl2/sdl2-fix-kmsdrm.patch rename to board/batocera/amlogic/a3gen2/patches/sdl2/sdl2-fix-kmsdrm.patch diff --git a/board/amlogic/a3gen2/patches/weston/001-libmali-fix.patch b/board/batocera/amlogic/a3gen2/patches/weston/001-libmali-fix.patch similarity index 100% rename from board/amlogic/a3gen2/patches/weston/001-libmali-fix.patch rename to board/batocera/amlogic/a3gen2/patches/weston/001-libmali-fix.patch diff --git a/board/amlogic/a3gen2/patches/weston/002-libmali-fix.patch b/board/batocera/amlogic/a3gen2/patches/weston/002-libmali-fix.patch similarity index 100% rename from board/amlogic/a3gen2/patches/weston/002-libmali-fix.patch rename to board/batocera/amlogic/a3gen2/patches/weston/002-libmali-fix.patch diff --git a/board/amlogic/a3gen2/patches/weston/003-hack-assert-drm-formats.patch b/board/batocera/amlogic/a3gen2/patches/weston/003-hack-assert-drm-formats.patch similarity index 100% rename from board/amlogic/a3gen2/patches/weston/003-hack-assert-drm-formats.patch rename to board/batocera/amlogic/a3gen2/patches/weston/003-hack-assert-drm-formats.patch diff --git a/board/amlogic/a3gen2/patches/xpad-noone/001-fix-input_device_enabled.patch b/board/batocera/amlogic/a3gen2/patches/xpad-noone/001-fix-input_device_enabled.patch similarity index 100% rename from board/amlogic/a3gen2/patches/xpad-noone/001-fix-input_device_enabled.patch rename to board/batocera/amlogic/a3gen2/patches/xpad-noone/001-fix-input_device_enabled.patch diff --git a/board/amlogic/fsoverlay/.gitkeep b/board/batocera/amlogic/fsoverlay/.gitkeep similarity index 100% rename from board/amlogic/fsoverlay/.gitkeep rename to board/batocera/amlogic/fsoverlay/.gitkeep diff --git a/board/amlogic/linux-meson64-current.config b/board/batocera/amlogic/linux-meson64-current.config similarity index 100% rename from board/amlogic/linux-meson64-current.config rename to board/batocera/amlogic/linux-meson64-current.config diff --git a/board/amlogic/linux_patches/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch b/board/batocera/amlogic/linux_patches/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch rename to board/batocera/amlogic/linux_patches/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch diff --git a/board/amlogic/linux_patches/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch b/board/batocera/amlogic/linux_patches/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch rename to board/batocera/amlogic/linux_patches/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch diff --git a/board/amlogic/linux_patches/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch b/board/batocera/amlogic/linux_patches/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch rename to board/batocera/amlogic/linux_patches/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch diff --git a/board/amlogic/linux_patches/amlogic-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch b/board/batocera/amlogic/linux_patches/amlogic-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch rename to board/batocera/amlogic/linux_patches/amlogic-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch diff --git a/board/amlogic/linux_patches/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch b/board/batocera/amlogic/linux_patches/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch rename to board/batocera/amlogic/linux_patches/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch diff --git a/board/amlogic/linux_patches/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch b/board/batocera/amlogic/linux_patches/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch rename to board/batocera/amlogic/linux_patches/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch diff --git a/board/amlogic/linux_patches/amlogic-0009-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch b/board/batocera/amlogic/linux_patches/amlogic-0009-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0009-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch rename to board/batocera/amlogic/linux_patches/amlogic-0009-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch diff --git a/board/amlogic/linux_patches/amlogic-0010-LOCAL-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch b/board/batocera/amlogic/linux_patches/amlogic-0010-LOCAL-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0010-LOCAL-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch rename to board/batocera/amlogic/linux_patches/amlogic-0010-LOCAL-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch diff --git a/board/amlogic/linux_patches/amlogic-0011-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-p2.patch b/board/batocera/amlogic/linux_patches/amlogic-0011-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-p2.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0011-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-p2.patch rename to board/batocera/amlogic/linux_patches/amlogic-0011-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-p2.patch diff --git a/board/amlogic/linux_patches/amlogic-0012-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-p2.patch b/board/batocera/amlogic/linux_patches/amlogic-0012-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-p2.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0012-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-p2.patch rename to board/batocera/amlogic/linux_patches/amlogic-0012-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-p2.patch diff --git a/board/amlogic/linux_patches/amlogic-0013-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-u2.patch b/board/batocera/amlogic/linux_patches/amlogic-0013-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-u2.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0013-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-u2.patch rename to board/batocera/amlogic/linux_patches/amlogic-0013-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-u2.patch diff --git a/board/amlogic/linux_patches/amlogic-0014-FROMGIT-6.7-arm64-dts-meson-u200-fix-spdif-output-pi.patch b/board/batocera/amlogic/linux_patches/amlogic-0014-FROMGIT-6.7-arm64-dts-meson-u200-fix-spdif-output-pi.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0014-FROMGIT-6.7-arm64-dts-meson-u200-fix-spdif-output-pi.patch rename to board/batocera/amlogic/linux_patches/amlogic-0014-FROMGIT-6.7-arm64-dts-meson-u200-fix-spdif-output-pi.patch diff --git a/board/amlogic/linux_patches/amlogic-0015-FROMGIT-6.7-arm64-dts-meson-u200-add-missing-audio-c.patch b/board/batocera/amlogic/linux_patches/amlogic-0015-FROMGIT-6.7-arm64-dts-meson-u200-add-missing-audio-c.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0015-FROMGIT-6.7-arm64-dts-meson-u200-add-missing-audio-c.patch rename to board/batocera/amlogic/linux_patches/amlogic-0015-FROMGIT-6.7-arm64-dts-meson-u200-add-missing-audio-c.patch diff --git a/board/amlogic/linux_patches/amlogic-0016-FROMGIT-6.7-arm64-dts-meson-u200-add-spdifout-b-rout.patch b/board/batocera/amlogic/linux_patches/amlogic-0016-FROMGIT-6.7-arm64-dts-meson-u200-add-spdifout-b-rout.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0016-FROMGIT-6.7-arm64-dts-meson-u200-add-spdifout-b-rout.patch rename to board/batocera/amlogic/linux_patches/amlogic-0016-FROMGIT-6.7-arm64-dts-meson-u200-add-spdifout-b-rout.patch diff --git a/board/amlogic/linux_patches/amlogic-0017-FROMGIT-6.7-arm64-dts-meson-u200-use-TDM-C-for-HDMI.patch b/board/batocera/amlogic/linux_patches/amlogic-0017-FROMGIT-6.7-arm64-dts-meson-u200-use-TDM-C-for-HDMI.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0017-FROMGIT-6.7-arm64-dts-meson-u200-use-TDM-C-for-HDMI.patch rename to board/batocera/amlogic/linux_patches/amlogic-0017-FROMGIT-6.7-arm64-dts-meson-u200-use-TDM-C-for-HDMI.patch diff --git a/board/amlogic/linux_patches/amlogic-0018-FROMGIT-6.7-arm64-dts-meson-u200-add-onboard-devices.patch b/board/batocera/amlogic/linux_patches/amlogic-0018-FROMGIT-6.7-arm64-dts-meson-u200-add-onboard-devices.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0018-FROMGIT-6.7-arm64-dts-meson-u200-add-onboard-devices.patch rename to board/batocera/amlogic/linux_patches/amlogic-0018-FROMGIT-6.7-arm64-dts-meson-u200-add-onboard-devices.patch diff --git a/board/amlogic/linux_patches/amlogic-0019-FROMGIT-6.7-arm64-dts-meson-g12-name-spdifout-consis.patch b/board/batocera/amlogic/linux_patches/amlogic-0019-FROMGIT-6.7-arm64-dts-meson-g12-name-spdifout-consis.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0019-FROMGIT-6.7-arm64-dts-meson-g12-name-spdifout-consis.patch rename to board/batocera/amlogic/linux_patches/amlogic-0019-FROMGIT-6.7-arm64-dts-meson-g12-name-spdifout-consis.patch diff --git a/board/amlogic/linux_patches/amlogic-0020-FROMGIT-6.7-ASoC-meson-axg-extend-TDM-maximum-sample.patch b/board/batocera/amlogic/linux_patches/amlogic-0020-FROMGIT-6.7-ASoC-meson-axg-extend-TDM-maximum-sample.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0020-FROMGIT-6.7-ASoC-meson-axg-extend-TDM-maximum-sample.patch rename to board/batocera/amlogic/linux_patches/amlogic-0020-FROMGIT-6.7-ASoC-meson-axg-extend-TDM-maximum-sample.patch diff --git a/board/amlogic/linux_patches/amlogic-0021-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch b/board/batocera/amlogic/linux_patches/amlogic-0021-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0021-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch rename to board/batocera/amlogic/linux_patches/amlogic-0021-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch diff --git a/board/amlogic/linux_patches/amlogic-0022-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch b/board/batocera/amlogic/linux_patches/amlogic-0022-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0022-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch rename to board/batocera/amlogic/linux_patches/amlogic-0022-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch diff --git a/board/amlogic/linux_patches/amlogic-0023-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch b/board/batocera/amlogic/linux_patches/amlogic-0023-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0023-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch rename to board/batocera/amlogic/linux_patches/amlogic-0023-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch diff --git a/board/amlogic/linux_patches/amlogic-0024-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch b/board/batocera/amlogic/linux_patches/amlogic-0024-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0024-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch rename to board/batocera/amlogic/linux_patches/amlogic-0024-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch diff --git a/board/amlogic/linux_patches/amlogic-0025-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch b/board/batocera/amlogic/linux_patches/amlogic-0025-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0025-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch rename to board/batocera/amlogic/linux_patches/amlogic-0025-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch diff --git a/board/amlogic/linux_patches/amlogic-0026-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch b/board/batocera/amlogic/linux_patches/amlogic-0026-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0026-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch rename to board/batocera/amlogic/linux_patches/amlogic-0026-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch diff --git a/board/amlogic/linux_patches/amlogic-0027-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch b/board/batocera/amlogic/linux_patches/amlogic-0027-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0027-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch rename to board/batocera/amlogic/linux_patches/amlogic-0027-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch diff --git a/board/amlogic/linux_patches/amlogic-0028-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch b/board/batocera/amlogic/linux_patches/amlogic-0028-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0028-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch rename to board/batocera/amlogic/linux_patches/amlogic-0028-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch diff --git a/board/amlogic/linux_patches/amlogic-0029-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch b/board/batocera/amlogic/linux_patches/amlogic-0029-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0029-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch rename to board/batocera/amlogic/linux_patches/amlogic-0029-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch diff --git a/board/amlogic/linux_patches/amlogic-0030-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch b/board/batocera/amlogic/linux_patches/amlogic-0030-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0030-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch rename to board/batocera/amlogic/linux_patches/amlogic-0030-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch diff --git a/board/amlogic/linux_patches/amlogic-0031-FROMLIST-v1-arm64-dts-amlogic-Used-onboard-usb-hub-r.patch b/board/batocera/amlogic/linux_patches/amlogic-0031-FROMLIST-v1-arm64-dts-amlogic-Used-onboard-usb-hub-r.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0031-FROMLIST-v1-arm64-dts-amlogic-Used-onboard-usb-hub-r.patch rename to board/batocera/amlogic/linux_patches/amlogic-0031-FROMLIST-v1-arm64-dts-amlogic-Used-onboard-usb-hub-r.patch diff --git a/board/amlogic/linux_patches/amlogic-0032-FROMLIST-v1-arm64-dts-VIM3-Set-the-rates-of-the-cloc.patch b/board/batocera/amlogic/linux_patches/amlogic-0032-FROMLIST-v1-arm64-dts-VIM3-Set-the-rates-of-the-cloc.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0032-FROMLIST-v1-arm64-dts-VIM3-Set-the-rates-of-the-cloc.patch rename to board/batocera/amlogic/linux_patches/amlogic-0032-FROMLIST-v1-arm64-dts-VIM3-Set-the-rates-of-the-cloc.patch diff --git a/board/amlogic/linux_patches/amlogic-0035-FROMLIST-v1-arm64-dts-meson-radxa-zero2-add-pwm-fan-.patch b/board/batocera/amlogic/linux_patches/amlogic-0035-FROMLIST-v1-arm64-dts-meson-radxa-zero2-add-pwm-fan-.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0035-FROMLIST-v1-arm64-dts-meson-radxa-zero2-add-pwm-fan-.patch rename to board/batocera/amlogic/linux_patches/amlogic-0035-FROMLIST-v1-arm64-dts-meson-radxa-zero2-add-pwm-fan-.patch diff --git a/board/amlogic/linux_patches/amlogic-0036-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch b/board/batocera/amlogic/linux_patches/amlogic-0036-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0036-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch rename to board/batocera/amlogic/linux_patches/amlogic-0036-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch diff --git a/board/amlogic/linux_patches/amlogic-0037-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch b/board/batocera/amlogic/linux_patches/amlogic-0037-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0037-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch rename to board/batocera/amlogic/linux_patches/amlogic-0037-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch diff --git a/board/amlogic/linux_patches/amlogic-0038-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch b/board/batocera/amlogic/linux_patches/amlogic-0038-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0038-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch rename to board/batocera/amlogic/linux_patches/amlogic-0038-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch diff --git a/board/amlogic/linux_patches/amlogic-0039-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch b/board/batocera/amlogic/linux_patches/amlogic-0039-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0039-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch rename to board/batocera/amlogic/linux_patches/amlogic-0039-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch diff --git a/board/amlogic/linux_patches/amlogic-0040-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch b/board/batocera/amlogic/linux_patches/amlogic-0040-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0040-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch rename to board/batocera/amlogic/linux_patches/amlogic-0040-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch diff --git a/board/amlogic/linux_patches/amlogic-0041-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch b/board/batocera/amlogic/linux_patches/amlogic-0041-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0041-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch rename to board/batocera/amlogic/linux_patches/amlogic-0041-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch diff --git a/board/amlogic/linux_patches/amlogic-0076-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch b/board/batocera/amlogic/linux_patches/amlogic-0076-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-0076-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch rename to board/batocera/amlogic/linux_patches/amlogic-0076-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch diff --git a/board/amlogic/linux_patches/amlogic-1000-ARMBIAN-general-meson-mmc-1-arm64-amlogic-mmc-meson-gx-Add-core-tx-rx-eMMC-SD-SD.patch b/board/batocera/amlogic/linux_patches/amlogic-1000-ARMBIAN-general-meson-mmc-1-arm64-amlogic-mmc-meson-gx-Add-core-tx-rx-eMMC-SD-SD.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-1000-ARMBIAN-general-meson-mmc-1-arm64-amlogic-mmc-meson-gx-Add-core-tx-rx-eMMC-SD-SD.patch rename to board/batocera/amlogic/linux_patches/amlogic-1000-ARMBIAN-general-meson-mmc-1-arm64-amlogic-mmc-meson-gx-Add-core-tx-rx-eMMC-SD-SD.patch diff --git a/board/amlogic/linux_patches/amlogic-1001-ARMBIAN-board-bananapim5-001-sd-use-270-mmc-clock-phase-via-dt.patch b/board/batocera/amlogic/linux_patches/amlogic-1001-ARMBIAN-board-bananapim5-001-sd-use-270-mmc-clock-phase-via-dt.patch similarity index 100% rename from board/amlogic/linux_patches/amlogic-1001-ARMBIAN-board-bananapim5-001-sd-use-270-mmc-clock-phase-via-dt.patch rename to board/batocera/amlogic/linux_patches/amlogic-1001-ARMBIAN-board-bananapim5-001-sd-use-270-mmc-clock-phase-via-dt.patch diff --git a/board/amlogic/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch b/board/batocera/amlogic/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch similarity index 100% rename from board/amlogic/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch rename to board/batocera/amlogic/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch diff --git a/board/amlogic/patches/alsa-lib/.disabled/amlogic-0001-add-AMLOGIC-HDMI-and-AMLOGIC-HDMI-SPDIF-confs.patch b/board/batocera/amlogic/patches/alsa-lib/.disabled/amlogic-0001-add-AMLOGIC-HDMI-and-AMLOGIC-HDMI-SPDIF-confs.patch similarity index 100% rename from board/amlogic/patches/alsa-lib/.disabled/amlogic-0001-add-AMLOGIC-HDMI-and-AMLOGIC-HDMI-SPDIF-confs.patch rename to board/batocera/amlogic/patches/alsa-lib/.disabled/amlogic-0001-add-AMLOGIC-HDMI-and-AMLOGIC-HDMI-SPDIF-confs.patch diff --git a/board/amlogic/patches/alsa-lib/.disabled/amlogic-0002-add-Amlogic-cards-to-Makefile.am.patch b/board/batocera/amlogic/patches/alsa-lib/.disabled/amlogic-0002-add-Amlogic-cards-to-Makefile.am.patch similarity index 100% rename from board/amlogic/patches/alsa-lib/.disabled/amlogic-0002-add-Amlogic-cards-to-Makefile.am.patch rename to board/batocera/amlogic/patches/alsa-lib/.disabled/amlogic-0002-add-Amlogic-cards-to-Makefile.am.patch diff --git a/board/amlogic/patches/alsa-lib/.disabled/amlogic-0003-add-Amlogic-cards-to-aliases.conf.patch b/board/batocera/amlogic/patches/alsa-lib/.disabled/amlogic-0003-add-Amlogic-cards-to-aliases.conf.patch similarity index 100% rename from board/amlogic/patches/alsa-lib/.disabled/amlogic-0003-add-Amlogic-cards-to-aliases.conf.patch rename to board/batocera/amlogic/patches/alsa-lib/.disabled/amlogic-0003-add-Amlogic-cards-to-aliases.conf.patch diff --git a/board/amlogic/patches/alsa-lib/amlogic-0001-conf-add-support-for-Amlogic-AIU-and-AXG-cards.patch b/board/batocera/amlogic/patches/alsa-lib/amlogic-0001-conf-add-support-for-Amlogic-AIU-and-AXG-cards.patch similarity index 100% rename from board/amlogic/patches/alsa-lib/amlogic-0001-conf-add-support-for-Amlogic-AIU-and-AXG-cards.patch rename to board/batocera/amlogic/patches/alsa-lib/amlogic-0001-conf-add-support-for-Amlogic-AIU-and-AXG-cards.patch diff --git a/board/amlogic/patches/ffmpeg/ffmpeg-0001-vf_bwdif-Add-capability-to-deinterlace-NV12.patch b/board/batocera/amlogic/patches/ffmpeg/ffmpeg-0001-vf_bwdif-Add-capability-to-deinterlace-NV12.patch similarity index 100% rename from board/amlogic/patches/ffmpeg/ffmpeg-0001-vf_bwdif-Add-capability-to-deinterlace-NV12.patch rename to board/batocera/amlogic/patches/ffmpeg/ffmpeg-0001-vf_bwdif-Add-capability-to-deinterlace-NV12.patch diff --git a/board/amlogic/patches/ffmpeg/ffmpeg-0002-v4l2_m2m_dec-Try-to-accomodate-ffmpegs-ideas-about-d.patch b/board/batocera/amlogic/patches/ffmpeg/ffmpeg-0002-v4l2_m2m_dec-Try-to-accomodate-ffmpegs-ideas-about-d.patch similarity index 100% rename from board/amlogic/patches/ffmpeg/ffmpeg-0002-v4l2_m2m_dec-Try-to-accomodate-ffmpegs-ideas-about-d.patch rename to board/batocera/amlogic/patches/ffmpeg/ffmpeg-0002-v4l2_m2m_dec-Try-to-accomodate-ffmpegs-ideas-about-d.patch diff --git a/board/amlogic/patches/ffmpeg/ffmpeg-0003-v4l2_m2m_dec-Fix-cma-allocated-s-w-output.patch b/board/batocera/amlogic/patches/ffmpeg/ffmpeg-0003-v4l2_m2m_dec-Fix-cma-allocated-s-w-output.patch similarity index 100% rename from board/amlogic/patches/ffmpeg/ffmpeg-0003-v4l2_m2m_dec-Fix-cma-allocated-s-w-output.patch rename to board/batocera/amlogic/patches/ffmpeg/ffmpeg-0003-v4l2_m2m_dec-Fix-cma-allocated-s-w-output.patch diff --git a/board/amlogic/patches/ffmpeg/ffmpeg-0004-v4l2_req-Fix-media-pool-delete-race.patch b/board/batocera/amlogic/patches/ffmpeg/ffmpeg-0004-v4l2_req-Fix-media-pool-delete-race.patch similarity index 100% rename from board/amlogic/patches/ffmpeg/ffmpeg-0004-v4l2_req-Fix-media-pool-delete-race.patch rename to board/batocera/amlogic/patches/ffmpeg/ffmpeg-0004-v4l2_req-Fix-media-pool-delete-race.patch diff --git a/board/amlogic/patches/ffmpeg/ffmpeg-0005-drm_vout-Fix-connector-etc.-desc-memory-leak.patch b/board/batocera/amlogic/patches/ffmpeg/ffmpeg-0005-drm_vout-Fix-connector-etc.-desc-memory-leak.patch similarity index 100% rename from board/amlogic/patches/ffmpeg/ffmpeg-0005-drm_vout-Fix-connector-etc.-desc-memory-leak.patch rename to board/batocera/amlogic/patches/ffmpeg/ffmpeg-0005-drm_vout-Fix-connector-etc.-desc-memory-leak.patch diff --git a/board/amlogic/patches/ffmpeg/ffmpeg-0006-conf_native-Add-tsan-option.patch b/board/batocera/amlogic/patches/ffmpeg/ffmpeg-0006-conf_native-Add-tsan-option.patch similarity index 100% rename from board/amlogic/patches/ffmpeg/ffmpeg-0006-conf_native-Add-tsan-option.patch rename to board/batocera/amlogic/patches/ffmpeg/ffmpeg-0006-conf_native-Add-tsan-option.patch diff --git a/board/amlogic/patches/ffmpeg/ffmpeg-0007-v4l2_m2m-Rework-use-of-ctx-lock-to-avoid-use-while-u.patch b/board/batocera/amlogic/patches/ffmpeg/ffmpeg-0007-v4l2_m2m-Rework-use-of-ctx-lock-to-avoid-use-while-u.patch similarity index 100% rename from board/amlogic/patches/ffmpeg/ffmpeg-0007-v4l2_m2m-Rework-use-of-ctx-lock-to-avoid-use-while-u.patch rename to board/batocera/amlogic/patches/ffmpeg/ffmpeg-0007-v4l2_m2m-Rework-use-of-ctx-lock-to-avoid-use-while-u.patch diff --git a/board/amlogic/patches/ffmpeg/ffmpeg-0008-matroskaenc-Fix-H264-delayed-extradata-creation.patch b/board/batocera/amlogic/patches/ffmpeg/ffmpeg-0008-matroskaenc-Fix-H264-delayed-extradata-creation.patch similarity index 100% rename from board/amlogic/patches/ffmpeg/ffmpeg-0008-matroskaenc-Fix-H264-delayed-extradata-creation.patch rename to board/batocera/amlogic/patches/ffmpeg/ffmpeg-0008-matroskaenc-Fix-H264-delayed-extradata-creation.patch diff --git a/board/amlogic/patches/ffmpeg/ffmpeg-0009-matroskaenc-Assume-H264-is-Annex-B-if-no-extradata.patch b/board/batocera/amlogic/patches/ffmpeg/ffmpeg-0009-matroskaenc-Assume-H264-is-Annex-B-if-no-extradata.patch similarity index 100% rename from board/amlogic/patches/ffmpeg/ffmpeg-0009-matroskaenc-Assume-H264-is-Annex-B-if-no-extradata.patch rename to board/batocera/amlogic/patches/ffmpeg/ffmpeg-0009-matroskaenc-Assume-H264-is-Annex-B-if-no-extradata.patch diff --git a/board/amlogic/patches/ffmpeg/ffmpeg-0010-aarch64-rgb2rgb-Change-incorrect-SXTX-to-stxw.patch b/board/batocera/amlogic/patches/ffmpeg/ffmpeg-0010-aarch64-rgb2rgb-Change-incorrect-SXTX-to-stxw.patch similarity index 100% rename from board/amlogic/patches/ffmpeg/ffmpeg-0010-aarch64-rgb2rgb-Change-incorrect-SXTX-to-stxw.patch rename to board/batocera/amlogic/patches/ffmpeg/ffmpeg-0010-aarch64-rgb2rgb-Change-incorrect-SXTX-to-stxw.patch diff --git a/board/amlogic/patches/ffmpeg/ffmpeg-0011-aarch64-rpi_sand-Fix-building-under-Clang-LLVM.patch b/board/batocera/amlogic/patches/ffmpeg/ffmpeg-0011-aarch64-rpi_sand-Fix-building-under-Clang-LLVM.patch similarity index 100% rename from board/amlogic/patches/ffmpeg/ffmpeg-0011-aarch64-rpi_sand-Fix-building-under-Clang-LLVM.patch rename to board/batocera/amlogic/patches/ffmpeg/ffmpeg-0011-aarch64-rpi_sand-Fix-building-under-Clang-LLVM.patch diff --git a/board/amlogic/patches/ffmpeg/ffmpeg-0012-rtpenc-Fix-building-with-GCC-14.patch b/board/batocera/amlogic/patches/ffmpeg/ffmpeg-0012-rtpenc-Fix-building-with-GCC-14.patch similarity index 100% rename from board/amlogic/patches/ffmpeg/ffmpeg-0012-rtpenc-Fix-building-with-GCC-14.patch rename to board/batocera/amlogic/patches/ffmpeg/ffmpeg-0012-rtpenc-Fix-building-with-GCC-14.patch diff --git a/board/amlogic/patches/ffmpeg/ffmpeg-0013-v4l2_req-Fix-building-against-musl-by-including-pthr.patch b/board/batocera/amlogic/patches/ffmpeg/ffmpeg-0013-v4l2_req-Fix-building-against-musl-by-including-pthr.patch similarity index 100% rename from board/amlogic/patches/ffmpeg/ffmpeg-0013-v4l2_req-Fix-building-against-musl-by-including-pthr.patch rename to board/batocera/amlogic/patches/ffmpeg/ffmpeg-0013-v4l2_req-Fix-building-against-musl-by-including-pthr.patch diff --git a/board/amlogic/patches/ffmpeg/ffmpeg-0014-v4l2_buffers-Fix-init-of-drmprime-source-OUTPUT-buff.patch b/board/batocera/amlogic/patches/ffmpeg/ffmpeg-0014-v4l2_buffers-Fix-init-of-drmprime-source-OUTPUT-buff.patch similarity index 100% rename from board/amlogic/patches/ffmpeg/ffmpeg-0014-v4l2_buffers-Fix-init-of-drmprime-source-OUTPUT-buff.patch rename to board/batocera/amlogic/patches/ffmpeg/ffmpeg-0014-v4l2_buffers-Fix-init-of-drmprime-source-OUTPUT-buff.patch diff --git a/board/amlogic/patches/sugarbox/001-gles.patch b/board/batocera/amlogic/patches/sugarbox/001-gles.patch similarity index 100% rename from board/amlogic/patches/sugarbox/001-gles.patch rename to board/batocera/amlogic/patches/sugarbox/001-gles.patch diff --git a/board/amlogic/patches/switchres/001-relax-kmsdrm.patch b/board/batocera/amlogic/patches/switchres/001-relax-kmsdrm.patch similarity index 100% rename from board/amlogic/patches/switchres/001-relax-kmsdrm.patch rename to board/batocera/amlogic/patches/switchres/001-relax-kmsdrm.patch diff --git a/board/amlogic/s812/boot/aml_autoscript.scr b/board/batocera/amlogic/s812/boot/aml_autoscript.scr similarity index 100% rename from board/amlogic/s812/boot/aml_autoscript.scr rename to board/batocera/amlogic/s812/boot/aml_autoscript.scr diff --git a/board/amlogic/s812/boot/aml_autoscript.zip b/board/batocera/amlogic/s812/boot/aml_autoscript.zip similarity index 100% rename from board/amlogic/s812/boot/aml_autoscript.zip rename to board/batocera/amlogic/s812/boot/aml_autoscript.zip diff --git a/board/amlogic/s812/boot/s805_autoscript.cmd b/board/batocera/amlogic/s812/boot/s805_autoscript.cmd similarity index 100% rename from board/amlogic/s812/boot/s805_autoscript.cmd rename to board/batocera/amlogic/s812/boot/s805_autoscript.cmd diff --git a/board/amlogic/s812/boot/uEnv.txt b/board/batocera/amlogic/s812/boot/uEnv.txt similarity index 100% rename from board/amlogic/s812/boot/uEnv.txt rename to board/batocera/amlogic/s812/boot/uEnv.txt diff --git a/board/amlogic/s812/create-boot-script.sh b/board/batocera/amlogic/s812/create-boot-script.sh similarity index 100% rename from board/amlogic/s812/create-boot-script.sh rename to board/batocera/amlogic/s812/create-boot-script.sh diff --git a/board/amlogic/s812/fsoverlay/etc/asound.conf b/board/batocera/amlogic/s812/fsoverlay/etc/asound.conf similarity index 100% rename from board/amlogic/s812/fsoverlay/etc/asound.conf rename to board/batocera/amlogic/s812/fsoverlay/etc/asound.conf diff --git a/board/amlogic/s812/fsoverlay/usr/bin/cputemp b/board/batocera/amlogic/s812/fsoverlay/usr/bin/cputemp similarity index 100% rename from board/amlogic/s812/fsoverlay/usr/bin/cputemp rename to board/batocera/amlogic/s812/fsoverlay/usr/bin/cputemp diff --git a/board/amlogic/s812/fsoverlay/usr/bin/gputemp b/board/batocera/amlogic/s812/fsoverlay/usr/bin/gputemp similarity index 100% rename from board/amlogic/s812/fsoverlay/usr/bin/gputemp rename to board/batocera/amlogic/s812/fsoverlay/usr/bin/gputemp diff --git a/board/amlogic/s812/fsoverlay/usr/share/alsa/cards/HDMI.conf b/board/batocera/amlogic/s812/fsoverlay/usr/share/alsa/cards/HDMI.conf similarity index 100% rename from board/amlogic/s812/fsoverlay/usr/share/alsa/cards/HDMI.conf rename to board/batocera/amlogic/s812/fsoverlay/usr/share/alsa/cards/HDMI.conf diff --git a/board/amlogic/s812/genimage.cfg b/board/batocera/amlogic/s812/genimage.cfg similarity index 100% rename from board/amlogic/s812/genimage.cfg rename to board/batocera/amlogic/s812/genimage.cfg diff --git a/board/amlogic/s812/linux-defconfig-fragment.config b/board/batocera/amlogic/s812/linux-defconfig-fragment.config similarity index 100% rename from board/amlogic/s812/linux-defconfig-fragment.config rename to board/batocera/amlogic/s812/linux-defconfig-fragment.config diff --git a/board/amlogic/s812/linux-defconfig.config b/board/batocera/amlogic/s812/linux-defconfig.config similarity index 100% rename from board/amlogic/s812/linux-defconfig.config rename to board/batocera/amlogic/s812/linux-defconfig.config diff --git a/board/amlogic/s812/linux_patches/need rebase/0123-S812-S802-remote-audio-routing.disable b/board/batocera/amlogic/s812/linux_patches/need rebase/0123-S812-S802-remote-audio-routing.disable similarity index 100% rename from board/amlogic/s812/linux_patches/need rebase/0123-S812-S802-remote-audio-routing.disable rename to board/batocera/amlogic/s812/linux_patches/need rebase/0123-S812-S802-remote-audio-routing.disable diff --git a/board/amlogic/s812/linux_patches/need rebase/1001-acemax.disable b/board/batocera/amlogic/s812/linux_patches/need rebase/1001-acemax.disable similarity index 100% rename from board/amlogic/s812/linux_patches/need rebase/1001-acemax.disable rename to board/batocera/amlogic/s812/linux_patches/need rebase/1001-acemax.disable diff --git a/board/amlogic/s812/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch b/board/batocera/amlogic/s812/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch similarity index 100% rename from board/amlogic/s812/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch rename to board/batocera/amlogic/s812/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch diff --git a/board/amlogic/s812/patches/alsa-lib/amlogic-0001-add-AMLOGIC-HDMI-and-AMLOGIC-HDMI-SPDIF-confs.patch b/board/batocera/amlogic/s812/patches/alsa-lib/amlogic-0001-add-AMLOGIC-HDMI-and-AMLOGIC-HDMI-SPDIF-confs.patch similarity index 100% rename from board/amlogic/s812/patches/alsa-lib/amlogic-0001-add-AMLOGIC-HDMI-and-AMLOGIC-HDMI-SPDIF-confs.patch rename to board/batocera/amlogic/s812/patches/alsa-lib/amlogic-0001-add-AMLOGIC-HDMI-and-AMLOGIC-HDMI-SPDIF-confs.patch diff --git a/board/amlogic/s812/patches/alsa-lib/amlogic-0002-add-Amlogic-cards-to-Makefile.am.patch b/board/batocera/amlogic/s812/patches/alsa-lib/amlogic-0002-add-Amlogic-cards-to-Makefile.am.patch similarity index 100% rename from board/amlogic/s812/patches/alsa-lib/amlogic-0002-add-Amlogic-cards-to-Makefile.am.patch rename to board/batocera/amlogic/s812/patches/alsa-lib/amlogic-0002-add-Amlogic-cards-to-Makefile.am.patch diff --git a/board/amlogic/s812/patches/alsa-lib/amlogic-0003-add-Amlogic-cards-to-aliases.conf.patch b/board/batocera/amlogic/s812/patches/alsa-lib/amlogic-0003-add-Amlogic-cards-to-aliases.conf.patch similarity index 100% rename from board/amlogic/s812/patches/alsa-lib/amlogic-0003-add-Amlogic-cards-to-aliases.conf.patch rename to board/batocera/amlogic/s812/patches/alsa-lib/amlogic-0003-add-Amlogic-cards-to-aliases.conf.patch diff --git a/board/amlogic/s812/patches/ppsspp/001-eglx11.patch b/board/batocera/amlogic/s812/patches/ppsspp/001-eglx11.patch similarity index 100% rename from board/amlogic/s812/patches/ppsspp/001-eglx11.patch rename to board/batocera/amlogic/s812/patches/ppsspp/001-eglx11.patch diff --git a/board/amlogic/s812/patches/ppsspp/002-force-gles20-lima.patch b/board/batocera/amlogic/s812/patches/ppsspp/002-force-gles20-lima.patch similarity index 100% rename from board/amlogic/s812/patches/ppsspp/002-force-gles20-lima.patch rename to board/batocera/amlogic/s812/patches/ppsspp/002-force-gles20-lima.patch diff --git a/board/amlogic/s905/fsoverlay/etc/asound.conf b/board/batocera/amlogic/s905/fsoverlay/etc/asound.conf similarity index 100% rename from board/amlogic/s905/fsoverlay/etc/asound.conf rename to board/batocera/amlogic/s905/fsoverlay/etc/asound.conf diff --git a/board/amlogic/s905/fsoverlay/usr/bin/cputemp b/board/batocera/amlogic/s905/fsoverlay/usr/bin/cputemp similarity index 100% rename from board/amlogic/s905/fsoverlay/usr/bin/cputemp rename to board/batocera/amlogic/s905/fsoverlay/usr/bin/cputemp diff --git a/board/amlogic/s905/fsoverlay/usr/bin/gputemp b/board/batocera/amlogic/s905/fsoverlay/usr/bin/gputemp similarity index 100% rename from board/amlogic/s905/fsoverlay/usr/bin/gputemp rename to board/batocera/amlogic/s905/fsoverlay/usr/bin/gputemp diff --git a/board/amlogic/s905/fsoverlay/usr/share/alsa/cards/HDMI.conf b/board/batocera/amlogic/s905/fsoverlay/usr/share/alsa/cards/HDMI.conf similarity index 100% rename from board/amlogic/s905/fsoverlay/usr/share/alsa/cards/HDMI.conf rename to board/batocera/amlogic/s905/fsoverlay/usr/share/alsa/cards/HDMI.conf diff --git a/board/amlogic/s905/fun-r1/boot/README.txt b/board/batocera/amlogic/s905/fun-r1/boot/README.txt similarity index 100% rename from board/amlogic/s905/fun-r1/boot/README.txt rename to board/batocera/amlogic/s905/fun-r1/boot/README.txt diff --git a/board/amlogic/s905/fun-r1/boot/aml_autoscript.txt b/board/batocera/amlogic/s905/fun-r1/boot/aml_autoscript.txt similarity index 100% rename from board/amlogic/s905/fun-r1/boot/aml_autoscript.txt rename to board/batocera/amlogic/s905/fun-r1/boot/aml_autoscript.txt diff --git a/board/amlogic/s905/fun-r1/boot/aml_autoscript.zip b/board/batocera/amlogic/s905/fun-r1/boot/aml_autoscript.zip similarity index 100% rename from board/amlogic/s905/fun-r1/boot/aml_autoscript.zip rename to board/batocera/amlogic/s905/fun-r1/boot/aml_autoscript.zip diff --git a/board/amlogic/s905/fun-r1/boot/boot-logo.bmp.gz b/board/batocera/amlogic/s905/fun-r1/boot/boot-logo.bmp.gz similarity index 100% rename from board/amlogic/s905/fun-r1/boot/boot-logo.bmp.gz rename to board/batocera/amlogic/s905/fun-r1/boot/boot-logo.bmp.gz diff --git a/board/amlogic/s905/fun-r1/boot/s905_autoscript.txt b/board/batocera/amlogic/s905/fun-r1/boot/s905_autoscript.txt similarity index 100% rename from board/amlogic/s905/fun-r1/boot/s905_autoscript.txt rename to board/batocera/amlogic/s905/fun-r1/boot/s905_autoscript.txt diff --git a/board/amlogic/s905/fun-r1/boot/uEnv.txt b/board/batocera/amlogic/s905/fun-r1/boot/uEnv.txt similarity index 100% rename from board/amlogic/s905/fun-r1/boot/uEnv.txt rename to board/batocera/amlogic/s905/fun-r1/boot/uEnv.txt diff --git a/board/amlogic/s905/fun-r1/create-boot-script.sh b/board/batocera/amlogic/s905/fun-r1/create-boot-script.sh similarity index 100% rename from board/amlogic/s905/fun-r1/create-boot-script.sh rename to board/batocera/amlogic/s905/fun-r1/create-boot-script.sh diff --git a/board/amlogic/s905/fun-r1/genimage.cfg b/board/batocera/amlogic/s905/fun-r1/genimage.cfg similarity index 100% rename from board/amlogic/s905/fun-r1/genimage.cfg rename to board/batocera/amlogic/s905/fun-r1/genimage.cfg diff --git a/board/amlogic/s905/khadas-vim1/boot/aml_autoscript b/board/batocera/amlogic/s905/khadas-vim1/boot/aml_autoscript similarity index 100% rename from board/amlogic/s905/khadas-vim1/boot/aml_autoscript rename to board/batocera/amlogic/s905/khadas-vim1/boot/aml_autoscript diff --git a/board/amlogic/s905/khadas-vim1/boot/aml_autoscript.txt b/board/batocera/amlogic/s905/khadas-vim1/boot/aml_autoscript.txt similarity index 100% rename from board/amlogic/s905/khadas-vim1/boot/aml_autoscript.txt rename to board/batocera/amlogic/s905/khadas-vim1/boot/aml_autoscript.txt diff --git a/board/amlogic/s905/khadas-vim1/boot/aml_autoscript.zip b/board/batocera/amlogic/s905/khadas-vim1/boot/aml_autoscript.zip similarity index 100% rename from board/amlogic/s905/khadas-vim1/boot/aml_autoscript.zip rename to board/batocera/amlogic/s905/khadas-vim1/boot/aml_autoscript.zip diff --git a/board/amlogic/s905/khadas-vim1/boot/boot.ini b/board/batocera/amlogic/s905/khadas-vim1/boot/boot.ini similarity index 100% rename from board/amlogic/s905/khadas-vim1/boot/boot.ini rename to board/batocera/amlogic/s905/khadas-vim1/boot/boot.ini diff --git a/board/amlogic/s905/khadas-vim1/boot/boot.scr b/board/batocera/amlogic/s905/khadas-vim1/boot/boot.scr similarity index 100% rename from board/amlogic/s905/khadas-vim1/boot/boot.scr rename to board/batocera/amlogic/s905/khadas-vim1/boot/boot.scr diff --git a/board/amlogic/s905/khadas-vim1/boot/extlinux.conf b/board/batocera/amlogic/s905/khadas-vim1/boot/extlinux.conf similarity index 100% rename from board/amlogic/s905/khadas-vim1/boot/extlinux.conf rename to board/batocera/amlogic/s905/khadas-vim1/boot/extlinux.conf diff --git a/board/amlogic/s905/khadas-vim1/boot/s905_autoscript b/board/batocera/amlogic/s905/khadas-vim1/boot/s905_autoscript similarity index 100% rename from board/amlogic/s905/khadas-vim1/boot/s905_autoscript rename to board/batocera/amlogic/s905/khadas-vim1/boot/s905_autoscript diff --git a/board/amlogic/s905/khadas-vim1/boot/s905_autoscript.cmd b/board/batocera/amlogic/s905/khadas-vim1/boot/s905_autoscript.cmd similarity index 100% rename from board/amlogic/s905/khadas-vim1/boot/s905_autoscript.cmd rename to board/batocera/amlogic/s905/khadas-vim1/boot/s905_autoscript.cmd diff --git a/board/amlogic/s905/khadas-vim1/build-uboot.sh b/board/batocera/amlogic/s905/khadas-vim1/build-uboot.sh similarity index 89% rename from board/amlogic/s905/khadas-vim1/build-uboot.sh rename to board/batocera/amlogic/s905/khadas-vim1/build-uboot.sh index ac627e44fb9..cef7635baec 100755 --- a/board/amlogic/s905/khadas-vim1/build-uboot.sh +++ b/board/batocera/amlogic/s905/khadas-vim1/build-uboot.sh @@ -10,7 +10,7 @@ tar xf u-boot-2023.01.tar.bz2 cd u-boot-2023.01 # Apply patches -PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/amlogic/s905/patches/uboot/*.patch" +PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/batocera/amlogic/s905/patches/uboot/*.patch" for patch in $PATCHES do echo "Applying patch: $patch" diff --git a/board/amlogic/s905/khadas-vim1/create-boot-script.sh b/board/batocera/amlogic/s905/khadas-vim1/create-boot-script.sh similarity index 100% rename from board/amlogic/s905/khadas-vim1/create-boot-script.sh rename to board/batocera/amlogic/s905/khadas-vim1/create-boot-script.sh diff --git a/board/amlogic/s905/khadas-vim1/genimage.cfg b/board/batocera/amlogic/s905/khadas-vim1/genimage.cfg similarity index 100% rename from board/amlogic/s905/khadas-vim1/genimage.cfg rename to board/batocera/amlogic/s905/khadas-vim1/genimage.cfg diff --git a/board/amlogic/s905/lepotato-v2/boot/extlinux.conf b/board/batocera/amlogic/s905/lepotato-v2/boot/extlinux.conf similarity index 100% rename from board/amlogic/s905/lepotato-v2/boot/extlinux.conf rename to board/batocera/amlogic/s905/lepotato-v2/boot/extlinux.conf diff --git a/board/amlogic/s905/lepotato-v2/build-uboot.sh b/board/batocera/amlogic/s905/lepotato-v2/build-uboot.sh similarity index 100% rename from board/amlogic/s905/lepotato-v2/build-uboot.sh rename to board/batocera/amlogic/s905/lepotato-v2/build-uboot.sh diff --git a/board/amlogic/s905/lepotato-v2/create-boot-script.sh b/board/batocera/amlogic/s905/lepotato-v2/create-boot-script.sh similarity index 100% rename from board/amlogic/s905/lepotato-v2/create-boot-script.sh rename to board/batocera/amlogic/s905/lepotato-v2/create-boot-script.sh diff --git a/board/amlogic/s905/lepotato-v2/genimage.cfg b/board/batocera/amlogic/s905/lepotato-v2/genimage.cfg similarity index 100% rename from board/amlogic/s905/lepotato-v2/genimage.cfg rename to board/batocera/amlogic/s905/lepotato-v2/genimage.cfg diff --git a/board/amlogic/s905/lepotato/boot/extlinux.conf b/board/batocera/amlogic/s905/lepotato/boot/extlinux.conf similarity index 100% rename from board/amlogic/s905/lepotato/boot/extlinux.conf rename to board/batocera/amlogic/s905/lepotato/boot/extlinux.conf diff --git a/board/amlogic/s905/lepotato/build-uboot.sh b/board/batocera/amlogic/s905/lepotato/build-uboot.sh similarity index 88% rename from board/amlogic/s905/lepotato/build-uboot.sh rename to board/batocera/amlogic/s905/lepotato/build-uboot.sh index 5c175391ba9..4ad0ca664c4 100755 --- a/board/amlogic/s905/lepotato/build-uboot.sh +++ b/board/batocera/amlogic/s905/lepotato/build-uboot.sh @@ -10,7 +10,7 @@ tar xf u-boot-2023.01.tar.bz2 cd u-boot-2023.01 # Apply patches -PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/amlogic/s905/patches/uboot/*.patch" +PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/batocera/amlogic/s905/patches/uboot/*.patch" for patch in $PATCHES do echo "Applying patch: $patch" diff --git a/board/amlogic/s905/lepotato/create-boot-script.sh b/board/batocera/amlogic/s905/lepotato/create-boot-script.sh similarity index 100% rename from board/amlogic/s905/lepotato/create-boot-script.sh rename to board/batocera/amlogic/s905/lepotato/create-boot-script.sh diff --git a/board/amlogic/s905/lepotato/genimage.cfg b/board/batocera/amlogic/s905/lepotato/genimage.cfg similarity index 100% rename from board/amlogic/s905/lepotato/genimage.cfg rename to board/batocera/amlogic/s905/lepotato/genimage.cfg diff --git a/board/amlogic/s905/linux-defconfig-fragment.config b/board/batocera/amlogic/s905/linux-defconfig-fragment.config similarity index 100% rename from board/amlogic/s905/linux-defconfig-fragment.config rename to board/batocera/amlogic/s905/linux-defconfig-fragment.config diff --git a/board/amlogic/s905/minix-neo-u1/boot/extlinux.conf b/board/batocera/amlogic/s905/minix-neo-u1/boot/extlinux.conf similarity index 100% rename from board/amlogic/s905/minix-neo-u1/boot/extlinux.conf rename to board/batocera/amlogic/s905/minix-neo-u1/boot/extlinux.conf diff --git a/board/amlogic/s905/minix-neo-u1/build-uboot.sh b/board/batocera/amlogic/s905/minix-neo-u1/build-uboot.sh similarity index 88% rename from board/amlogic/s905/minix-neo-u1/build-uboot.sh rename to board/batocera/amlogic/s905/minix-neo-u1/build-uboot.sh index 1c817f2693c..6737494f39a 100755 --- a/board/amlogic/s905/minix-neo-u1/build-uboot.sh +++ b/board/batocera/amlogic/s905/minix-neo-u1/build-uboot.sh @@ -10,7 +10,7 @@ tar xf u-boot-2023.01.tar.bz2 cd u-boot-2023.01 # Apply patches -PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/amlogic/s905/patches/uboot/*.patch" +PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/batocera/amlogic/s905/patches/uboot/*.patch" for patch in $PATCHES do echo "Applying patch: $patch" diff --git a/board/amlogic/s905/minix-neo-u1/create-boot-script.sh b/board/batocera/amlogic/s905/minix-neo-u1/create-boot-script.sh similarity index 100% rename from board/amlogic/s905/minix-neo-u1/create-boot-script.sh rename to board/batocera/amlogic/s905/minix-neo-u1/create-boot-script.sh diff --git a/board/amlogic/s905/minix-neo-u1/genimage.cfg b/board/batocera/amlogic/s905/minix-neo-u1/genimage.cfg similarity index 100% rename from board/amlogic/s905/minix-neo-u1/genimage.cfg rename to board/batocera/amlogic/s905/minix-neo-u1/genimage.cfg diff --git a/board/amlogic/s905/nanopi-k2/boot/extlinux.conf b/board/batocera/amlogic/s905/nanopi-k2/boot/extlinux.conf similarity index 100% rename from board/amlogic/s905/nanopi-k2/boot/extlinux.conf rename to board/batocera/amlogic/s905/nanopi-k2/boot/extlinux.conf diff --git a/board/amlogic/s905/nanopi-k2/build-uboot.sh b/board/batocera/amlogic/s905/nanopi-k2/build-uboot.sh similarity index 88% rename from board/amlogic/s905/nanopi-k2/build-uboot.sh rename to board/batocera/amlogic/s905/nanopi-k2/build-uboot.sh index d5456a6f6c3..86aa884a01f 100755 --- a/board/amlogic/s905/nanopi-k2/build-uboot.sh +++ b/board/batocera/amlogic/s905/nanopi-k2/build-uboot.sh @@ -10,7 +10,7 @@ tar xf u-boot-2023.01.tar.bz2 cd u-boot-2023.01 # Apply patches -PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/amlogic/s905/patches/uboot/*.patch" +PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/batocera/amlogic/s905/patches/uboot/*.patch" for patch in $PATCHES do echo "Applying patch: $patch" diff --git a/board/amlogic/s905/nanopi-k2/create-boot-script.sh b/board/batocera/amlogic/s905/nanopi-k2/create-boot-script.sh similarity index 100% rename from board/amlogic/s905/nanopi-k2/create-boot-script.sh rename to board/batocera/amlogic/s905/nanopi-k2/create-boot-script.sh diff --git a/board/amlogic/s905/nanopi-k2/genimage.cfg b/board/batocera/amlogic/s905/nanopi-k2/genimage.cfg similarity index 100% rename from board/amlogic/s905/nanopi-k2/genimage.cfg rename to board/batocera/amlogic/s905/nanopi-k2/genimage.cfg diff --git a/board/amlogic/s905/odroid-c2/boot/extlinux.conf b/board/batocera/amlogic/s905/odroid-c2/boot/extlinux.conf similarity index 100% rename from board/amlogic/s905/odroid-c2/boot/extlinux.conf rename to board/batocera/amlogic/s905/odroid-c2/boot/extlinux.conf diff --git a/board/amlogic/s905/odroid-c2/build-uboot.sh b/board/batocera/amlogic/s905/odroid-c2/build-uboot.sh similarity index 88% rename from board/amlogic/s905/odroid-c2/build-uboot.sh rename to board/batocera/amlogic/s905/odroid-c2/build-uboot.sh index e48f72e80c8..aca3ad7130e 100755 --- a/board/amlogic/s905/odroid-c2/build-uboot.sh +++ b/board/batocera/amlogic/s905/odroid-c2/build-uboot.sh @@ -10,7 +10,7 @@ tar xf u-boot-2023.01.tar.bz2 cd u-boot-2023.01 # Apply patches -PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/amlogic/s905/patches/uboot/*.patch" +PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/batocera/amlogic/s905/patches/uboot/*.patch" for patch in $PATCHES do echo "Applying patch: $patch" diff --git a/board/amlogic/s905/odroid-c2/create-boot-script.sh b/board/batocera/amlogic/s905/odroid-c2/create-boot-script.sh similarity index 100% rename from board/amlogic/s905/odroid-c2/create-boot-script.sh rename to board/batocera/amlogic/s905/odroid-c2/create-boot-script.sh diff --git a/board/amlogic/s905/odroid-c2/genimage.cfg b/board/batocera/amlogic/s905/odroid-c2/genimage.cfg similarity index 100% rename from board/amlogic/s905/odroid-c2/genimage.cfg rename to board/batocera/amlogic/s905/odroid-c2/genimage.cfg diff --git a/board/amlogic/s905/p201/boot/extlinux.conf b/board/batocera/amlogic/s905/p201/boot/extlinux.conf similarity index 100% rename from board/amlogic/s905/p201/boot/extlinux.conf rename to board/batocera/amlogic/s905/p201/boot/extlinux.conf diff --git a/board/amlogic/s905/p201/build-uboot.sh b/board/batocera/amlogic/s905/p201/build-uboot.sh similarity index 88% rename from board/amlogic/s905/p201/build-uboot.sh rename to board/batocera/amlogic/s905/p201/build-uboot.sh index caa985f3ee9..1a21cd862f9 100755 --- a/board/amlogic/s905/p201/build-uboot.sh +++ b/board/batocera/amlogic/s905/p201/build-uboot.sh @@ -10,7 +10,7 @@ tar xf u-boot-2023.01.tar.bz2 cd u-boot-2023.01 # Apply patches -PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/amlogic/s905/patches/uboot/*.patch" +PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/batocera/amlogic/s905/patches/uboot/*.patch" for patch in $PATCHES do echo "Applying patch: $patch" diff --git a/board/amlogic/s905/p201/create-boot-script.sh b/board/batocera/amlogic/s905/p201/create-boot-script.sh similarity index 100% rename from board/amlogic/s905/p201/create-boot-script.sh rename to board/batocera/amlogic/s905/p201/create-boot-script.sh diff --git a/board/amlogic/s905/p201/genimage.cfg b/board/batocera/amlogic/s905/p201/genimage.cfg similarity index 100% rename from board/amlogic/s905/p201/genimage.cfg rename to board/batocera/amlogic/s905/p201/genimage.cfg diff --git a/board/amlogic/s905/patches/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-aarch64-render.patch b/board/batocera/amlogic/s905/patches/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-aarch64-render.patch similarity index 100% rename from board/amlogic/s905/patches/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-aarch64-render.patch rename to board/batocera/amlogic/s905/patches/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-aarch64-render.patch diff --git a/board/amlogic/s905/patches/ppsspp/001-eglx11.patch b/board/batocera/amlogic/s905/patches/ppsspp/001-eglx11.patch similarity index 100% rename from board/amlogic/s905/patches/ppsspp/001-eglx11.patch rename to board/batocera/amlogic/s905/patches/ppsspp/001-eglx11.patch diff --git a/board/amlogic/s905/patches/ppsspp/002-force-gles20-lima.patch b/board/batocera/amlogic/s905/patches/ppsspp/002-force-gles20-lima.patch similarity index 100% rename from board/amlogic/s905/patches/ppsspp/002-force-gles20-lima.patch rename to board/batocera/amlogic/s905/patches/ppsspp/002-force-gles20-lima.patch diff --git a/board/amlogic/s905/patches/uboot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on.patch b/board/batocera/amlogic/s905/patches/uboot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on.patch similarity index 100% rename from board/amlogic/s905/patches/uboot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on.patch rename to board/batocera/amlogic/s905/patches/uboot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on.patch diff --git a/board/amlogic/s905/patches/uboot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch b/board/batocera/amlogic/s905/patches/uboot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch similarity index 100% rename from board/amlogic/s905/patches/uboot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch rename to board/batocera/amlogic/s905/patches/uboot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch diff --git a/board/amlogic/s905/patches/uboot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch b/board/batocera/amlogic/s905/patches/uboot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch similarity index 100% rename from board/amlogic/s905/patches/uboot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch rename to board/batocera/amlogic/s905/patches/uboot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch diff --git a/board/amlogic/s905/patches/uboot/u-boot-0004-WIP-ARM-dts-import-WeTek-Hub-Play2-DTs-from-Linux-5..patch b/board/batocera/amlogic/s905/patches/uboot/u-boot-0004-WIP-ARM-dts-import-WeTek-Hub-Play2-DTs-from-Linux-5..patch similarity index 100% rename from board/amlogic/s905/patches/uboot/u-boot-0004-WIP-ARM-dts-import-WeTek-Hub-Play2-DTs-from-Linux-5..patch rename to board/batocera/amlogic/s905/patches/uboot/u-boot-0004-WIP-ARM-dts-import-WeTek-Hub-Play2-DTs-from-Linux-5..patch diff --git a/board/amlogic/s905/patches/uboot/u-boot-0005-WIP-ARM-dts-use-snps-reset-on-WeTek-devices-to-fix-E.patch b/board/batocera/amlogic/s905/patches/uboot/u-boot-0005-WIP-ARM-dts-use-snps-reset-on-WeTek-devices-to-fix-E.patch similarity index 100% rename from board/amlogic/s905/patches/uboot/u-boot-0005-WIP-ARM-dts-use-snps-reset-on-WeTek-devices-to-fix-E.patch rename to board/batocera/amlogic/s905/patches/uboot/u-boot-0005-WIP-ARM-dts-use-snps-reset-on-WeTek-devices-to-fix-E.patch diff --git a/board/amlogic/s905/patches/uboot/u-boot-0006-WIP-boards-amlogic-add-board-files-for-wetek-gxbb-de.patch b/board/batocera/amlogic/s905/patches/uboot/u-boot-0006-WIP-boards-amlogic-add-board-files-for-wetek-gxbb-de.patch similarity index 100% rename from board/amlogic/s905/patches/uboot/u-boot-0006-WIP-boards-amlogic-add-board-files-for-wetek-gxbb-de.patch rename to board/batocera/amlogic/s905/patches/uboot/u-boot-0006-WIP-boards-amlogic-add-board-files-for-wetek-gxbb-de.patch diff --git a/board/amlogic/s905/patches/uboot/u-boot-0007-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch b/board/batocera/amlogic/s905/patches/uboot/u-boot-0007-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch similarity index 100% rename from board/amlogic/s905/patches/uboot/u-boot-0007-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch rename to board/batocera/amlogic/s905/patches/uboot/u-boot-0007-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch diff --git a/board/amlogic/s905/patches/uboot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch b/board/batocera/amlogic/s905/patches/uboot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch similarity index 100% rename from board/amlogic/s905/patches/uboot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch rename to board/batocera/amlogic/s905/patches/uboot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch diff --git a/board/amlogic/s905/patches/uboot/u-boot-0009-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch b/board/batocera/amlogic/s905/patches/uboot/u-boot-0009-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch similarity index 100% rename from board/amlogic/s905/patches/uboot/u-boot-0009-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch rename to board/batocera/amlogic/s905/patches/uboot/u-boot-0009-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch diff --git a/board/amlogic/s905/patches/uboot/u-boot-0010-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch b/board/batocera/amlogic/s905/patches/uboot/u-boot-0010-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch similarity index 100% rename from board/amlogic/s905/patches/uboot/u-boot-0010-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch rename to board/batocera/amlogic/s905/patches/uboot/u-boot-0010-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch diff --git a/board/amlogic/s905/patches/uboot/u-boot-0011-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch b/board/batocera/amlogic/s905/patches/uboot/u-boot-0011-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch similarity index 100% rename from board/amlogic/s905/patches/uboot/u-boot-0011-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch rename to board/batocera/amlogic/s905/patches/uboot/u-boot-0011-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch diff --git a/board/amlogic/s905/patches/uboot/u-boot-0012-WIP-ARM-dts-import-Beelink-GT1-DT-from-Linux-5.21.patch b/board/batocera/amlogic/s905/patches/uboot/u-boot-0012-WIP-ARM-dts-import-Beelink-GT1-DT-from-Linux-5.21.patch similarity index 100% rename from board/amlogic/s905/patches/uboot/u-boot-0012-WIP-ARM-dts-import-Beelink-GT1-DT-from-Linux-5.21.patch rename to board/batocera/amlogic/s905/patches/uboot/u-boot-0012-WIP-ARM-dts-import-Beelink-GT1-DT-from-Linux-5.21.patch diff --git a/board/amlogic/s905/patches/uboot/u-boot-0013-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch b/board/batocera/amlogic/s905/patches/uboot/u-boot-0013-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch similarity index 100% rename from board/amlogic/s905/patches/uboot/u-boot-0013-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch rename to board/batocera/amlogic/s905/patches/uboot/u-boot-0013-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch diff --git a/board/amlogic/s905/patches/uboot/u-boot-0014-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch b/board/batocera/amlogic/s905/patches/uboot/u-boot-0014-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch similarity index 100% rename from board/amlogic/s905/patches/uboot/u-boot-0014-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch rename to board/batocera/amlogic/s905/patches/uboot/u-boot-0014-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch diff --git a/board/amlogic/s905/patches/uboot/u-boot-0015-rebase-radxa-zero2-defconfig.patch b/board/batocera/amlogic/s905/patches/uboot/u-boot-0015-rebase-radxa-zero2-defconfig.patch similarity index 100% rename from board/amlogic/s905/patches/uboot/u-boot-0015-rebase-radxa-zero2-defconfig.patch rename to board/batocera/amlogic/s905/patches/uboot/u-boot-0015-rebase-radxa-zero2-defconfig.patch diff --git a/board/amlogic/s905/s905-tvbox/boot/README.txt b/board/batocera/amlogic/s905/s905-tvbox/boot/README.txt similarity index 100% rename from board/amlogic/s905/s905-tvbox/boot/README.txt rename to board/batocera/amlogic/s905/s905-tvbox/boot/README.txt diff --git a/board/amlogic/s905/s905-tvbox/boot/aml_autoscript.txt b/board/batocera/amlogic/s905/s905-tvbox/boot/aml_autoscript.txt similarity index 100% rename from board/amlogic/s905/s905-tvbox/boot/aml_autoscript.txt rename to board/batocera/amlogic/s905/s905-tvbox/boot/aml_autoscript.txt diff --git a/board/amlogic/s905/s905-tvbox/boot/aml_autoscript.zip b/board/batocera/amlogic/s905/s905-tvbox/boot/aml_autoscript.zip similarity index 100% rename from board/amlogic/s905/s905-tvbox/boot/aml_autoscript.zip rename to board/batocera/amlogic/s905/s905-tvbox/boot/aml_autoscript.zip diff --git a/board/amlogic/s905/s905-tvbox/boot/boot-logo.bmp.gz b/board/batocera/amlogic/s905/s905-tvbox/boot/boot-logo.bmp.gz similarity index 100% rename from board/amlogic/s905/s905-tvbox/boot/boot-logo.bmp.gz rename to board/batocera/amlogic/s905/s905-tvbox/boot/boot-logo.bmp.gz diff --git a/board/amlogic/s905/s905-tvbox/boot/s905_autoscript.txt b/board/batocera/amlogic/s905/s905-tvbox/boot/s905_autoscript.txt similarity index 100% rename from board/amlogic/s905/s905-tvbox/boot/s905_autoscript.txt rename to board/batocera/amlogic/s905/s905-tvbox/boot/s905_autoscript.txt diff --git a/board/amlogic/s905/s905-tvbox/boot/uEnv.txt b/board/batocera/amlogic/s905/s905-tvbox/boot/uEnv.txt similarity index 100% rename from board/amlogic/s905/s905-tvbox/boot/uEnv.txt rename to board/batocera/amlogic/s905/s905-tvbox/boot/uEnv.txt diff --git a/board/amlogic/s905/s905-tvbox/create-boot-script.sh b/board/batocera/amlogic/s905/s905-tvbox/create-boot-script.sh similarity index 100% rename from board/amlogic/s905/s905-tvbox/create-boot-script.sh rename to board/batocera/amlogic/s905/s905-tvbox/create-boot-script.sh diff --git a/board/amlogic/s905/s905-tvbox/genimage.cfg b/board/batocera/amlogic/s905/s905-tvbox/genimage.cfg similarity index 100% rename from board/amlogic/s905/s905-tvbox/genimage.cfg rename to board/batocera/amlogic/s905/s905-tvbox/genimage.cfg diff --git a/board/amlogic/s905gen2/fsoverlay/lib/firmware/brcm/BCM4345C5.hcd b/board/batocera/amlogic/s905gen2/fsoverlay/lib/firmware/brcm/BCM4345C5.hcd similarity index 100% rename from board/amlogic/s905gen2/fsoverlay/lib/firmware/brcm/BCM4345C5.hcd rename to board/batocera/amlogic/s905gen2/fsoverlay/lib/firmware/brcm/BCM4345C5.hcd diff --git a/board/amlogic/s905gen2/fsoverlay/lib/firmware/brcm/brcmfmac43456-sdio.bin b/board/batocera/amlogic/s905gen2/fsoverlay/lib/firmware/brcm/brcmfmac43456-sdio.bin similarity index 100% rename from board/amlogic/s905gen2/fsoverlay/lib/firmware/brcm/brcmfmac43456-sdio.bin rename to board/batocera/amlogic/s905gen2/fsoverlay/lib/firmware/brcm/brcmfmac43456-sdio.bin diff --git a/board/amlogic/s905gen2/fsoverlay/lib/firmware/brcm/brcmfmac43456-sdio.txt b/board/batocera/amlogic/s905gen2/fsoverlay/lib/firmware/brcm/brcmfmac43456-sdio.txt similarity index 100% rename from board/amlogic/s905gen2/fsoverlay/lib/firmware/brcm/brcmfmac43456-sdio.txt rename to board/batocera/amlogic/s905gen2/fsoverlay/lib/firmware/brcm/brcmfmac43456-sdio.txt diff --git a/board/amlogic/s905gen2/fsoverlay/usr/share/alsa/cards/HDMI.conf b/board/batocera/amlogic/s905gen2/fsoverlay/usr/share/alsa/cards/HDMI.conf similarity index 100% rename from board/amlogic/s905gen2/fsoverlay/usr/share/alsa/cards/HDMI.conf rename to board/batocera/amlogic/s905gen2/fsoverlay/usr/share/alsa/cards/HDMI.conf diff --git a/board/amlogic/s905gen2/khadas-vim2/boot/extlinux.conf b/board/batocera/amlogic/s905gen2/khadas-vim2/boot/extlinux.conf similarity index 100% rename from board/amlogic/s905gen2/khadas-vim2/boot/extlinux.conf rename to board/batocera/amlogic/s905gen2/khadas-vim2/boot/extlinux.conf diff --git a/board/amlogic/s905gen2/khadas-vim2/build-uboot.sh b/board/batocera/amlogic/s905gen2/khadas-vim2/build-uboot.sh similarity index 87% rename from board/amlogic/s905gen2/khadas-vim2/build-uboot.sh rename to board/batocera/amlogic/s905gen2/khadas-vim2/build-uboot.sh index 318a291ad44..35933304beb 100755 --- a/board/amlogic/s905gen2/khadas-vim2/build-uboot.sh +++ b/board/batocera/amlogic/s905gen2/khadas-vim2/build-uboot.sh @@ -10,7 +10,7 @@ tar xf u-boot-2023.01.tar.bz2 cd u-boot-2023.01 # Apply patches -PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/amlogic/s905gen2/patches/uboot/*.patch" +PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/batocera/amlogic/s905gen2/patches/uboot/*.patch" for patch in $PATCHES do echo "Applying patch: $patch" diff --git a/board/amlogic/s905gen2/khadas-vim2/create-boot-script.sh b/board/batocera/amlogic/s905gen2/khadas-vim2/create-boot-script.sh similarity index 100% rename from board/amlogic/s905gen2/khadas-vim2/create-boot-script.sh rename to board/batocera/amlogic/s905gen2/khadas-vim2/create-boot-script.sh diff --git a/board/amlogic/s905gen2/khadas-vim2/genimage.cfg b/board/batocera/amlogic/s905gen2/khadas-vim2/genimage.cfg similarity index 100% rename from board/amlogic/s905gen2/khadas-vim2/genimage.cfg rename to board/batocera/amlogic/s905gen2/khadas-vim2/genimage.cfg diff --git a/board/amlogic/s905gen2/linux-defconfig-fragment.config b/board/batocera/amlogic/s905gen2/linux-defconfig-fragment.config similarity index 100% rename from board/amlogic/s905gen2/linux-defconfig-fragment.config rename to board/batocera/amlogic/s905gen2/linux-defconfig-fragment.config diff --git a/board/amlogic/s905gen2/patches/batocera-emulationstation/001-fixtty.patch b/board/batocera/amlogic/s905gen2/patches/batocera-emulationstation/001-fixtty.patch similarity index 100% rename from board/amlogic/s905gen2/patches/batocera-emulationstation/001-fixtty.patch rename to board/batocera/amlogic/s905gen2/patches/batocera-emulationstation/001-fixtty.patch diff --git a/board/amlogic/s905gen2/patches/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-aarch64-render.patch b/board/batocera/amlogic/s905gen2/patches/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-aarch64-render.patch similarity index 100% rename from board/amlogic/s905gen2/patches/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-aarch64-render.patch rename to board/batocera/amlogic/s905gen2/patches/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-aarch64-render.patch diff --git a/board/amlogic/s905gen2/patches/ppsspp/001-eglx11.patch b/board/batocera/amlogic/s905gen2/patches/ppsspp/001-eglx11.patch similarity index 100% rename from board/amlogic/s905gen2/patches/ppsspp/001-eglx11.patch rename to board/batocera/amlogic/s905gen2/patches/ppsspp/001-eglx11.patch diff --git a/board/amlogic/s905gen2/patches/uboot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on.patch b/board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on.patch similarity index 100% rename from board/amlogic/s905gen2/patches/uboot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on.patch rename to board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on.patch diff --git a/board/amlogic/s905gen2/patches/uboot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch b/board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch similarity index 100% rename from board/amlogic/s905gen2/patches/uboot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch rename to board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch diff --git a/board/amlogic/s905gen2/patches/uboot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch b/board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch similarity index 100% rename from board/amlogic/s905gen2/patches/uboot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch rename to board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch diff --git a/board/amlogic/s905gen2/patches/uboot/u-boot-0004-WIP-ARM-dts-import-WeTek-Hub-Play2-DTs-from-Linux-5..patch b/board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0004-WIP-ARM-dts-import-WeTek-Hub-Play2-DTs-from-Linux-5..patch similarity index 100% rename from board/amlogic/s905gen2/patches/uboot/u-boot-0004-WIP-ARM-dts-import-WeTek-Hub-Play2-DTs-from-Linux-5..patch rename to board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0004-WIP-ARM-dts-import-WeTek-Hub-Play2-DTs-from-Linux-5..patch diff --git a/board/amlogic/s905gen2/patches/uboot/u-boot-0005-WIP-ARM-dts-use-snps-reset-on-WeTek-devices-to-fix-E.patch b/board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0005-WIP-ARM-dts-use-snps-reset-on-WeTek-devices-to-fix-E.patch similarity index 100% rename from board/amlogic/s905gen2/patches/uboot/u-boot-0005-WIP-ARM-dts-use-snps-reset-on-WeTek-devices-to-fix-E.patch rename to board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0005-WIP-ARM-dts-use-snps-reset-on-WeTek-devices-to-fix-E.patch diff --git a/board/amlogic/s905gen2/patches/uboot/u-boot-0006-WIP-boards-amlogic-add-board-files-for-wetek-gxbb-de.patch b/board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0006-WIP-boards-amlogic-add-board-files-for-wetek-gxbb-de.patch similarity index 100% rename from board/amlogic/s905gen2/patches/uboot/u-boot-0006-WIP-boards-amlogic-add-board-files-for-wetek-gxbb-de.patch rename to board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0006-WIP-boards-amlogic-add-board-files-for-wetek-gxbb-de.patch diff --git a/board/amlogic/s905gen2/patches/uboot/u-boot-0007-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch b/board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0007-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch similarity index 100% rename from board/amlogic/s905gen2/patches/uboot/u-boot-0007-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch rename to board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0007-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch diff --git a/board/amlogic/s905gen2/patches/uboot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch b/board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch similarity index 100% rename from board/amlogic/s905gen2/patches/uboot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch rename to board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch diff --git a/board/amlogic/s905gen2/patches/uboot/u-boot-0009-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch b/board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0009-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch similarity index 100% rename from board/amlogic/s905gen2/patches/uboot/u-boot-0009-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch rename to board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0009-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch diff --git a/board/amlogic/s905gen2/patches/uboot/u-boot-0010-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch b/board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0010-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch similarity index 100% rename from board/amlogic/s905gen2/patches/uboot/u-boot-0010-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch rename to board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0010-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch diff --git a/board/amlogic/s905gen2/patches/uboot/u-boot-0011-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch b/board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0011-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch similarity index 100% rename from board/amlogic/s905gen2/patches/uboot/u-boot-0011-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch rename to board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0011-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch diff --git a/board/amlogic/s905gen2/patches/uboot/u-boot-0012-WIP-ARM-dts-import-Beelink-GT1-DT-from-Linux-5.21.patch b/board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0012-WIP-ARM-dts-import-Beelink-GT1-DT-from-Linux-5.21.patch similarity index 100% rename from board/amlogic/s905gen2/patches/uboot/u-boot-0012-WIP-ARM-dts-import-Beelink-GT1-DT-from-Linux-5.21.patch rename to board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0012-WIP-ARM-dts-import-Beelink-GT1-DT-from-Linux-5.21.patch diff --git a/board/amlogic/s905gen2/patches/uboot/u-boot-0013-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch b/board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0013-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch similarity index 100% rename from board/amlogic/s905gen2/patches/uboot/u-boot-0013-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch rename to board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0013-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch diff --git a/board/amlogic/s905gen2/patches/uboot/u-boot-0014-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch b/board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0014-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch similarity index 100% rename from board/amlogic/s905gen2/patches/uboot/u-boot-0014-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch rename to board/batocera/amlogic/s905gen2/patches/uboot/u-boot-0014-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch diff --git a/board/amlogic/s905gen2/radxa-zero/boot/extlinux.conf b/board/batocera/amlogic/s905gen2/radxa-zero/boot/extlinux.conf similarity index 100% rename from board/amlogic/s905gen2/radxa-zero/boot/extlinux.conf rename to board/batocera/amlogic/s905gen2/radxa-zero/boot/extlinux.conf diff --git a/board/amlogic/s905gen2/radxa-zero/build-uboot.sh b/board/batocera/amlogic/s905gen2/radxa-zero/build-uboot.sh similarity index 100% rename from board/amlogic/s905gen2/radxa-zero/build-uboot.sh rename to board/batocera/amlogic/s905gen2/radxa-zero/build-uboot.sh diff --git a/board/amlogic/s905gen2/radxa-zero/create-boot-script.sh b/board/batocera/amlogic/s905gen2/radxa-zero/create-boot-script.sh similarity index 100% rename from board/amlogic/s905gen2/radxa-zero/create-boot-script.sh rename to board/batocera/amlogic/s905gen2/radxa-zero/create-boot-script.sh diff --git a/board/amlogic/s905gen2/radxa-zero/genimage.cfg b/board/batocera/amlogic/s905gen2/radxa-zero/genimage.cfg similarity index 100% rename from board/amlogic/s905gen2/radxa-zero/genimage.cfg rename to board/batocera/amlogic/s905gen2/radxa-zero/genimage.cfg diff --git a/board/amlogic/s905gen3/bananapi-m5/boot/extlinux.conf b/board/batocera/amlogic/s905gen3/bananapi-m5/boot/extlinux.conf similarity index 100% rename from board/amlogic/s905gen3/bananapi-m5/boot/extlinux.conf rename to board/batocera/amlogic/s905gen3/bananapi-m5/boot/extlinux.conf diff --git a/board/amlogic/s905gen3/bananapi-m5/build-uboot.sh b/board/batocera/amlogic/s905gen3/bananapi-m5/build-uboot.sh similarity index 100% rename from board/amlogic/s905gen3/bananapi-m5/build-uboot.sh rename to board/batocera/amlogic/s905gen3/bananapi-m5/build-uboot.sh diff --git a/board/amlogic/s905gen3/bananapi-m5/create-boot-script.sh b/board/batocera/amlogic/s905gen3/bananapi-m5/create-boot-script.sh similarity index 100% rename from board/amlogic/s905gen3/bananapi-m5/create-boot-script.sh rename to board/batocera/amlogic/s905gen3/bananapi-m5/create-boot-script.sh diff --git a/board/amlogic/s905gen3/bananapi-m5/genimage.cfg b/board/batocera/amlogic/s905gen3/bananapi-m5/genimage.cfg similarity index 100% rename from board/amlogic/s905gen3/bananapi-m5/genimage.cfg rename to board/batocera/amlogic/s905gen3/bananapi-m5/genimage.cfg diff --git a/board/amlogic/s905gen3/fsoverlay/usr/share/alsa/cards/HDMI.conf b/board/batocera/amlogic/s905gen3/fsoverlay/usr/share/alsa/cards/HDMI.conf similarity index 100% rename from board/amlogic/s905gen3/fsoverlay/usr/share/alsa/cards/HDMI.conf rename to board/batocera/amlogic/s905gen3/fsoverlay/usr/share/alsa/cards/HDMI.conf diff --git a/board/amlogic/s905gen3/khadas-vim3l/boot/aml_autoscript b/board/batocera/amlogic/s905gen3/khadas-vim3l/boot/aml_autoscript similarity index 100% rename from board/amlogic/s905gen3/khadas-vim3l/boot/aml_autoscript rename to board/batocera/amlogic/s905gen3/khadas-vim3l/boot/aml_autoscript diff --git a/board/amlogic/s905gen3/khadas-vim3l/boot/aml_autoscript.txt b/board/batocera/amlogic/s905gen3/khadas-vim3l/boot/aml_autoscript.txt similarity index 100% rename from board/amlogic/s905gen3/khadas-vim3l/boot/aml_autoscript.txt rename to board/batocera/amlogic/s905gen3/khadas-vim3l/boot/aml_autoscript.txt diff --git a/board/amlogic/s905gen3/khadas-vim3l/boot/aml_autoscript.zip b/board/batocera/amlogic/s905gen3/khadas-vim3l/boot/aml_autoscript.zip similarity index 100% rename from board/amlogic/s905gen3/khadas-vim3l/boot/aml_autoscript.zip rename to board/batocera/amlogic/s905gen3/khadas-vim3l/boot/aml_autoscript.zip diff --git a/board/amlogic/s905gen3/khadas-vim3l/boot/boot.ini b/board/batocera/amlogic/s905gen3/khadas-vim3l/boot/boot.ini similarity index 100% rename from board/amlogic/s905gen3/khadas-vim3l/boot/boot.ini rename to board/batocera/amlogic/s905gen3/khadas-vim3l/boot/boot.ini diff --git a/board/amlogic/s905gen3/khadas-vim3l/boot/boot.scr b/board/batocera/amlogic/s905gen3/khadas-vim3l/boot/boot.scr similarity index 100% rename from board/amlogic/s905gen3/khadas-vim3l/boot/boot.scr rename to board/batocera/amlogic/s905gen3/khadas-vim3l/boot/boot.scr diff --git a/board/amlogic/s905gen3/khadas-vim3l/boot/extlinux.conf b/board/batocera/amlogic/s905gen3/khadas-vim3l/boot/extlinux.conf similarity index 100% rename from board/amlogic/s905gen3/khadas-vim3l/boot/extlinux.conf rename to board/batocera/amlogic/s905gen3/khadas-vim3l/boot/extlinux.conf diff --git a/board/amlogic/s905gen3/khadas-vim3l/boot/s905_autoscript b/board/batocera/amlogic/s905gen3/khadas-vim3l/boot/s905_autoscript similarity index 100% rename from board/amlogic/s905gen3/khadas-vim3l/boot/s905_autoscript rename to board/batocera/amlogic/s905gen3/khadas-vim3l/boot/s905_autoscript diff --git a/board/amlogic/s905gen3/khadas-vim3l/boot/s905_autoscript.cmd b/board/batocera/amlogic/s905gen3/khadas-vim3l/boot/s905_autoscript.cmd similarity index 100% rename from board/amlogic/s905gen3/khadas-vim3l/boot/s905_autoscript.cmd rename to board/batocera/amlogic/s905gen3/khadas-vim3l/boot/s905_autoscript.cmd diff --git a/board/amlogic/s905gen3/khadas-vim3l/build-uboot.sh b/board/batocera/amlogic/s905gen3/khadas-vim3l/build-uboot.sh similarity index 89% rename from board/amlogic/s905gen3/khadas-vim3l/build-uboot.sh rename to board/batocera/amlogic/s905gen3/khadas-vim3l/build-uboot.sh index bd280359ee5..b24b981e351 100755 --- a/board/amlogic/s905gen3/khadas-vim3l/build-uboot.sh +++ b/board/batocera/amlogic/s905gen3/khadas-vim3l/build-uboot.sh @@ -10,7 +10,7 @@ tar xf u-boot-2023.01.tar.bz2 cd u-boot-2023.01 # Apply patches -PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/amlogic/s905gen3/patches/uboot/*.patch" +PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/batocera/amlogic/s905gen3/patches/uboot/*.patch" for patch in $PATCHES do echo "Applying patch: $patch" diff --git a/board/amlogic/s905gen3/khadas-vim3l/create-boot-script.sh b/board/batocera/amlogic/s905gen3/khadas-vim3l/create-boot-script.sh similarity index 100% rename from board/amlogic/s905gen3/khadas-vim3l/create-boot-script.sh rename to board/batocera/amlogic/s905gen3/khadas-vim3l/create-boot-script.sh diff --git a/board/amlogic/s905gen3/khadas-vim3l/genimage.cfg b/board/batocera/amlogic/s905gen3/khadas-vim3l/genimage.cfg similarity index 100% rename from board/amlogic/s905gen3/khadas-vim3l/genimage.cfg rename to board/batocera/amlogic/s905gen3/khadas-vim3l/genimage.cfg diff --git a/board/amlogic/s905gen3/linux-defconfig-fragment.config b/board/batocera/amlogic/s905gen3/linux-defconfig-fragment.config similarity index 100% rename from board/amlogic/s905gen3/linux-defconfig-fragment.config rename to board/batocera/amlogic/s905gen3/linux-defconfig-fragment.config diff --git a/board/amlogic/s905gen3/linux_patches/001-enable-x96-max-plus-100m.patch b/board/batocera/amlogic/s905gen3/linux_patches/001-enable-x96-max-plus-100m.patch similarity index 100% rename from board/amlogic/s905gen3/linux_patches/001-enable-x96-max-plus-100m.patch rename to board/batocera/amlogic/s905gen3/linux_patches/001-enable-x96-max-plus-100m.patch diff --git a/board/amlogic/s905gen3/linux_patches/002-enable-x96-max-plus-2101.patch b/board/batocera/amlogic/s905gen3/linux_patches/002-enable-x96-max-plus-2101.patch similarity index 100% rename from board/amlogic/s905gen3/linux_patches/002-enable-x96-max-plus-2101.patch rename to board/batocera/amlogic/s905gen3/linux_patches/002-enable-x96-max-plus-2101.patch diff --git a/board/amlogic/s905gen3/odroid-c4/boot/extlinux.conf b/board/batocera/amlogic/s905gen3/odroid-c4/boot/extlinux.conf similarity index 100% rename from board/amlogic/s905gen3/odroid-c4/boot/extlinux.conf rename to board/batocera/amlogic/s905gen3/odroid-c4/boot/extlinux.conf diff --git a/board/amlogic/s905gen3/odroid-c4/build-uboot.sh b/board/batocera/amlogic/s905gen3/odroid-c4/build-uboot.sh similarity index 100% rename from board/amlogic/s905gen3/odroid-c4/build-uboot.sh rename to board/batocera/amlogic/s905gen3/odroid-c4/build-uboot.sh diff --git a/board/amlogic/s905gen3/odroid-c4/create-boot-script.sh b/board/batocera/amlogic/s905gen3/odroid-c4/create-boot-script.sh similarity index 100% rename from board/amlogic/s905gen3/odroid-c4/create-boot-script.sh rename to board/batocera/amlogic/s905gen3/odroid-c4/create-boot-script.sh diff --git a/board/amlogic/s905gen3/odroid-c4/genimage.cfg b/board/batocera/amlogic/s905gen3/odroid-c4/genimage.cfg similarity index 100% rename from board/amlogic/s905gen3/odroid-c4/genimage.cfg rename to board/batocera/amlogic/s905gen3/odroid-c4/genimage.cfg diff --git a/board/amlogic/s905gen3/patches/batocera-emulationstation/001-fixtty.patch b/board/batocera/amlogic/s905gen3/patches/batocera-emulationstation/001-fixtty.patch similarity index 100% rename from board/amlogic/s905gen3/patches/batocera-emulationstation/001-fixtty.patch rename to board/batocera/amlogic/s905gen3/patches/batocera-emulationstation/001-fixtty.patch diff --git a/board/amlogic/s905gen3/patches/uboot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on.patch b/board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on.patch similarity index 100% rename from board/amlogic/s905gen3/patches/uboot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on.patch rename to board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on.patch diff --git a/board/amlogic/s905gen3/patches/uboot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch b/board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch similarity index 100% rename from board/amlogic/s905gen3/patches/uboot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch rename to board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch diff --git a/board/amlogic/s905gen3/patches/uboot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch b/board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch similarity index 100% rename from board/amlogic/s905gen3/patches/uboot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch rename to board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch diff --git a/board/amlogic/s905gen3/patches/uboot/u-boot-0004-WIP-ARM-dts-import-WeTek-Hub-Play2-DTs-from-Linux-5..patch b/board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0004-WIP-ARM-dts-import-WeTek-Hub-Play2-DTs-from-Linux-5..patch similarity index 100% rename from board/amlogic/s905gen3/patches/uboot/u-boot-0004-WIP-ARM-dts-import-WeTek-Hub-Play2-DTs-from-Linux-5..patch rename to board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0004-WIP-ARM-dts-import-WeTek-Hub-Play2-DTs-from-Linux-5..patch diff --git a/board/amlogic/s905gen3/patches/uboot/u-boot-0005-WIP-ARM-dts-use-snps-reset-on-WeTek-devices-to-fix-E.patch b/board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0005-WIP-ARM-dts-use-snps-reset-on-WeTek-devices-to-fix-E.patch similarity index 100% rename from board/amlogic/s905gen3/patches/uboot/u-boot-0005-WIP-ARM-dts-use-snps-reset-on-WeTek-devices-to-fix-E.patch rename to board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0005-WIP-ARM-dts-use-snps-reset-on-WeTek-devices-to-fix-E.patch diff --git a/board/amlogic/s905gen3/patches/uboot/u-boot-0006-WIP-boards-amlogic-add-board-files-for-wetek-gxbb-de.patch b/board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0006-WIP-boards-amlogic-add-board-files-for-wetek-gxbb-de.patch similarity index 100% rename from board/amlogic/s905gen3/patches/uboot/u-boot-0006-WIP-boards-amlogic-add-board-files-for-wetek-gxbb-de.patch rename to board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0006-WIP-boards-amlogic-add-board-files-for-wetek-gxbb-de.patch diff --git a/board/amlogic/s905gen3/patches/uboot/u-boot-0007-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch b/board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0007-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch similarity index 100% rename from board/amlogic/s905gen3/patches/uboot/u-boot-0007-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch rename to board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0007-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch diff --git a/board/amlogic/s905gen3/patches/uboot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch b/board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch similarity index 100% rename from board/amlogic/s905gen3/patches/uboot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch rename to board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch diff --git a/board/amlogic/s905gen3/patches/uboot/u-boot-0009-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch b/board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0009-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch similarity index 100% rename from board/amlogic/s905gen3/patches/uboot/u-boot-0009-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch rename to board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0009-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch diff --git a/board/amlogic/s905gen3/patches/uboot/u-boot-0010-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch b/board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0010-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch similarity index 100% rename from board/amlogic/s905gen3/patches/uboot/u-boot-0010-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch rename to board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0010-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch diff --git a/board/amlogic/s905gen3/patches/uboot/u-boot-0011-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch b/board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0011-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch similarity index 100% rename from board/amlogic/s905gen3/patches/uboot/u-boot-0011-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch rename to board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0011-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch diff --git a/board/amlogic/s905gen3/patches/uboot/u-boot-0012-WIP-ARM-dts-import-Beelink-GT1-DT-from-Linux-5.21.patch b/board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0012-WIP-ARM-dts-import-Beelink-GT1-DT-from-Linux-5.21.patch similarity index 100% rename from board/amlogic/s905gen3/patches/uboot/u-boot-0012-WIP-ARM-dts-import-Beelink-GT1-DT-from-Linux-5.21.patch rename to board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0012-WIP-ARM-dts-import-Beelink-GT1-DT-from-Linux-5.21.patch diff --git a/board/amlogic/s905gen3/patches/uboot/u-boot-0013-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch b/board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0013-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch similarity index 100% rename from board/amlogic/s905gen3/patches/uboot/u-boot-0013-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch rename to board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0013-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch diff --git a/board/amlogic/s905gen3/patches/uboot/u-boot-0014-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch b/board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0014-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch similarity index 100% rename from board/amlogic/s905gen3/patches/uboot/u-boot-0014-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch rename to board/batocera/amlogic/s905gen3/patches/uboot/u-boot-0014-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch diff --git a/board/amlogic/s905gen3/s905x3-tvbox/boot/README.txt b/board/batocera/amlogic/s905gen3/s905x3-tvbox/boot/README.txt similarity index 100% rename from board/amlogic/s905gen3/s905x3-tvbox/boot/README.txt rename to board/batocera/amlogic/s905gen3/s905x3-tvbox/boot/README.txt diff --git a/board/amlogic/s905gen3/s905x3-tvbox/boot/aml_autoscript.txt b/board/batocera/amlogic/s905gen3/s905x3-tvbox/boot/aml_autoscript.txt similarity index 100% rename from board/amlogic/s905gen3/s905x3-tvbox/boot/aml_autoscript.txt rename to board/batocera/amlogic/s905gen3/s905x3-tvbox/boot/aml_autoscript.txt diff --git a/board/amlogic/s905gen3/s905x3-tvbox/boot/boot-logo.bmp.gz b/board/batocera/amlogic/s905gen3/s905x3-tvbox/boot/boot-logo.bmp.gz similarity index 100% rename from board/amlogic/s905gen3/s905x3-tvbox/boot/boot-logo.bmp.gz rename to board/batocera/amlogic/s905gen3/s905x3-tvbox/boot/boot-logo.bmp.gz diff --git a/board/amlogic/s905gen3/s905x3-tvbox/boot/boot.ini b/board/batocera/amlogic/s905gen3/s905x3-tvbox/boot/boot.ini similarity index 100% rename from board/amlogic/s905gen3/s905x3-tvbox/boot/boot.ini rename to board/batocera/amlogic/s905gen3/s905x3-tvbox/boot/boot.ini diff --git a/board/amlogic/s905gen3/s905x3-tvbox/boot/boot.scr.txt b/board/batocera/amlogic/s905gen3/s905x3-tvbox/boot/boot.scr.txt similarity index 100% rename from board/amlogic/s905gen3/s905x3-tvbox/boot/boot.scr.txt rename to board/batocera/amlogic/s905gen3/s905x3-tvbox/boot/boot.scr.txt diff --git a/board/amlogic/s905gen3/s905x3-tvbox/boot/s905_autoscript.txt b/board/batocera/amlogic/s905gen3/s905x3-tvbox/boot/s905_autoscript.txt similarity index 100% rename from board/amlogic/s905gen3/s905x3-tvbox/boot/s905_autoscript.txt rename to board/batocera/amlogic/s905gen3/s905x3-tvbox/boot/s905_autoscript.txt diff --git a/board/amlogic/s905gen3/s905x3-tvbox/boot/uEnv.txt b/board/batocera/amlogic/s905gen3/s905x3-tvbox/boot/uEnv.txt similarity index 100% rename from board/amlogic/s905gen3/s905x3-tvbox/boot/uEnv.txt rename to board/batocera/amlogic/s905gen3/s905x3-tvbox/boot/uEnv.txt diff --git a/board/amlogic/s905gen3/s905x3-tvbox/create-boot-script.sh b/board/batocera/amlogic/s905gen3/s905x3-tvbox/create-boot-script.sh similarity index 100% rename from board/amlogic/s905gen3/s905x3-tvbox/create-boot-script.sh rename to board/batocera/amlogic/s905gen3/s905x3-tvbox/create-boot-script.sh diff --git a/board/amlogic/s905gen3/s905x3-tvbox/genimage.cfg b/board/batocera/amlogic/s905gen3/s905x3-tvbox/genimage.cfg similarity index 100% rename from board/amlogic/s905gen3/s905x3-tvbox/genimage.cfg rename to board/batocera/amlogic/s905gen3/s905x3-tvbox/genimage.cfg diff --git a/board/amlogic/s922x/bananapi-m2s/boot/extlinux.conf b/board/batocera/amlogic/s922x/bananapi-m2s/boot/extlinux.conf similarity index 100% rename from board/amlogic/s922x/bananapi-m2s/boot/extlinux.conf rename to board/batocera/amlogic/s922x/bananapi-m2s/boot/extlinux.conf diff --git a/board/amlogic/s922x/bananapi-m2s/build-uboot.sh b/board/batocera/amlogic/s922x/bananapi-m2s/build-uboot.sh similarity index 88% rename from board/amlogic/s922x/bananapi-m2s/build-uboot.sh rename to board/batocera/amlogic/s922x/bananapi-m2s/build-uboot.sh index 91521c38645..f89f65a56bf 100755 --- a/board/amlogic/s922x/bananapi-m2s/build-uboot.sh +++ b/board/batocera/amlogic/s922x/bananapi-m2s/build-uboot.sh @@ -10,7 +10,7 @@ tar xf u-boot-2024.01.tar.bz2 cd u-boot-2024.01 # Apply patches -PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/amlogic/s922x/patches/uboot/*.patch" +PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/batocera/amlogic/s922x/patches/uboot/*.patch" for patch in $PATCHES do echo "Applying patch: $patch" diff --git a/board/amlogic/s922x/bananapi-m2s/create-boot-script.sh b/board/batocera/amlogic/s922x/bananapi-m2s/create-boot-script.sh similarity index 100% rename from board/amlogic/s922x/bananapi-m2s/create-boot-script.sh rename to board/batocera/amlogic/s922x/bananapi-m2s/create-boot-script.sh diff --git a/board/amlogic/s922x/bananapi-m2s/genimage.cfg b/board/batocera/amlogic/s922x/bananapi-m2s/genimage.cfg similarity index 100% rename from board/amlogic/s922x/bananapi-m2s/genimage.cfg rename to board/batocera/amlogic/s922x/bananapi-m2s/genimage.cfg diff --git a/board/amlogic/s922x/beelink-gtking-pro/boot/extlinux.conf b/board/batocera/amlogic/s922x/beelink-gtking-pro/boot/extlinux.conf similarity index 100% rename from board/amlogic/s922x/beelink-gtking-pro/boot/extlinux.conf rename to board/batocera/amlogic/s922x/beelink-gtking-pro/boot/extlinux.conf diff --git a/board/amlogic/s922x/beelink-gtking-pro/build-uboot.sh b/board/batocera/amlogic/s922x/beelink-gtking-pro/build-uboot.sh similarity index 87% rename from board/amlogic/s922x/beelink-gtking-pro/build-uboot.sh rename to board/batocera/amlogic/s922x/beelink-gtking-pro/build-uboot.sh index 0a7280253e8..6607001b5c0 100755 --- a/board/amlogic/s922x/beelink-gtking-pro/build-uboot.sh +++ b/board/batocera/amlogic/s922x/beelink-gtking-pro/build-uboot.sh @@ -9,7 +9,7 @@ tar xf u-boot-2024.01.tar.bz2 cd u-boot-2024.01 # Apply patches -PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/amlogic/s922x/patches/uboot/*.patch" +PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/batocera/amlogic/s922x/patches/uboot/*.patch" for patch in $PATCHES do echo "Applying patch: $patch" diff --git a/board/amlogic/s922x/beelink-gtking-pro/create-boot-script.sh b/board/batocera/amlogic/s922x/beelink-gtking-pro/create-boot-script.sh similarity index 100% rename from board/amlogic/s922x/beelink-gtking-pro/create-boot-script.sh rename to board/batocera/amlogic/s922x/beelink-gtking-pro/create-boot-script.sh diff --git a/board/amlogic/s922x/beelink-gtking-pro/genimage.cfg b/board/batocera/amlogic/s922x/beelink-gtking-pro/genimage.cfg similarity index 100% rename from board/amlogic/s922x/beelink-gtking-pro/genimage.cfg rename to board/batocera/amlogic/s922x/beelink-gtking-pro/genimage.cfg diff --git a/board/amlogic/s922x/beelink-gtking/boot/extlinux.conf b/board/batocera/amlogic/s922x/beelink-gtking/boot/extlinux.conf similarity index 100% rename from board/amlogic/s922x/beelink-gtking/boot/extlinux.conf rename to board/batocera/amlogic/s922x/beelink-gtking/boot/extlinux.conf diff --git a/board/amlogic/s922x/beelink-gtking/build-uboot.sh b/board/batocera/amlogic/s922x/beelink-gtking/build-uboot.sh similarity index 88% rename from board/amlogic/s922x/beelink-gtking/build-uboot.sh rename to board/batocera/amlogic/s922x/beelink-gtking/build-uboot.sh index a7648c49e15..c3b1d96d722 100755 --- a/board/amlogic/s922x/beelink-gtking/build-uboot.sh +++ b/board/batocera/amlogic/s922x/beelink-gtking/build-uboot.sh @@ -10,7 +10,7 @@ tar xf u-boot-2024.01.tar.bz2 cd u-boot-2024.01 # Apply patches -PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/amlogic/s922x/patches/uboot/*.patch" +PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/batocera/amlogic/s922x/patches/uboot/*.patch" for patch in $PATCHES do echo "Applying patch: $patch" diff --git a/board/amlogic/s922x/beelink-gtking/create-boot-script.sh b/board/batocera/amlogic/s922x/beelink-gtking/create-boot-script.sh similarity index 100% rename from board/amlogic/s922x/beelink-gtking/create-boot-script.sh rename to board/batocera/amlogic/s922x/beelink-gtking/create-boot-script.sh diff --git a/board/amlogic/s922x/beelink-gtking/genimage.cfg b/board/batocera/amlogic/s922x/beelink-gtking/genimage.cfg similarity index 100% rename from board/amlogic/s922x/beelink-gtking/genimage.cfg rename to board/batocera/amlogic/s922x/beelink-gtking/genimage.cfg diff --git a/board/amlogic/s922x/fsoverlay/etc/init.d/S02overclock b/board/batocera/amlogic/s922x/fsoverlay/etc/init.d/S02overclock similarity index 100% rename from board/amlogic/s922x/fsoverlay/etc/init.d/S02overclock rename to board/batocera/amlogic/s922x/fsoverlay/etc/init.d/S02overclock diff --git a/board/amlogic/s922x/fsoverlay/etc/modprobe.d/8188eu.conf b/board/batocera/amlogic/s922x/fsoverlay/etc/modprobe.d/8188eu.conf similarity index 100% rename from board/amlogic/s922x/fsoverlay/etc/modprobe.d/8188eu.conf rename to board/batocera/amlogic/s922x/fsoverlay/etc/modprobe.d/8188eu.conf diff --git a/board/amlogic/s922x/fsoverlay/usr/share/alsa/cards/HDMI.conf b/board/batocera/amlogic/s922x/fsoverlay/usr/share/alsa/cards/HDMI.conf similarity index 100% rename from board/amlogic/s922x/fsoverlay/usr/share/alsa/cards/HDMI.conf rename to board/batocera/amlogic/s922x/fsoverlay/usr/share/alsa/cards/HDMI.conf diff --git a/board/amlogic/s922x/khadas-vim3/boot/extlinux.conf b/board/batocera/amlogic/s922x/khadas-vim3/boot/extlinux.conf similarity index 100% rename from board/amlogic/s922x/khadas-vim3/boot/extlinux.conf rename to board/batocera/amlogic/s922x/khadas-vim3/boot/extlinux.conf diff --git a/board/amlogic/s922x/khadas-vim3/build-uboot.sh b/board/batocera/amlogic/s922x/khadas-vim3/build-uboot.sh similarity index 88% rename from board/amlogic/s922x/khadas-vim3/build-uboot.sh rename to board/batocera/amlogic/s922x/khadas-vim3/build-uboot.sh index f95fdeb195e..ba6ce7b91f7 100755 --- a/board/amlogic/s922x/khadas-vim3/build-uboot.sh +++ b/board/batocera/amlogic/s922x/khadas-vim3/build-uboot.sh @@ -10,7 +10,7 @@ tar xf u-boot-2024.01.tar.bz2 cd u-boot-2024.01 # Apply patches -PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/amlogic/s922x/patches/uboot/*.patch" +PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/batocera/amlogic/s922x/patches/uboot/*.patch" for patch in $PATCHES do echo "Applying patch: $patch" diff --git a/board/amlogic/s922x/khadas-vim3/create-boot-script.sh b/board/batocera/amlogic/s922x/khadas-vim3/create-boot-script.sh similarity index 100% rename from board/amlogic/s922x/khadas-vim3/create-boot-script.sh rename to board/batocera/amlogic/s922x/khadas-vim3/create-boot-script.sh diff --git a/board/amlogic/s922x/khadas-vim3/genimage.cfg b/board/batocera/amlogic/s922x/khadas-vim3/genimage.cfg similarity index 100% rename from board/amlogic/s922x/khadas-vim3/genimage.cfg rename to board/batocera/amlogic/s922x/khadas-vim3/genimage.cfg diff --git a/board/amlogic/s922x/linux-defconfig-fragment.config b/board/batocera/amlogic/s922x/linux-defconfig-fragment.config similarity index 100% rename from board/amlogic/s922x/linux-defconfig-fragment.config rename to board/batocera/amlogic/s922x/linux-defconfig-fragment.config diff --git a/board/amlogic/s922x/linux-defconfig.config b/board/batocera/amlogic/s922x/linux-defconfig.config similarity index 100% rename from board/amlogic/s922x/linux-defconfig.config rename to board/batocera/amlogic/s922x/linux-defconfig.config diff --git a/board/amlogic/s922x/linux_patches/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0009-LOCAL-ASoC-meson-assign-internal-PCM-chmap-ELD-IEC95.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0009-LOCAL-ASoC-meson-assign-internal-PCM-chmap-ELD-IEC95.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0009-LOCAL-ASoC-meson-assign-internal-PCM-chmap-ELD-IEC95.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0009-LOCAL-ASoC-meson-assign-internal-PCM-chmap-ELD-IEC95.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0010-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0010-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0010-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0010-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0011-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0011-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0011-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0011-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0012-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0012-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0012-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0012-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0013-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0013-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0013-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0013-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0015-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0015-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0015-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0015-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0016-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0016-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0016-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0016-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0017-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0017-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0017-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0017-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0018-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0018-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0018-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0018-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0019-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0019-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0019-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0019-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0020-FROMLIST-v4-dt-bindings-usb-Add-the-binding-example-.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0020-FROMLIST-v4-dt-bindings-usb-Add-the-binding-example-.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0020-FROMLIST-v4-dt-bindings-usb-Add-the-binding-example-.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0020-FROMLIST-v4-dt-bindings-usb-Add-the-binding-example-.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0021-FROMLIST-v4-arm64-dts-amlogic-Used-onboard-usb-hub-r.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0021-FROMLIST-v4-arm64-dts-amlogic-Used-onboard-usb-hub-r.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0021-FROMLIST-v4-arm64-dts-amlogic-Used-onboard-usb-hub-r.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0021-FROMLIST-v4-arm64-dts-amlogic-Used-onboard-usb-hub-r.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0022-FROMLIST-v1-arm64-dts-VIM3-Set-the-rates-of-the-cloc.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0022-FROMLIST-v1-arm64-dts-VIM3-Set-the-rates-of-the-cloc.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0022-FROMLIST-v1-arm64-dts-VIM3-Set-the-rates-of-the-cloc.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0022-FROMLIST-v1-arm64-dts-VIM3-Set-the-rates-of-the-cloc.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0023-FROMLIST-v1-arm64-dts-meson-radxa-zero2-add-pwm-fan-.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0023-FROMLIST-v1-arm64-dts-meson-radxa-zero2-add-pwm-fan-.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0023-FROMLIST-v1-arm64-dts-meson-radxa-zero2-add-pwm-fan-.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0023-FROMLIST-v1-arm64-dts-meson-radxa-zero2-add-pwm-fan-.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0024-FROMLIST-v8-dt-bindings-clk-g12a-clkc-add-CTS_ENCL-c.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0024-FROMLIST-v8-dt-bindings-clk-g12a-clkc-add-CTS_ENCL-c.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0024-FROMLIST-v8-dt-bindings-clk-g12a-clkc-add-CTS_ENCL-c.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0024-FROMLIST-v8-dt-bindings-clk-g12a-clkc-add-CTS_ENCL-c.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0025-FROMLIST-v8-dt-bindings-soc-amlogic-meson-gx-hhi-sys.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0025-FROMLIST-v8-dt-bindings-soc-amlogic-meson-gx-hhi-sys.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0025-FROMLIST-v8-dt-bindings-soc-amlogic-meson-gx-hhi-sys.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0025-FROMLIST-v8-dt-bindings-soc-amlogic-meson-gx-hhi-sys.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0026-FROMLIST-v8-dt-bindings-phy-amlogic-meson-axg-mipi-p.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0026-FROMLIST-v8-dt-bindings-phy-amlogic-meson-axg-mipi-p.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0026-FROMLIST-v8-dt-bindings-phy-amlogic-meson-axg-mipi-p.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0026-FROMLIST-v8-dt-bindings-phy-amlogic-meson-axg-mipi-p.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0027-FROMLIST-v8-dt-bindings-phy-amlogic-g12a-mipi-dphy-a.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0027-FROMLIST-v8-dt-bindings-phy-amlogic-g12a-mipi-dphy-a.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0027-FROMLIST-v8-dt-bindings-phy-amlogic-g12a-mipi-dphy-a.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0027-FROMLIST-v8-dt-bindings-phy-amlogic-g12a-mipi-dphy-a.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0028-FROMLIST-v8-dt-bindings-arm-amlogic-Document-the-MNT.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0028-FROMLIST-v8-dt-bindings-arm-amlogic-Document-the-MNT.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0028-FROMLIST-v8-dt-bindings-arm-amlogic-Document-the-MNT.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0028-FROMLIST-v8-dt-bindings-arm-amlogic-Document-the-MNT.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0029-FROMLIST-v8-clk-meson-g12a-add-CTS_ENCL-CTS_ENCL_SEL.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0029-FROMLIST-v8-clk-meson-g12a-add-CTS_ENCL-CTS_ENCL_SEL.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0029-FROMLIST-v8-clk-meson-g12a-add-CTS_ENCL-CTS_ENCL_SEL.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0029-FROMLIST-v8-clk-meson-g12a-add-CTS_ENCL-CTS_ENCL_SEL.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0030-FROMLIST-v12-clk-meson-add-vclk-driver.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0030-FROMLIST-v12-clk-meson-add-vclk-driver.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0030-FROMLIST-v12-clk-meson-add-vclk-driver.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0030-FROMLIST-v12-clk-meson-add-vclk-driver.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0031-FROMLIST-v12-clk-meson-g12a-make-VCLK2-and-ENCL-clock.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0031-FROMLIST-v12-clk-meson-g12a-make-VCLK2-and-ENCL-clock.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0031-FROMLIST-v12-clk-meson-g12a-make-VCLK2-and-ENCL-clock.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0031-FROMLIST-v12-clk-meson-g12a-make-VCLK2-and-ENCL-clock.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0033-FROMLIST-v12-arm64-meson-g12-common-add-the-MIPI-DSI-.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0033-FROMLIST-v12-arm64-meson-g12-common-add-the-MIPI-DSI-.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0033-FROMLIST-v12-arm64-meson-g12-common-add-the-MIPI-DSI-.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0033-FROMLIST-v12-arm64-meson-g12-common-add-the-MIPI-DSI-.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0034-FROMLIST-v1-dt-bindings-clock-g12a-clkc-add-MIPI-ISP.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0034-FROMLIST-v1-dt-bindings-clock-g12a-clkc-add-MIPI-ISP.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0034-FROMLIST-v1-dt-bindings-clock-g12a-clkc-add-MIPI-ISP.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0034-FROMLIST-v1-dt-bindings-clock-g12a-clkc-add-MIPI-ISP.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0035-FROMLIST-v1-clk-meson-g12a-add-MIPI-ISP-clocks.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0035-FROMLIST-v1-clk-meson-g12a-add-MIPI-ISP-clocks.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0035-FROMLIST-v1-clk-meson-g12a-add-MIPI-ISP-clocks.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0035-FROMLIST-v1-clk-meson-g12a-add-MIPI-ISP-clocks.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0036-FROMLIST-v1-clk-meson-g12a-add-CSI-ISP-gates-clocks.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0036-FROMLIST-v1-clk-meson-g12a-add-CSI-ISP-gates-clocks.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0036-FROMLIST-v1-clk-meson-g12a-add-CSI-ISP-gates-clocks.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0036-FROMLIST-v1-clk-meson-g12a-add-CSI-ISP-gates-clocks.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0037-FROMLIST-v1-dt-bindings-power-meson-g12a-power-docum.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0037-FROMLIST-v1-dt-bindings-power-meson-g12a-power-docum.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0037-FROMLIST-v1-dt-bindings-power-meson-g12a-power-docum.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0037-FROMLIST-v1-dt-bindings-power-meson-g12a-power-docum.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0038-FROMLIST-v1-pmdomain-amlogic-meson-ee-pwrc-add-suppo.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0038-FROMLIST-v1-pmdomain-amlogic-meson-ee-pwrc-add-suppo.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0038-FROMLIST-v1-pmdomain-amlogic-meson-ee-pwrc-add-suppo.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0038-FROMLIST-v1-pmdomain-amlogic-meson-ee-pwrc-add-suppo.patch diff --git a/board/amlogic/s922x/linux_patches/amlogic-0039-FROMLIST-v1-arm64-dts-amlogic-minor-whitespace-clean.patch b/board/batocera/amlogic/s922x/linux_patches/amlogic-0039-FROMLIST-v1-arm64-dts-amlogic-minor-whitespace-clean.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/amlogic-0039-FROMLIST-v1-arm64-dts-amlogic-minor-whitespace-clean.patch rename to board/batocera/amlogic/s922x/linux_patches/amlogic-0039-FROMLIST-v1-arm64-dts-amlogic-minor-whitespace-clean.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0000-Beelink-GT-King-Pro-is-an-S922x-H-SOC.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0000-Beelink-GT-King-Pro-is-an-S922x-H-SOC.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0000-Beelink-GT-King-Pro-is-an-S922x-H-SOC.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0000-Beelink-GT-King-Pro-is-an-S922x-H-SOC.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0005-drm-panel-st7701-add-odroid-go-ultra-panel-support.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0005-drm-panel-st7701-add-odroid-go-ultra-panel-support.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0005-drm-panel-st7701-add-odroid-go-ultra-panel-support.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0005-drm-panel-st7701-add-odroid-go-ultra-panel-support.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0006-arm64-meson-odroid-go-ultra-add-DSI-panel.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0006-arm64-meson-odroid-go-ultra-add-DSI-panel.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0006-arm64-meson-odroid-go-ultra-add-DSI-panel.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0006-arm64-meson-odroid-go-ultra-add-DSI-panel.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0008-arm64-meson-odroid-go-ultra-correct-voltages.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0008-arm64-meson-odroid-go-ultra-correct-voltages.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0008-arm64-meson-odroid-go-ultra-correct-voltages.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0008-arm64-meson-odroid-go-ultra-correct-voltages.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0009-arm64-meson-odroid-go-ultra-add-over-clocking-freque.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0009-arm64-meson-odroid-go-ultra-add-over-clocking-freque.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0009-arm64-meson-odroid-go-ultra-add-over-clocking-freque.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0009-arm64-meson-odroid-go-ultra-add-over-clocking-freque.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0011-arm64-meson-odroid-go-ultra-remove-adc-joystick.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0011-arm64-meson-odroid-go-ultra-remove-adc-joystick.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0011-arm64-meson-odroid-go-ultra-remove-adc-joystick.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0011-arm64-meson-odroid-go-ultra-remove-adc-joystick.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0013-gpiolib-of-revert-api-changes-needed-for-joypad-driv.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0013-gpiolib-of-revert-api-changes-needed-for-joypad-driv.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0013-gpiolib-of-revert-api-changes-needed-for-joypad-driv.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0013-gpiolib-of-revert-api-changes-needed-for-joypad-driv.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0014-input-add-input-polldev-driver.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0014-input-add-input-polldev-driver.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0014-input-add-input-polldev-driver.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0014-input-add-input-polldev-driver.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0015-input-joystick-add-odroid-go-ultra-joypad-driver.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0015-input-joystick-add-odroid-go-ultra-joypad-driver.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0015-input-joystick-add-odroid-go-ultra-joypad-driver.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0015-input-joystick-add-odroid-go-ultra-joypad-driver.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0016-arm64-meson-odroid-go-ultra-add-joypad.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0016-arm64-meson-odroid-go-ultra-add-joypad.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0016-arm64-meson-odroid-go-ultra-add-joypad.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0016-arm64-meson-odroid-go-ultra-add-joypad.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0017-arm64-meson-odroid-disable-heartbeat.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0017-arm64-meson-odroid-disable-heartbeat.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0017-arm64-meson-odroid-disable-heartbeat.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0017-arm64-meson-odroid-disable-heartbeat.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0019-arm64-meson-odroid-go-ultra-increase-vddcpu_a-voltag.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0019-arm64-meson-odroid-go-ultra-increase-vddcpu_a-voltag.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0019-arm64-meson-odroid-go-ultra-increase-vddcpu_a-voltag.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0019-arm64-meson-odroid-go-ultra-increase-vddcpu_a-voltag.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0021-power-supply-rk818-battery-Add-battery-driver-for-RK.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0021-power-supply-rk818-battery-Add-battery-driver-for-RK.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0021-power-supply-rk818-battery-Add-battery-driver-for-RK.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0021-power-supply-rk818-battery-Add-battery-driver-for-RK.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0022-power-supply-rk818-battery-Use-a-more-propper-compat.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0022-power-supply-rk818-battery-Use-a-more-propper-compat.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0022-power-supply-rk818-battery-Use-a-more-propper-compat.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0022-power-supply-rk818-battery-Use-a-more-propper-compat.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0023-power-supply-rk818-charger-Implement-charger-driver-.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0023-power-supply-rk818-charger-Implement-charger-driver-.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0023-power-supply-rk818-charger-Implement-charger-driver-.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0023-power-supply-rk818-charger-Implement-charger-driver-.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0024-power-supply-rk818-charger-Change-charger-type-to-MA.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0024-power-supply-rk818-charger-Change-charger-type-to-MA.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0024-power-supply-rk818-charger-Change-charger-type-to-MA.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0024-power-supply-rk818-charger-Change-charger-type-to-MA.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0025-power-supply-rk818-battery-Report-charging-status-ba.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0025-power-supply-rk818-battery-Report-charging-status-ba.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0025-power-supply-rk818-battery-Report-charging-status-ba.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0025-power-supply-rk818-battery-Report-charging-status-ba.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0026-power-supply-rk818-battery-Drop-dependency-on-frameb.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0026-power-supply-rk818-battery-Drop-dependency-on-frameb.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0026-power-supply-rk818-battery-Drop-dependency-on-frameb.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0026-power-supply-rk818-battery-Drop-dependency-on-frameb.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0027-power-supply-rk818-charger-Unify-rk818-charger-and-r.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0027-power-supply-rk818-charger-Unify-rk818-charger-and-r.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0027-power-supply-rk818-charger-Unify-rk818-charger-and-r.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0027-power-supply-rk818-charger-Unify-rk818-charger-and-r.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0028-power-supply-rk818-battery-Speed-up-battery-current-.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0028-power-supply-rk818-battery-Speed-up-battery-current-.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0028-power-supply-rk818-battery-Speed-up-battery-current-.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0028-power-supply-rk818-battery-Speed-up-battery-current-.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0029-power-supply-rk818-charger-Delay-applying-input-curr.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0029-power-supply-rk818-charger-Delay-applying-input-curr.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0029-power-supply-rk818-charger-Delay-applying-input-curr.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0029-power-supply-rk818-charger-Delay-applying-input-curr.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0030-power-supply-rk818-battery-Don-t-auto-poweroff-the-P.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0030-power-supply-rk818-battery-Don-t-auto-poweroff-the-P.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0030-power-supply-rk818-battery-Don-t-auto-poweroff-the-P.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0030-power-supply-rk818-battery-Don-t-auto-poweroff-the-P.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0031-power-supply-rk818-charger-Add-support-for-POWER_SUP.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0031-power-supply-rk818-charger-Add-support-for-POWER_SUP.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0031-power-supply-rk818-charger-Add-support-for-POWER_SUP.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0031-power-supply-rk818-charger-Add-support-for-POWER_SUP.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0032-power-supply-rk818-battery-Don-t-reset-dsoc-to-0-on-.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0032-power-supply-rk818-battery-Don-t-reset-dsoc-to-0-on-.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0032-power-supply-rk818-battery-Don-t-reset-dsoc-to-0-on-.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0032-power-supply-rk818-battery-Don-t-reset-dsoc-to-0-on-.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0033-supply-rk817-Fix-battery-capacity-sanity-check-calcu.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0033-supply-rk817-Fix-battery-capacity-sanity-check-calcu.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0033-supply-rk817-Fix-battery-capacity-sanity-check-calcu.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0033-supply-rk817-Fix-battery-capacity-sanity-check-calcu.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0034-power-supply-rk817-charger-Add-input-current-limit-s.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0034-power-supply-rk817-charger-Add-input-current-limit-s.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0034-power-supply-rk817-charger-Add-input-current-limit-s.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0034-power-supply-rk817-charger-Add-input-current-limit-s.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0035-power-supply-rk817-charger-Take-input-current-limit-.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0035-power-supply-rk817-charger-Take-input-current-limit-.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0035-power-supply-rk817-charger-Take-input-current-limit-.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0035-power-supply-rk817-charger-Take-input-current-limit-.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0036-power-supply-rk817-charger-Propagate-proper-errors.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0036-power-supply-rk817-charger-Propagate-proper-errors.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0036-power-supply-rk817-charger-Propagate-proper-errors.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0036-power-supply-rk817-charger-Propagate-proper-errors.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0037-power-supply-rk818-battery-charger-clear-unused-vari.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0037-power-supply-rk818-battery-charger-clear-unused-vari.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0037-power-supply-rk818-battery-charger-clear-unused-vari.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0037-power-supply-rk818-battery-charger-clear-unused-vari.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0038-arm64-meson-odroid-go-ultra-add-battery-and-charger-.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0038-arm64-meson-odroid-go-ultra-add-battery-and-charger-.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0038-arm64-meson-odroid-go-ultra-add-battery-and-charger-.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0038-arm64-meson-odroid-go-ultra-add-battery-and-charger-.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0039-ASoC-meson-axg-card-limit-the-volume-to-prevent-clip.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0039-ASoC-meson-axg-card-limit-the-volume-to-prevent-clip.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0039-ASoC-meson-axg-card-limit-the-volume-to-prevent-clip.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0039-ASoC-meson-axg-card-limit-the-volume-to-prevent-clip.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0040-power-supply-rk818_charger-change-syfs-node-name-so-.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0040-power-supply-rk818_charger-change-syfs-node-name-so-.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0040-power-supply-rk818_charger-change-syfs-node-name-so-.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0040-power-supply-rk818_charger-change-syfs-node-name-so-.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0041-arm64-meson-odroid-go-ultra-add-headphone-detection.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0041-arm64-meson-odroid-go-ultra-add-headphone-detection.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0041-arm64-meson-odroid-go-ultra-add-headphone-detection.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0041-arm64-meson-odroid-go-ultra-add-headphone-detection.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0042-arm64-dts-amlogic-odroid-go-ultra-Improve-sound-outp.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0042-arm64-dts-amlogic-odroid-go-ultra-Improve-sound-outp.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0042-arm64-dts-amlogic-odroid-go-ultra-Improve-sound-outp.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0042-arm64-dts-amlogic-odroid-go-ultra-Improve-sound-outp.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0043-arm64-meson-g12-common-remove-lower-freq-gpu-opps.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0043-arm64-meson-g12-common-remove-lower-freq-gpu-opps.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0043-arm64-meson-g12-common-remove-lower-freq-gpu-opps.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0043-arm64-meson-g12-common-remove-lower-freq-gpu-opps.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0046-power-supply-rk818_charger-fix-compiling-driver-on-6.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0046-power-supply-rk818_charger-fix-compiling-driver-on-6.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0046-power-supply-rk818_charger-fix-compiling-driver-on-6.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0046-power-supply-rk818_charger-fix-compiling-driver-on-6.patch diff --git a/board/amlogic/s922x/linux_patches/linux-0048-arm64-dts-amlogic-meson-g12b-odroid-n2-add-support-f.patch b/board/batocera/amlogic/s922x/linux_patches/linux-0048-arm64-dts-amlogic-meson-g12b-odroid-n2-add-support-f.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-0048-arm64-dts-amlogic-meson-g12b-odroid-n2-add-support-f.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-0048-arm64-dts-amlogic-meson-g12b-odroid-n2-add-support-f.patch diff --git a/board/amlogic/s922x/linux_patches/linux-battery-quircks.patch b/board/batocera/amlogic/s922x/linux_patches/linux-battery-quircks.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-battery-quircks.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-battery-quircks.patch diff --git a/board/amlogic/s922x/linux_patches/linux-usbhid-quircks.patch b/board/batocera/amlogic/s922x/linux_patches/linux-usbhid-quircks.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-usbhid-quircks.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-usbhid-quircks.patch diff --git a/board/amlogic/s922x/linux_patches/linux-wiimote-abs-not-hat.patch b/board/batocera/amlogic/s922x/linux_patches/linux-wiimote-abs-not-hat.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/linux-wiimote-abs-not-hat.patch rename to board/batocera/amlogic/s922x/linux_patches/linux-wiimote-abs-not-hat.patch diff --git a/board/amlogic/s922x/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch b/board/batocera/amlogic/s922x/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch similarity index 100% rename from board/amlogic/s922x/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch rename to board/batocera/amlogic/s922x/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch diff --git a/board/amlogic/s922x/odroid-go-ultra/boot/boot.ini b/board/batocera/amlogic/s922x/odroid-go-ultra/boot/boot.ini similarity index 100% rename from board/amlogic/s922x/odroid-go-ultra/boot/boot.ini rename to board/batocera/amlogic/s922x/odroid-go-ultra/boot/boot.ini diff --git a/board/amlogic/s922x/odroid-go-ultra/build-uboot.sh b/board/batocera/amlogic/s922x/odroid-go-ultra/build-uboot.sh similarity index 92% rename from board/amlogic/s922x/odroid-go-ultra/build-uboot.sh rename to board/batocera/amlogic/s922x/odroid-go-ultra/build-uboot.sh index a9158464ba7..087211b5d62 100755 --- a/board/amlogic/s922x/odroid-go-ultra/build-uboot.sh +++ b/board/batocera/amlogic/s922x/odroid-go-ultra/build-uboot.sh @@ -18,7 +18,7 @@ git clone https://github.com/hardkernel/u-boot.git -b odroidgoU-v2015.01 cd u-boot # Apply patches -PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/amlogic/s922x/patches/uboot-ogu/*.patch" +PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/batocera/amlogic/s922x/patches/uboot-ogu/*.patch" for patch in $PATCHES do echo "Applying patch: $patch" diff --git a/board/amlogic/s922x/odroid-go-ultra/create-boot-script.sh b/board/batocera/amlogic/s922x/odroid-go-ultra/create-boot-script.sh similarity index 100% rename from board/amlogic/s922x/odroid-go-ultra/create-boot-script.sh rename to board/batocera/amlogic/s922x/odroid-go-ultra/create-boot-script.sh diff --git a/board/amlogic/s922x/odroid-go-ultra/genimage.cfg b/board/batocera/amlogic/s922x/odroid-go-ultra/genimage.cfg similarity index 100% rename from board/amlogic/s922x/odroid-go-ultra/genimage.cfg rename to board/batocera/amlogic/s922x/odroid-go-ultra/genimage.cfg diff --git a/board/amlogic/s922x/odroid-n2/boot/boot.ini b/board/batocera/amlogic/s922x/odroid-n2/boot/boot.ini similarity index 100% rename from board/amlogic/s922x/odroid-n2/boot/boot.ini rename to board/batocera/amlogic/s922x/odroid-n2/boot/boot.ini diff --git a/board/amlogic/s922x/odroid-n2/boot/extlinux.conf b/board/batocera/amlogic/s922x/odroid-n2/boot/extlinux.conf similarity index 100% rename from board/amlogic/s922x/odroid-n2/boot/extlinux.conf rename to board/batocera/amlogic/s922x/odroid-n2/boot/extlinux.conf diff --git a/board/amlogic/s922x/odroid-n2/build-uboot.sh b/board/batocera/amlogic/s922x/odroid-n2/build-uboot.sh similarity index 88% rename from board/amlogic/s922x/odroid-n2/build-uboot.sh rename to board/batocera/amlogic/s922x/odroid-n2/build-uboot.sh index 123ba11e898..58d83fc0ade 100755 --- a/board/amlogic/s922x/odroid-n2/build-uboot.sh +++ b/board/batocera/amlogic/s922x/odroid-n2/build-uboot.sh @@ -10,7 +10,7 @@ tar xf u-boot-2024.01.tar.bz2 cd u-boot-2024.01 # Apply patches -PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/amlogic/s922x/patches/uboot/*.patch" +PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/batocera/amlogic/s922x/patches/uboot/*.patch" for patch in $PATCHES do echo "Applying patch: $patch" diff --git a/board/amlogic/s922x/odroid-n2/create-boot-script.sh b/board/batocera/amlogic/s922x/odroid-n2/create-boot-script.sh similarity index 100% rename from board/amlogic/s922x/odroid-n2/create-boot-script.sh rename to board/batocera/amlogic/s922x/odroid-n2/create-boot-script.sh diff --git a/board/amlogic/s922x/odroid-n2/genimage.cfg b/board/batocera/amlogic/s922x/odroid-n2/genimage.cfg similarity index 100% rename from board/amlogic/s922x/odroid-n2/genimage.cfg rename to board/batocera/amlogic/s922x/odroid-n2/genimage.cfg diff --git a/board/amlogic/s922x/odroid-n2l/boot/boot-logo.bmp.gz b/board/batocera/amlogic/s922x/odroid-n2l/boot/boot-logo.bmp.gz similarity index 100% rename from board/amlogic/s922x/odroid-n2l/boot/boot-logo.bmp.gz rename to board/batocera/amlogic/s922x/odroid-n2l/boot/boot-logo.bmp.gz diff --git a/board/amlogic/s922x/odroid-n2l/boot/boot.ini b/board/batocera/amlogic/s922x/odroid-n2l/boot/boot.ini similarity index 100% rename from board/amlogic/s922x/odroid-n2l/boot/boot.ini rename to board/batocera/amlogic/s922x/odroid-n2l/boot/boot.ini diff --git a/board/amlogic/s922x/odroid-n2l/boot/config.ini b/board/batocera/amlogic/s922x/odroid-n2l/boot/config.ini similarity index 100% rename from board/amlogic/s922x/odroid-n2l/boot/config.ini rename to board/batocera/amlogic/s922x/odroid-n2l/boot/config.ini diff --git a/board/amlogic/s922x/odroid-n2l/boot/extlinux.conf b/board/batocera/amlogic/s922x/odroid-n2l/boot/extlinux.conf similarity index 100% rename from board/amlogic/s922x/odroid-n2l/boot/extlinux.conf rename to board/batocera/amlogic/s922x/odroid-n2l/boot/extlinux.conf diff --git a/board/amlogic/s922x/odroid-n2l/build-uboot.sh b/board/batocera/amlogic/s922x/odroid-n2l/build-uboot.sh similarity index 92% rename from board/amlogic/s922x/odroid-n2l/build-uboot.sh rename to board/batocera/amlogic/s922x/odroid-n2l/build-uboot.sh index 90458fab936..68abee43d94 100755 --- a/board/amlogic/s922x/odroid-n2l/build-uboot.sh +++ b/board/batocera/amlogic/s922x/odroid-n2l/build-uboot.sh @@ -34,7 +34,7 @@ pushd "${uboot}" || exit 1 git clone --depth 1 https://github.com/LibreELEC/amlogic-boot-fip || exit 1 # Apply patch sets - for patch in ${BR2_EXTERNAL_BATOCERA_PATH}/board/amlogic/s922x/patches/uboot/*.patch; do + for patch in ${BR2_EXTERNAL_BATOCERA_PATH}/board/batocera/amlogic/s922x/patches/uboot/*.patch; do echo "Applying patch: $patch" patch -p1 < "$patch" || exit 1 done diff --git a/board/amlogic/s922x/odroid-n2l/create-boot-script.sh b/board/batocera/amlogic/s922x/odroid-n2l/create-boot-script.sh similarity index 100% rename from board/amlogic/s922x/odroid-n2l/create-boot-script.sh rename to board/batocera/amlogic/s922x/odroid-n2l/create-boot-script.sh diff --git a/board/amlogic/s922x/odroid-n2l/genimage.cfg b/board/batocera/amlogic/s922x/odroid-n2l/genimage.cfg similarity index 100% rename from board/amlogic/s922x/odroid-n2l/genimage.cfg rename to board/batocera/amlogic/s922x/odroid-n2l/genimage.cfg diff --git a/board/amlogic/s922x/odroid-n2plus/boot/boot-logo.bmp.gz b/board/batocera/amlogic/s922x/odroid-n2plus/boot/boot-logo.bmp.gz similarity index 100% rename from board/amlogic/s922x/odroid-n2plus/boot/boot-logo.bmp.gz rename to board/batocera/amlogic/s922x/odroid-n2plus/boot/boot-logo.bmp.gz diff --git a/board/amlogic/s922x/odroid-n2plus/boot/boot.ini b/board/batocera/amlogic/s922x/odroid-n2plus/boot/boot.ini similarity index 100% rename from board/amlogic/s922x/odroid-n2plus/boot/boot.ini rename to board/batocera/amlogic/s922x/odroid-n2plus/boot/boot.ini diff --git a/board/amlogic/s922x/odroid-n2plus/boot/extlinux.conf b/board/batocera/amlogic/s922x/odroid-n2plus/boot/extlinux.conf similarity index 100% rename from board/amlogic/s922x/odroid-n2plus/boot/extlinux.conf rename to board/batocera/amlogic/s922x/odroid-n2plus/boot/extlinux.conf diff --git a/board/amlogic/s922x/odroid-n2plus/build-uboot.sh b/board/batocera/amlogic/s922x/odroid-n2plus/build-uboot.sh similarity index 88% rename from board/amlogic/s922x/odroid-n2plus/build-uboot.sh rename to board/batocera/amlogic/s922x/odroid-n2plus/build-uboot.sh index a50d4338022..6517de17f7c 100755 --- a/board/amlogic/s922x/odroid-n2plus/build-uboot.sh +++ b/board/batocera/amlogic/s922x/odroid-n2plus/build-uboot.sh @@ -10,7 +10,7 @@ tar xf u-boot-2024.01.tar.bz2 cd u-boot-2024.01 # Apply patches -PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/amlogic/s922x/patches/uboot/*.patch" +PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/batocera/amlogic/s922x/patches/uboot/*.patch" for patch in $PATCHES do echo "Applying patch: $patch" diff --git a/board/amlogic/s922x/odroid-n2plus/create-boot-script.sh b/board/batocera/amlogic/s922x/odroid-n2plus/create-boot-script.sh similarity index 100% rename from board/amlogic/s922x/odroid-n2plus/create-boot-script.sh rename to board/batocera/amlogic/s922x/odroid-n2plus/create-boot-script.sh diff --git a/board/amlogic/s922x/odroid-n2plus/genimage.cfg b/board/batocera/amlogic/s922x/odroid-n2plus/genimage.cfg similarity index 100% rename from board/amlogic/s922x/odroid-n2plus/genimage.cfg rename to board/batocera/amlogic/s922x/odroid-n2plus/genimage.cfg diff --git a/board/amlogic/s922x/patches/dolphin-emu/001-egl-no-x11.patch b/board/batocera/amlogic/s922x/patches/dolphin-emu/001-egl-no-x11.patch similarity index 100% rename from board/amlogic/s922x/patches/dolphin-emu/001-egl-no-x11.patch rename to board/batocera/amlogic/s922x/patches/dolphin-emu/001-egl-no-x11.patch diff --git a/board/amlogic/s922x/patches/uboot-ogu/uboot-000-ODROID-GOU-modify-lcd-logic-to-accomodate-kernel-6.x.patch b/board/batocera/amlogic/s922x/patches/uboot-ogu/uboot-000-ODROID-GOU-modify-lcd-logic-to-accomodate-kernel-6.x.patch similarity index 100% rename from board/amlogic/s922x/patches/uboot-ogu/uboot-000-ODROID-GOU-modify-lcd-logic-to-accomodate-kernel-6.x.patch rename to board/batocera/amlogic/s922x/patches/uboot-ogu/uboot-000-ODROID-GOU-modify-lcd-logic-to-accomodate-kernel-6.x.patch diff --git a/board/amlogic/s922x/patches/uboot-ogu/uboot-001-fix-export-toolchain.patch b/board/batocera/amlogic/s922x/patches/uboot-ogu/uboot-001-fix-export-toolchain.patch similarity index 100% rename from board/amlogic/s922x/patches/uboot-ogu/uboot-001-fix-export-toolchain.patch rename to board/batocera/amlogic/s922x/patches/uboot-ogu/uboot-001-fix-export-toolchain.patch diff --git a/board/amlogic/s922x/patches/uboot-ogu/uboot-002-odroidgo4-boot-sdcard-emmc.patch b/board/batocera/amlogic/s922x/patches/uboot-ogu/uboot-002-odroidgo4-boot-sdcard-emmc.patch similarity index 100% rename from board/amlogic/s922x/patches/uboot-ogu/uboot-002-odroidgo4-boot-sdcard-emmc.patch rename to board/batocera/amlogic/s922x/patches/uboot-ogu/uboot-002-odroidgo4-boot-sdcard-emmc.patch diff --git a/board/amlogic/s922x/patches/uboot-ogu/uboot-003-fix-name-dtb.patch b/board/batocera/amlogic/s922x/patches/uboot-ogu/uboot-003-fix-name-dtb.patch similarity index 100% rename from board/amlogic/s922x/patches/uboot-ogu/uboot-003-fix-name-dtb.patch rename to board/batocera/amlogic/s922x/patches/uboot-ogu/uboot-003-fix-name-dtb.patch diff --git a/board/amlogic/s922x/patches/uboot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch b/board/batocera/amlogic/s922x/patches/uboot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch similarity index 100% rename from board/amlogic/s922x/patches/uboot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch rename to board/batocera/amlogic/s922x/patches/uboot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch diff --git a/board/amlogic/s922x/patches/uboot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch b/board/batocera/amlogic/s922x/patches/uboot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch similarity index 100% rename from board/amlogic/s922x/patches/uboot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch rename to board/batocera/amlogic/s922x/patches/uboot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch diff --git a/board/amlogic/s922x/patches/uboot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch b/board/batocera/amlogic/s922x/patches/uboot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch similarity index 100% rename from board/amlogic/s922x/patches/uboot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch rename to board/batocera/amlogic/s922x/patches/uboot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch diff --git a/board/amlogic/s922x/patches/uboot/u-boot-0004-FROMGIT-net-Add-Amlogic-GXL-MDIO-Mux-driver.patch b/board/batocera/amlogic/s922x/patches/uboot/u-boot-0004-FROMGIT-net-Add-Amlogic-GXL-MDIO-Mux-driver.patch similarity index 100% rename from board/amlogic/s922x/patches/uboot/u-boot-0004-FROMGIT-net-Add-Amlogic-GXL-MDIO-Mux-driver.patch rename to board/batocera/amlogic/s922x/patches/uboot/u-boot-0004-FROMGIT-net-Add-Amlogic-GXL-MDIO-Mux-driver.patch diff --git a/board/amlogic/s922x/patches/uboot/u-boot-0005-FROMGIT-ARM-dts-sync-Amlogic-GX-DT-to-Linux-v6.4.patch b/board/batocera/amlogic/s922x/patches/uboot/u-boot-0005-FROMGIT-ARM-dts-sync-Amlogic-GX-DT-to-Linux-v6.4.patch similarity index 100% rename from board/amlogic/s922x/patches/uboot/u-boot-0005-FROMGIT-ARM-dts-sync-Amlogic-GX-DT-to-Linux-v6.4.patch rename to board/batocera/amlogic/s922x/patches/uboot/u-boot-0005-FROMGIT-ARM-dts-sync-Amlogic-GX-DT-to-Linux-v6.4.patch diff --git a/board/amlogic/s922x/patches/uboot/u-boot-0006-meson64-boot-usb-nvme-scsi-first.patch b/board/batocera/amlogic/s922x/patches/uboot/u-boot-0006-meson64-boot-usb-nvme-scsi-first.patch similarity index 100% rename from board/amlogic/s922x/patches/uboot/u-boot-0006-meson64-boot-usb-nvme-scsi-first.patch rename to board/batocera/amlogic/s922x/patches/uboot/u-boot-0006-meson64-boot-usb-nvme-scsi-first.patch diff --git a/board/amlogic/s922x/radxa-zero2/boot/extlinux.conf b/board/batocera/amlogic/s922x/radxa-zero2/boot/extlinux.conf similarity index 100% rename from board/amlogic/s922x/radxa-zero2/boot/extlinux.conf rename to board/batocera/amlogic/s922x/radxa-zero2/boot/extlinux.conf diff --git a/board/amlogic/s922x/radxa-zero2/build-uboot.sh b/board/batocera/amlogic/s922x/radxa-zero2/build-uboot.sh similarity index 88% rename from board/amlogic/s922x/radxa-zero2/build-uboot.sh rename to board/batocera/amlogic/s922x/radxa-zero2/build-uboot.sh index c0ef2db4ec7..b2adf80308e 100755 --- a/board/amlogic/s922x/radxa-zero2/build-uboot.sh +++ b/board/batocera/amlogic/s922x/radxa-zero2/build-uboot.sh @@ -10,7 +10,7 @@ tar xf u-boot-2024.01.tar.bz2 cd u-boot-2024.01 # Apply patches -PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/amlogic/s922x/patches/uboot/*.patch" +PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/batocera/amlogic/s922x/patches/uboot/*.patch" for patch in $PATCHES do echo "Applying patch: $patch" diff --git a/board/amlogic/s922x/radxa-zero2/create-boot-script.sh b/board/batocera/amlogic/s922x/radxa-zero2/create-boot-script.sh similarity index 100% rename from board/amlogic/s922x/radxa-zero2/create-boot-script.sh rename to board/batocera/amlogic/s922x/radxa-zero2/create-boot-script.sh diff --git a/board/amlogic/s922x/radxa-zero2/genimage.cfg b/board/batocera/amlogic/s922x/radxa-zero2/genimage.cfg similarity index 100% rename from board/amlogic/s922x/radxa-zero2/genimage.cfg rename to board/batocera/amlogic/s922x/radxa-zero2/genimage.cfg diff --git a/board/amlogic/s9gen4/fsoverlay/etc/modprobe.d/8188eu.conf b/board/batocera/amlogic/s9gen4/fsoverlay/etc/modprobe.d/8188eu.conf similarity index 100% rename from board/amlogic/s9gen4/fsoverlay/etc/modprobe.d/8188eu.conf rename to board/batocera/amlogic/s9gen4/fsoverlay/etc/modprobe.d/8188eu.conf diff --git a/board/amlogic/s9gen4/fsoverlay/etc/modules.conf b/board/batocera/amlogic/s9gen4/fsoverlay/etc/modules.conf similarity index 100% rename from board/amlogic/s9gen4/fsoverlay/etc/modules.conf rename to board/batocera/amlogic/s9gen4/fsoverlay/etc/modules.conf diff --git a/board/amlogic/s9gen4/fsoverlay/usr/share/alsa/alsa.conf b/board/batocera/amlogic/s9gen4/fsoverlay/usr/share/alsa/alsa.conf similarity index 100% rename from board/amlogic/s9gen4/fsoverlay/usr/share/alsa/alsa.conf rename to board/batocera/amlogic/s9gen4/fsoverlay/usr/share/alsa/alsa.conf diff --git a/board/amlogic/s9gen4/fsoverlay/usr/share/alsa/cards/HDMI.conf b/board/batocera/amlogic/s9gen4/fsoverlay/usr/share/alsa/cards/HDMI.conf similarity index 100% rename from board/amlogic/s9gen4/fsoverlay/usr/share/alsa/cards/HDMI.conf rename to board/batocera/amlogic/s9gen4/fsoverlay/usr/share/alsa/cards/HDMI.conf diff --git a/board/amlogic/s9gen4/khadas-vim1s/boot/extlinux.conf b/board/batocera/amlogic/s9gen4/khadas-vim1s/boot/extlinux.conf similarity index 100% rename from board/amlogic/s9gen4/khadas-vim1s/boot/extlinux.conf rename to board/batocera/amlogic/s9gen4/khadas-vim1s/boot/extlinux.conf diff --git a/board/amlogic/s9gen4/khadas-vim1s/build-uboot.sh b/board/batocera/amlogic/s9gen4/khadas-vim1s/build-uboot.sh similarity index 100% rename from board/amlogic/s9gen4/khadas-vim1s/build-uboot.sh rename to board/batocera/amlogic/s9gen4/khadas-vim1s/build-uboot.sh diff --git a/board/amlogic/s9gen4/khadas-vim1s/create-boot-script.sh b/board/batocera/amlogic/s9gen4/khadas-vim1s/create-boot-script.sh similarity index 100% rename from board/amlogic/s9gen4/khadas-vim1s/create-boot-script.sh rename to board/batocera/amlogic/s9gen4/khadas-vim1s/create-boot-script.sh diff --git a/board/amlogic/s9gen4/khadas-vim1s/genimage.cfg b/board/batocera/amlogic/s9gen4/khadas-vim1s/genimage.cfg similarity index 100% rename from board/amlogic/s9gen4/khadas-vim1s/genimage.cfg rename to board/batocera/amlogic/s9gen4/khadas-vim1s/genimage.cfg diff --git a/board/amlogic/s9gen4/linux-defconfig-fragment.config b/board/batocera/amlogic/s9gen4/linux-defconfig-fragment.config similarity index 100% rename from board/amlogic/s9gen4/linux-defconfig-fragment.config rename to board/batocera/amlogic/s9gen4/linux-defconfig-fragment.config diff --git a/board/amlogic/s9gen4/linux-vim1s-5.4.180.config b/board/batocera/amlogic/s9gen4/linux-vim1s-5.4.180.config similarity index 100% rename from board/amlogic/s9gen4/linux-vim1s-5.4.180.config rename to board/batocera/amlogic/s9gen4/linux-vim1s-5.4.180.config diff --git a/board/amlogic/s9gen4/linux_patches/001-fix-gcc13.patch b/board/batocera/amlogic/s9gen4/linux_patches/001-fix-gcc13.patch similarity index 100% rename from board/amlogic/s9gen4/linux_patches/001-fix-gcc13.patch rename to board/batocera/amlogic/s9gen4/linux_patches/001-fix-gcc13.patch diff --git a/board/amlogic/s9gen4/linux_patches/002-fix-Makefile.patch b/board/batocera/amlogic/s9gen4/linux_patches/002-fix-Makefile.patch similarity index 100% rename from board/amlogic/s9gen4/linux_patches/002-fix-Makefile.patch rename to board/batocera/amlogic/s9gen4/linux_patches/002-fix-Makefile.patch diff --git a/board/amlogic/s9gen4/linux_patches/003-null-Makefile-amlogic-isp_module.patch b/board/batocera/amlogic/s9gen4/linux_patches/003-null-Makefile-amlogic-isp_module.patch similarity index 100% rename from board/amlogic/s9gen4/linux_patches/003-null-Makefile-amlogic-isp_module.patch rename to board/batocera/amlogic/s9gen4/linux_patches/003-null-Makefile-amlogic-isp_module.patch diff --git a/board/amlogic/s9gen4/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch b/board/batocera/amlogic/s9gen4/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch similarity index 100% rename from board/amlogic/s9gen4/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch rename to board/batocera/amlogic/s9gen4/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch diff --git a/board/amlogic/s9gen4/patches/ffmpeg/libv4l-missing-v4l2-type-capture-type.patch b/board/batocera/amlogic/s9gen4/patches/ffmpeg/libv4l-missing-v4l2-type-capture-type.patch similarity index 100% rename from board/amlogic/s9gen4/patches/ffmpeg/libv4l-missing-v4l2-type-capture-type.patch rename to board/batocera/amlogic/s9gen4/patches/ffmpeg/libv4l-missing-v4l2-type-capture-type.patch diff --git a/board/amlogic/s9gen4/patches/new-lg4ff/force-define-config_logiwheels_ff.patch b/board/batocera/amlogic/s9gen4/patches/new-lg4ff/force-define-config_logiwheels_ff.patch similarity index 100% rename from board/amlogic/s9gen4/patches/new-lg4ff/force-define-config_logiwheels_ff.patch rename to board/batocera/amlogic/s9gen4/patches/new-lg4ff/force-define-config_logiwheels_ff.patch diff --git a/board/amlogic/s9gen4/patches/retroarch/001-fix-wayland-egl.patch b/board/batocera/amlogic/s9gen4/patches/retroarch/001-fix-wayland-egl.patch similarity index 100% rename from board/amlogic/s9gen4/patches/retroarch/001-fix-wayland-egl.patch rename to board/batocera/amlogic/s9gen4/patches/retroarch/001-fix-wayland-egl.patch diff --git a/board/amlogic/s9gen4/patches/sdl2/sdl2-fix-kmsdrm.patch b/board/batocera/amlogic/s9gen4/patches/sdl2/sdl2-fix-kmsdrm.patch similarity index 100% rename from board/amlogic/s9gen4/patches/sdl2/sdl2-fix-kmsdrm.patch rename to board/batocera/amlogic/s9gen4/patches/sdl2/sdl2-fix-kmsdrm.patch diff --git a/board/amlogic/s9gen4/patches/weston/001-libmali-fix.patch b/board/batocera/amlogic/s9gen4/patches/weston/001-libmali-fix.patch similarity index 100% rename from board/amlogic/s9gen4/patches/weston/001-libmali-fix.patch rename to board/batocera/amlogic/s9gen4/patches/weston/001-libmali-fix.patch diff --git a/board/amlogic/s9gen4/patches/weston/002-libmali-fix.patch b/board/batocera/amlogic/s9gen4/patches/weston/002-libmali-fix.patch similarity index 100% rename from board/amlogic/s9gen4/patches/weston/002-libmali-fix.patch rename to board/batocera/amlogic/s9gen4/patches/weston/002-libmali-fix.patch diff --git a/board/amlogic/s9gen4/patches/xpad-noone/001-fix-input_device_enabled.patch b/board/batocera/amlogic/s9gen4/patches/xpad-noone/001-fix-input_device_enabled.patch similarity index 100% rename from board/amlogic/s9gen4/patches/xpad-noone/001-fix-input_device_enabled.patch rename to board/batocera/amlogic/s9gen4/patches/xpad-noone/001-fix-input_device_enabled.patch diff --git a/board/broadcom/bcm2711/boot/cmdline.txt b/board/batocera/broadcom/bcm2711/boot/cmdline.txt similarity index 100% rename from board/broadcom/bcm2711/boot/cmdline.txt rename to board/batocera/broadcom/bcm2711/boot/cmdline.txt diff --git a/board/broadcom/bcm2711/boot/config.txt b/board/batocera/broadcom/bcm2711/boot/config.txt similarity index 100% rename from board/broadcom/bcm2711/boot/config.txt rename to board/batocera/broadcom/bcm2711/boot/config.txt diff --git a/board/broadcom/bcm2711/create-boot-script.sh b/board/batocera/broadcom/bcm2711/create-boot-script.sh similarity index 100% rename from board/broadcom/bcm2711/create-boot-script.sh rename to board/batocera/broadcom/bcm2711/create-boot-script.sh diff --git a/board/broadcom/bcm2711/fsoverlay/.gitkeep b/board/batocera/broadcom/bcm2711/fsoverlay/.gitkeep similarity index 100% rename from board/broadcom/bcm2711/fsoverlay/.gitkeep rename to board/batocera/broadcom/bcm2711/fsoverlay/.gitkeep diff --git a/board/broadcom/bcm2711/fsoverlay/etc/modules.conf b/board/batocera/broadcom/bcm2711/fsoverlay/etc/modules.conf similarity index 100% rename from board/broadcom/bcm2711/fsoverlay/etc/modules.conf rename to board/batocera/broadcom/bcm2711/fsoverlay/etc/modules.conf diff --git a/board/broadcom/bcm2711/genimage.cfg b/board/batocera/broadcom/bcm2711/genimage.cfg similarity index 100% rename from board/broadcom/bcm2711/genimage.cfg rename to board/batocera/broadcom/bcm2711/genimage.cfg diff --git a/board/broadcom/bcm2711/linux-broadcom64-current.config b/board/batocera/broadcom/bcm2711/linux-broadcom64-current.config similarity index 100% rename from board/broadcom/bcm2711/linux-broadcom64-current.config rename to board/batocera/broadcom/bcm2711/linux-broadcom64-current.config diff --git a/board/broadcom/bcm2711/patches/cannonball/001-gles.patch b/board/batocera/broadcom/bcm2711/patches/cannonball/001-gles.patch similarity index 100% rename from board/broadcom/bcm2711/patches/cannonball/001-gles.patch rename to board/batocera/broadcom/bcm2711/patches/cannonball/001-gles.patch diff --git a/board/broadcom/bcm2711/patches/ffmpeg/ffmpeg-001-rpi.patch b/board/batocera/broadcom/bcm2711/patches/ffmpeg/ffmpeg-001-rpi.patch similarity index 100% rename from board/broadcom/bcm2711/patches/ffmpeg/ffmpeg-001-rpi.patch rename to board/batocera/broadcom/bcm2711/patches/ffmpeg/ffmpeg-001-rpi.patch diff --git a/board/broadcom/bcm2711/patches/libretro-yabasanshiro/001-workaround-mesa-shaders.patch b/board/batocera/broadcom/bcm2711/patches/libretro-yabasanshiro/001-workaround-mesa-shaders.patch similarity index 100% rename from board/broadcom/bcm2711/patches/libretro-yabasanshiro/001-workaround-mesa-shaders.patch rename to board/batocera/broadcom/bcm2711/patches/libretro-yabasanshiro/001-workaround-mesa-shaders.patch diff --git a/board/broadcom/bcm2711/patches/mame/switchres-no-xrandr.patch b/board/batocera/broadcom/bcm2711/patches/mame/switchres-no-xrandr.patch similarity index 100% rename from board/broadcom/bcm2711/patches/mame/switchres-no-xrandr.patch rename to board/batocera/broadcom/bcm2711/patches/mame/switchres-no-xrandr.patch diff --git a/board/broadcom/bcm2711/patches/sugarbox/001-gles.patch b/board/batocera/broadcom/bcm2711/patches/sugarbox/001-gles.patch similarity index 100% rename from board/broadcom/bcm2711/patches/sugarbox/001-gles.patch rename to board/batocera/broadcom/bcm2711/patches/sugarbox/001-gles.patch diff --git a/board/broadcom/bcm2712/boot/cmdline.txt b/board/batocera/broadcom/bcm2712/boot/cmdline.txt similarity index 100% rename from board/broadcom/bcm2712/boot/cmdline.txt rename to board/batocera/broadcom/bcm2712/boot/cmdline.txt diff --git a/board/broadcom/bcm2712/boot/config.txt b/board/batocera/broadcom/bcm2712/boot/config.txt similarity index 100% rename from board/broadcom/bcm2712/boot/config.txt rename to board/batocera/broadcom/bcm2712/boot/config.txt diff --git a/board/broadcom/bcm2712/create-boot-script.sh b/board/batocera/broadcom/bcm2712/create-boot-script.sh similarity index 100% rename from board/broadcom/bcm2712/create-boot-script.sh rename to board/batocera/broadcom/bcm2712/create-boot-script.sh diff --git a/board/broadcom/bcm2712/fsoverlay/.gitkeep b/board/batocera/broadcom/bcm2712/fsoverlay/.gitkeep similarity index 100% rename from board/broadcom/bcm2712/fsoverlay/.gitkeep rename to board/batocera/broadcom/bcm2712/fsoverlay/.gitkeep diff --git a/board/broadcom/bcm2712/fsoverlay/etc/modules.conf b/board/batocera/broadcom/bcm2712/fsoverlay/etc/modules.conf similarity index 100% rename from board/broadcom/bcm2712/fsoverlay/etc/modules.conf rename to board/batocera/broadcom/bcm2712/fsoverlay/etc/modules.conf diff --git a/board/broadcom/bcm2712/genimage.cfg b/board/batocera/broadcom/bcm2712/genimage.cfg similarity index 100% rename from board/broadcom/bcm2712/genimage.cfg rename to board/batocera/broadcom/bcm2712/genimage.cfg diff --git a/board/broadcom/bcm2712/linux-broadcom64-current.config b/board/batocera/broadcom/bcm2712/linux-broadcom64-current.config similarity index 100% rename from board/broadcom/bcm2712/linux-broadcom64-current.config rename to board/batocera/broadcom/bcm2712/linux-broadcom64-current.config diff --git a/board/broadcom/bcm2712/patches/cannonball/001-gles.patch b/board/batocera/broadcom/bcm2712/patches/cannonball/001-gles.patch similarity index 100% rename from board/broadcom/bcm2712/patches/cannonball/001-gles.patch rename to board/batocera/broadcom/bcm2712/patches/cannonball/001-gles.patch diff --git a/board/broadcom/bcm2712/patches/ffmpeg/ffmpeg-001-rpi.patch b/board/batocera/broadcom/bcm2712/patches/ffmpeg/ffmpeg-001-rpi.patch similarity index 100% rename from board/broadcom/bcm2712/patches/ffmpeg/ffmpeg-001-rpi.patch rename to board/batocera/broadcom/bcm2712/patches/ffmpeg/ffmpeg-001-rpi.patch diff --git a/board/broadcom/bcm2712/patches/libretro-yabasanshiro/001-workaround-mesa-shaders.patch b/board/batocera/broadcom/bcm2712/patches/libretro-yabasanshiro/001-workaround-mesa-shaders.patch similarity index 100% rename from board/broadcom/bcm2712/patches/libretro-yabasanshiro/001-workaround-mesa-shaders.patch rename to board/batocera/broadcom/bcm2712/patches/libretro-yabasanshiro/001-workaround-mesa-shaders.patch diff --git a/board/broadcom/bcm2712/patches/mame/switchres-no-xrandr.patch b/board/batocera/broadcom/bcm2712/patches/mame/switchres-no-xrandr.patch similarity index 100% rename from board/broadcom/bcm2712/patches/mame/switchres-no-xrandr.patch rename to board/batocera/broadcom/bcm2712/patches/mame/switchres-no-xrandr.patch diff --git a/board/broadcom/bcm2712/patches/sudachi/001-nx_tzdb-no-crosscompile.patch b/board/batocera/broadcom/bcm2712/patches/sudachi/001-nx_tzdb-no-crosscompile.patch similarity index 100% rename from board/broadcom/bcm2712/patches/sudachi/001-nx_tzdb-no-crosscompile.patch rename to board/batocera/broadcom/bcm2712/patches/sudachi/001-nx_tzdb-no-crosscompile.patch diff --git a/board/broadcom/bcm2712/patches/sudachi/002-HACK-fix-src-videocore.patch b/board/batocera/broadcom/bcm2712/patches/sudachi/002-HACK-fix-src-videocore.patch similarity index 100% rename from board/broadcom/bcm2712/patches/sudachi/002-HACK-fix-src-videocore.patch rename to board/batocera/broadcom/bcm2712/patches/sudachi/002-HACK-fix-src-videocore.patch diff --git a/board/broadcom/bcm2712/patches/sudachi/003-HACK-no-werror-shadow.patch b/board/batocera/broadcom/bcm2712/patches/sudachi/003-HACK-no-werror-shadow.patch similarity index 100% rename from board/broadcom/bcm2712/patches/sudachi/003-HACK-no-werror-shadow.patch rename to board/batocera/broadcom/bcm2712/patches/sudachi/003-HACK-no-werror-shadow.patch diff --git a/board/broadcom/bcm2712/patches/sugarbox/001-gles.patch b/board/batocera/broadcom/bcm2712/patches/sugarbox/001-gles.patch similarity index 100% rename from board/broadcom/bcm2712/patches/sugarbox/001-gles.patch rename to board/batocera/broadcom/bcm2712/patches/sugarbox/001-gles.patch diff --git a/board/broadcom/bcm2712/patches/vita3k/001-fix-xxhash.patch b/board/batocera/broadcom/bcm2712/patches/vita3k/001-fix-xxhash.patch similarity index 100% rename from board/broadcom/bcm2712/patches/vita3k/001-fix-xxhash.patch rename to board/batocera/broadcom/bcm2712/patches/vita3k/001-fix-xxhash.patch diff --git a/board/broadcom/bcm2712/patches/vita3k/003-drop-xdg-desktop-portals.patch b/board/batocera/broadcom/bcm2712/patches/vita3k/003-drop-xdg-desktop-portals.patch similarity index 100% rename from board/broadcom/bcm2712/patches/vita3k/003-drop-xdg-desktop-portals.patch rename to board/batocera/broadcom/bcm2712/patches/vita3k/003-drop-xdg-desktop-portals.patch diff --git a/board/broadcom/bcm2835/boot/cmdline.txt b/board/batocera/broadcom/bcm2835/boot/cmdline.txt similarity index 100% rename from board/broadcom/bcm2835/boot/cmdline.txt rename to board/batocera/broadcom/bcm2835/boot/cmdline.txt diff --git a/board/broadcom/bcm2835/boot/config.txt b/board/batocera/broadcom/bcm2835/boot/config.txt similarity index 100% rename from board/broadcom/bcm2835/boot/config.txt rename to board/batocera/broadcom/bcm2835/boot/config.txt diff --git a/board/broadcom/bcm2835/create-boot-script.sh b/board/batocera/broadcom/bcm2835/create-boot-script.sh similarity index 100% rename from board/broadcom/bcm2835/create-boot-script.sh rename to board/batocera/broadcom/bcm2835/create-boot-script.sh diff --git a/board/broadcom/bcm2835/fsoverlay/etc/openal/alsoft.conf b/board/batocera/broadcom/bcm2835/fsoverlay/etc/openal/alsoft.conf similarity index 100% rename from board/broadcom/bcm2835/fsoverlay/etc/openal/alsoft.conf rename to board/batocera/broadcom/bcm2835/fsoverlay/etc/openal/alsoft.conf diff --git a/board/broadcom/bcm2835/genimage.cfg b/board/batocera/broadcom/bcm2835/genimage.cfg similarity index 100% rename from board/broadcom/bcm2835/genimage.cfg rename to board/batocera/broadcom/bcm2835/genimage.cfg diff --git a/board/broadcom/bcm2835/linux-broadcom32-current.config b/board/batocera/broadcom/bcm2835/linux-broadcom32-current.config similarity index 100% rename from board/broadcom/bcm2835/linux-broadcom32-current.config rename to board/batocera/broadcom/bcm2835/linux-broadcom32-current.config diff --git a/board/broadcom/bcm2835/patches/cannonball/001-gles.patch b/board/batocera/broadcom/bcm2835/patches/cannonball/001-gles.patch similarity index 100% rename from board/broadcom/bcm2835/patches/cannonball/001-gles.patch rename to board/batocera/broadcom/bcm2835/patches/cannonball/001-gles.patch diff --git a/board/broadcom/bcm2835/patches/thextech/001-no-glesv1_cm.patch.disabled b/board/batocera/broadcom/bcm2835/patches/thextech/001-no-glesv1_cm.patch.disabled similarity index 100% rename from board/broadcom/bcm2835/patches/thextech/001-no-glesv1_cm.patch.disabled rename to board/batocera/broadcom/bcm2835/patches/thextech/001-no-glesv1_cm.patch.disabled diff --git a/board/broadcom/bcm2836/boot/cmdline.txt b/board/batocera/broadcom/bcm2836/boot/cmdline.txt similarity index 100% rename from board/broadcom/bcm2836/boot/cmdline.txt rename to board/batocera/broadcom/bcm2836/boot/cmdline.txt diff --git a/board/broadcom/bcm2836/boot/config.txt b/board/batocera/broadcom/bcm2836/boot/config.txt similarity index 100% rename from board/broadcom/bcm2836/boot/config.txt rename to board/batocera/broadcom/bcm2836/boot/config.txt diff --git a/board/broadcom/bcm2836/create-boot-script.sh b/board/batocera/broadcom/bcm2836/create-boot-script.sh similarity index 100% rename from board/broadcom/bcm2836/create-boot-script.sh rename to board/batocera/broadcom/bcm2836/create-boot-script.sh diff --git a/board/broadcom/bcm2836/fsoverlay/etc/openal/alsoft.conf b/board/batocera/broadcom/bcm2836/fsoverlay/etc/openal/alsoft.conf similarity index 100% rename from board/broadcom/bcm2836/fsoverlay/etc/openal/alsoft.conf rename to board/batocera/broadcom/bcm2836/fsoverlay/etc/openal/alsoft.conf diff --git a/board/broadcom/bcm2836/genimage.cfg b/board/batocera/broadcom/bcm2836/genimage.cfg similarity index 100% rename from board/broadcom/bcm2836/genimage.cfg rename to board/batocera/broadcom/bcm2836/genimage.cfg diff --git a/board/broadcom/bcm2836/linux-broadcom32-current.config b/board/batocera/broadcom/bcm2836/linux-broadcom32-current.config similarity index 100% rename from board/broadcom/bcm2836/linux-broadcom32-current.config rename to board/batocera/broadcom/bcm2836/linux-broadcom32-current.config diff --git a/board/broadcom/bcm2836/patches/cannonball/001-gles.patch b/board/batocera/broadcom/bcm2836/patches/cannonball/001-gles.patch similarity index 100% rename from board/broadcom/bcm2836/patches/cannonball/001-gles.patch rename to board/batocera/broadcom/bcm2836/patches/cannonball/001-gles.patch diff --git a/board/broadcom/bcm2836/patches/duckstation-legacy/board-disable-message-OpenGL.patch b/board/batocera/broadcom/bcm2836/patches/duckstation-legacy/board-disable-message-OpenGL.patch similarity index 100% rename from board/broadcom/bcm2836/patches/duckstation-legacy/board-disable-message-OpenGL.patch rename to board/batocera/broadcom/bcm2836/patches/duckstation-legacy/board-disable-message-OpenGL.patch diff --git a/board/broadcom/bcm2836/patches/ffmpeg/ffmpeg-001-rpi.patch b/board/batocera/broadcom/bcm2836/patches/ffmpeg/ffmpeg-001-rpi.patch similarity index 100% rename from board/broadcom/bcm2836/patches/ffmpeg/ffmpeg-001-rpi.patch rename to board/batocera/broadcom/bcm2836/patches/ffmpeg/ffmpeg-001-rpi.patch diff --git a/board/broadcom/bcm2836/patches/mame/switchres-no-xrandr.patch b/board/batocera/broadcom/bcm2836/patches/mame/switchres-no-xrandr.patch similarity index 100% rename from board/broadcom/bcm2836/patches/mame/switchres-no-xrandr.patch rename to board/batocera/broadcom/bcm2836/patches/mame/switchres-no-xrandr.patch diff --git a/board/broadcom/bcm2837/boot/cmdline.txt b/board/batocera/broadcom/bcm2837/boot/cmdline.txt similarity index 100% rename from board/broadcom/bcm2837/boot/cmdline.txt rename to board/batocera/broadcom/bcm2837/boot/cmdline.txt diff --git a/board/broadcom/bcm2837/boot/config.txt b/board/batocera/broadcom/bcm2837/boot/config.txt similarity index 100% rename from board/broadcom/bcm2837/boot/config.txt rename to board/batocera/broadcom/bcm2837/boot/config.txt diff --git a/board/broadcom/bcm2837/create-boot-script.sh b/board/batocera/broadcom/bcm2837/create-boot-script.sh similarity index 100% rename from board/broadcom/bcm2837/create-boot-script.sh rename to board/batocera/broadcom/bcm2837/create-boot-script.sh diff --git a/board/broadcom/bcm2837/fsoverlay/etc/openal/alsoft.conf b/board/batocera/broadcom/bcm2837/fsoverlay/etc/openal/alsoft.conf similarity index 100% rename from board/broadcom/bcm2837/fsoverlay/etc/openal/alsoft.conf rename to board/batocera/broadcom/bcm2837/fsoverlay/etc/openal/alsoft.conf diff --git a/board/broadcom/bcm2837/genimage.cfg b/board/batocera/broadcom/bcm2837/genimage.cfg similarity index 100% rename from board/broadcom/bcm2837/genimage.cfg rename to board/batocera/broadcom/bcm2837/genimage.cfg diff --git a/board/broadcom/bcm2837/linux-broadcom64-current.config b/board/batocera/broadcom/bcm2837/linux-broadcom64-current.config similarity index 100% rename from board/broadcom/bcm2837/linux-broadcom64-current.config rename to board/batocera/broadcom/bcm2837/linux-broadcom64-current.config diff --git a/board/broadcom/bcm2837/patches/cannonball/001-gles.patch b/board/batocera/broadcom/bcm2837/patches/cannonball/001-gles.patch similarity index 100% rename from board/broadcom/bcm2837/patches/cannonball/001-gles.patch rename to board/batocera/broadcom/bcm2837/patches/cannonball/001-gles.patch diff --git a/board/broadcom/bcm2837/patches/duckstation-legacy/board-disable-message-OpenGL.patch b/board/batocera/broadcom/bcm2837/patches/duckstation-legacy/board-disable-message-OpenGL.patch similarity index 100% rename from board/broadcom/bcm2837/patches/duckstation-legacy/board-disable-message-OpenGL.patch rename to board/batocera/broadcom/bcm2837/patches/duckstation-legacy/board-disable-message-OpenGL.patch diff --git a/board/broadcom/bcm2837/patches/ffmpeg/ffmpeg-001-rpi.patch b/board/batocera/broadcom/bcm2837/patches/ffmpeg/ffmpeg-001-rpi.patch similarity index 100% rename from board/broadcom/bcm2837/patches/ffmpeg/ffmpeg-001-rpi.patch rename to board/batocera/broadcom/bcm2837/patches/ffmpeg/ffmpeg-001-rpi.patch diff --git a/board/broadcom/bcm2837/patches/mame/switchres-no-xrandr.patch b/board/batocera/broadcom/bcm2837/patches/mame/switchres-no-xrandr.patch similarity index 100% rename from board/broadcom/bcm2837/patches/mame/switchres-no-xrandr.patch rename to board/batocera/broadcom/bcm2837/patches/mame/switchres-no-xrandr.patch diff --git a/board/broadcom/linux-defconfig-fragment.config b/board/batocera/broadcom/linux-defconfig-fragment.config similarity index 100% rename from board/broadcom/linux-defconfig-fragment.config rename to board/batocera/broadcom/linux-defconfig-fragment.config diff --git a/board/broadcom/linux_patches/0001-feat-add-retroflag-gpi2w-dpi-panel-for-kms-driver.patch b/board/batocera/broadcom/linux_patches/0001-feat-add-retroflag-gpi2w-dpi-panel-for-kms-driver.patch similarity index 100% rename from board/broadcom/linux_patches/0001-feat-add-retroflag-gpi2w-dpi-panel-for-kms-driver.patch rename to board/batocera/broadcom/linux_patches/0001-feat-add-retroflag-gpi2w-dpi-panel-for-kms-driver.patch diff --git a/board/broadcom/linux_patches/0002-feat-add-piboy-dmg-panel-for-kms-driver.patch b/board/batocera/broadcom/linux_patches/0002-feat-add-piboy-dmg-panel-for-kms-driver.patch similarity index 100% rename from board/broadcom/linux_patches/0002-feat-add-piboy-dmg-panel-for-kms-driver.patch rename to board/batocera/broadcom/linux_patches/0002-feat-add-piboy-dmg-panel-for-kms-driver.patch diff --git a/board/broadcom/linux_patches/0003-feat-add-auo-a030vvn01-dpi-panel-for-kms-driver.patch b/board/batocera/broadcom/linux_patches/0003-feat-add-auo-a030vvn01-dpi-panel-for-kms-driver.patch similarity index 100% rename from board/broadcom/linux_patches/0003-feat-add-auo-a030vvn01-dpi-panel-for-kms-driver.patch rename to board/batocera/broadcom/linux_patches/0003-feat-add-auo-a030vvn01-dpi-panel-for-kms-driver.patch diff --git a/board/broadcom/linux_patches/0004-feat-add-retroflag-gpi-dpi-panel-for-kms-driver.patch b/board/batocera/broadcom/linux_patches/0004-feat-add-retroflag-gpi-dpi-panel-for-kms-driver.patch similarity index 100% rename from board/broadcom/linux_patches/0004-feat-add-retroflag-gpi-dpi-panel-for-kms-driver.patch rename to board/batocera/broadcom/linux_patches/0004-feat-add-retroflag-gpi-dpi-panel-for-kms-driver.patch diff --git a/board/broadcom/linux_patches/linux-battery-quircks.patch b/board/batocera/broadcom/linux_patches/linux-battery-quircks.patch similarity index 100% rename from board/broadcom/linux_patches/linux-battery-quircks.patch rename to board/batocera/broadcom/linux_patches/linux-battery-quircks.patch diff --git a/board/broadcom/linux_patches/linux-usb-hid-atari-retrobit.patch b/board/batocera/broadcom/linux_patches/linux-usb-hid-atari-retrobit.patch similarity index 100% rename from board/broadcom/linux_patches/linux-usb-hid-atari-retrobit.patch rename to board/batocera/broadcom/linux_patches/linux-usb-hid-atari-retrobit.patch diff --git a/board/broadcom/linux_patches/linux-usbhid-quircks.patch b/board/batocera/broadcom/linux_patches/linux-usbhid-quircks.patch similarity index 100% rename from board/broadcom/linux_patches/linux-usbhid-quircks.patch rename to board/batocera/broadcom/linux_patches/linux-usbhid-quircks.patch diff --git a/board/broadcom/linux_patches/linux-wiimote-abs-not-hat.patch b/board/batocera/broadcom/linux_patches/linux-wiimote-abs-not-hat.patch similarity index 100% rename from board/broadcom/linux_patches/linux-wiimote-abs-not-hat.patch rename to board/batocera/broadcom/linux_patches/linux-wiimote-abs-not-hat.patch diff --git a/board/broadcom/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch b/board/batocera/broadcom/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch similarity index 100% rename from board/broadcom/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch rename to board/batocera/broadcom/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch diff --git a/board/dropbear_localoptions.h b/board/batocera/dropbear_localoptions.h similarity index 100% rename from board/dropbear_localoptions.h rename to board/batocera/dropbear_localoptions.h diff --git a/board/fsoverlay/etc/avahi/services/smb.service b/board/batocera/fsoverlay/etc/avahi/services/smb.service similarity index 100% rename from board/fsoverlay/etc/avahi/services/smb.service rename to board/batocera/fsoverlay/etc/avahi/services/smb.service diff --git a/board/fsoverlay/etc/bluetooth/input.conf b/board/batocera/fsoverlay/etc/bluetooth/input.conf similarity index 100% rename from board/fsoverlay/etc/bluetooth/input.conf rename to board/batocera/fsoverlay/etc/bluetooth/input.conf diff --git a/board/fsoverlay/etc/bluetooth/main.conf b/board/batocera/fsoverlay/etc/bluetooth/main.conf similarity index 100% rename from board/fsoverlay/etc/bluetooth/main.conf rename to board/batocera/fsoverlay/etc/bluetooth/main.conf diff --git a/board/fsoverlay/etc/connman/main.conf b/board/batocera/fsoverlay/etc/connman/main.conf similarity index 100% rename from board/fsoverlay/etc/connman/main.conf rename to board/batocera/fsoverlay/etc/connman/main.conf diff --git a/board/fsoverlay/etc/default/dropbear b/board/batocera/fsoverlay/etc/default/dropbear similarity index 100% rename from board/fsoverlay/etc/default/dropbear rename to board/batocera/fsoverlay/etc/default/dropbear diff --git a/board/fsoverlay/etc/default/rngd b/board/batocera/fsoverlay/etc/default/rngd similarity index 100% rename from board/fsoverlay/etc/default/rngd rename to board/batocera/fsoverlay/etc/default/rngd diff --git a/board/fsoverlay/etc/fstab b/board/batocera/fsoverlay/etc/fstab similarity index 100% rename from board/fsoverlay/etc/fstab rename to board/batocera/fsoverlay/etc/fstab diff --git a/board/fsoverlay/etc/init.d/S000boot b/board/batocera/fsoverlay/etc/init.d/S000boot similarity index 100% rename from board/fsoverlay/etc/init.d/S000boot rename to board/batocera/fsoverlay/etc/init.d/S000boot diff --git a/board/fsoverlay/etc/init.d/S01date b/board/batocera/fsoverlay/etc/init.d/S01date similarity index 100% rename from board/fsoverlay/etc/init.d/S01date rename to board/batocera/fsoverlay/etc/init.d/S01date diff --git a/board/fsoverlay/etc/init.d/S04populate b/board/batocera/fsoverlay/etc/init.d/S04populate similarity index 100% rename from board/fsoverlay/etc/init.d/S04populate rename to board/batocera/fsoverlay/etc/init.d/S04populate diff --git a/board/fsoverlay/etc/init.d/S06modprobe b/board/batocera/fsoverlay/etc/init.d/S06modprobe similarity index 100% rename from board/fsoverlay/etc/init.d/S06modprobe rename to board/batocera/fsoverlay/etc/init.d/S06modprobe diff --git a/board/fsoverlay/etc/init.d/S08connman b/board/batocera/fsoverlay/etc/init.d/S08connman similarity index 100% rename from board/fsoverlay/etc/init.d/S08connman rename to board/batocera/fsoverlay/etc/init.d/S08connman diff --git a/board/fsoverlay/etc/init.d/S11share b/board/batocera/fsoverlay/etc/init.d/S11share similarity index 100% rename from board/fsoverlay/etc/init.d/S11share rename to board/batocera/fsoverlay/etc/init.d/S11share diff --git a/board/fsoverlay/etc/init.d/S12populateshare b/board/batocera/fsoverlay/etc/init.d/S12populateshare similarity index 100% rename from board/fsoverlay/etc/init.d/S12populateshare rename to board/batocera/fsoverlay/etc/init.d/S12populateshare diff --git a/board/fsoverlay/etc/init.d/S18governor b/board/batocera/fsoverlay/etc/init.d/S18governor similarity index 100% rename from board/fsoverlay/etc/init.d/S18governor rename to board/batocera/fsoverlay/etc/init.d/S18governor diff --git a/board/fsoverlay/etc/init.d/S26system b/board/batocera/fsoverlay/etc/init.d/S26system similarity index 100% rename from board/fsoverlay/etc/init.d/S26system rename to board/batocera/fsoverlay/etc/init.d/S26system diff --git a/board/fsoverlay/etc/init.d/S27brightness b/board/batocera/fsoverlay/etc/init.d/S27brightness similarity index 100% rename from board/fsoverlay/etc/init.d/S27brightness rename to board/batocera/fsoverlay/etc/init.d/S27brightness diff --git a/board/fsoverlay/etc/init.d/S31sixad b/board/batocera/fsoverlay/etc/init.d/S31sixad similarity index 100% rename from board/fsoverlay/etc/init.d/S31sixad rename to board/batocera/fsoverlay/etc/init.d/S31sixad diff --git a/board/fsoverlay/etc/init.d/S33disablealtfn b/board/batocera/fsoverlay/etc/init.d/S33disablealtfn similarity index 100% rename from board/fsoverlay/etc/init.d/S33disablealtfn rename to board/batocera/fsoverlay/etc/init.d/S33disablealtfn diff --git a/board/fsoverlay/etc/init.d/S35securepasswd b/board/batocera/fsoverlay/etc/init.d/S35securepasswd similarity index 100% rename from board/fsoverlay/etc/init.d/S35securepasswd rename to board/batocera/fsoverlay/etc/init.d/S35securepasswd diff --git a/board/fsoverlay/etc/init.d/S61cec b/board/batocera/fsoverlay/etc/init.d/S61cec similarity index 100% rename from board/fsoverlay/etc/init.d/S61cec rename to board/batocera/fsoverlay/etc/init.d/S61cec diff --git a/board/fsoverlay/etc/init.d/S65values4boot b/board/batocera/fsoverlay/etc/init.d/S65values4boot similarity index 100% rename from board/fsoverlay/etc/init.d/S65values4boot rename to board/batocera/fsoverlay/etc/init.d/S65values4boot diff --git a/board/fsoverlay/etc/init.d/S99userservices b/board/batocera/fsoverlay/etc/init.d/S99userservices similarity index 100% rename from board/fsoverlay/etc/init.d/S99userservices rename to board/batocera/fsoverlay/etc/init.d/S99userservices diff --git a/board/fsoverlay/etc/inittab b/board/batocera/fsoverlay/etc/inittab similarity index 100% rename from board/fsoverlay/etc/inittab rename to board/batocera/fsoverlay/etc/inittab diff --git a/board/fsoverlay/etc/ksmbd/ksmbd.conf b/board/batocera/fsoverlay/etc/ksmbd/ksmbd.conf similarity index 100% rename from board/fsoverlay/etc/ksmbd/ksmbd.conf rename to board/batocera/fsoverlay/etc/ksmbd/ksmbd.conf diff --git a/board/fsoverlay/etc/ksmbd/smb.conf b/board/batocera/fsoverlay/etc/ksmbd/smb.conf similarity index 100% rename from board/fsoverlay/etc/ksmbd/smb.conf rename to board/batocera/fsoverlay/etc/ksmbd/smb.conf diff --git a/board/fsoverlay/etc/lirc/lirc_options.conf b/board/batocera/fsoverlay/etc/lirc/lirc_options.conf similarity index 100% rename from board/fsoverlay/etc/lirc/lirc_options.conf rename to board/batocera/fsoverlay/etc/lirc/lirc_options.conf diff --git a/board/fsoverlay/etc/modprobe.d/8192cu.conf b/board/batocera/fsoverlay/etc/modprobe.d/8192cu.conf similarity index 100% rename from board/fsoverlay/etc/modprobe.d/8192cu.conf rename to board/batocera/fsoverlay/etc/modprobe.d/8192cu.conf diff --git a/board/fsoverlay/etc/modprobe.d/bluetooth.conf b/board/batocera/fsoverlay/etc/modprobe.d/bluetooth.conf similarity index 100% rename from board/fsoverlay/etc/modprobe.d/bluetooth.conf rename to board/batocera/fsoverlay/etc/modprobe.d/bluetooth.conf diff --git a/board/fsoverlay/etc/modprobe.d/rtw88.conf b/board/batocera/fsoverlay/etc/modprobe.d/rtw88.conf similarity index 100% rename from board/fsoverlay/etc/modprobe.d/rtw88.conf rename to board/batocera/fsoverlay/etc/modprobe.d/rtw88.conf diff --git a/board/fsoverlay/etc/modprobe.d/xpad_noone.conf b/board/batocera/fsoverlay/etc/modprobe.d/xpad_noone.conf similarity index 100% rename from board/fsoverlay/etc/modprobe.d/xpad_noone.conf rename to board/batocera/fsoverlay/etc/modprobe.d/xpad_noone.conf diff --git a/board/fsoverlay/etc/modules.conf b/board/batocera/fsoverlay/etc/modules.conf similarity index 100% rename from board/fsoverlay/etc/modules.conf rename to board/batocera/fsoverlay/etc/modules.conf diff --git a/board/fsoverlay/etc/network/interfaces b/board/batocera/fsoverlay/etc/network/interfaces similarity index 100% rename from board/fsoverlay/etc/network/interfaces rename to board/batocera/fsoverlay/etc/network/interfaces diff --git a/board/fsoverlay/etc/openbox/rc.xml b/board/batocera/fsoverlay/etc/openbox/rc.xml similarity index 100% rename from board/fsoverlay/etc/openbox/rc.xml rename to board/batocera/fsoverlay/etc/openbox/rc.xml diff --git a/board/fsoverlay/etc/profile.d/10-terminal.sh b/board/batocera/fsoverlay/etc/profile.d/10-terminal.sh similarity index 100% rename from board/fsoverlay/etc/profile.d/10-terminal.sh rename to board/batocera/fsoverlay/etc/profile.d/10-terminal.sh diff --git a/board/fsoverlay/etc/profile.d/20-alias.sh b/board/batocera/fsoverlay/etc/profile.d/20-alias.sh similarity index 100% rename from board/fsoverlay/etc/profile.d/20-alias.sh rename to board/batocera/fsoverlay/etc/profile.d/20-alias.sh diff --git a/board/fsoverlay/etc/profile.d/25-language.sh b/board/batocera/fsoverlay/etc/profile.d/25-language.sh similarity index 100% rename from board/fsoverlay/etc/profile.d/25-language.sh rename to board/batocera/fsoverlay/etc/profile.d/25-language.sh diff --git a/board/fsoverlay/etc/profile.d/30-welcome.sh b/board/batocera/fsoverlay/etc/profile.d/30-welcome.sh similarity index 100% rename from board/fsoverlay/etc/profile.d/30-welcome.sh rename to board/batocera/fsoverlay/etc/profile.d/30-welcome.sh diff --git a/board/fsoverlay/etc/profile.d/40-prompt.sh b/board/batocera/fsoverlay/etc/profile.d/40-prompt.sh similarity index 100% rename from board/fsoverlay/etc/profile.d/40-prompt.sh rename to board/batocera/fsoverlay/etc/profile.d/40-prompt.sh diff --git a/board/fsoverlay/etc/samba/smb-secure.conf b/board/batocera/fsoverlay/etc/samba/smb-secure.conf similarity index 100% rename from board/fsoverlay/etc/samba/smb-secure.conf rename to board/batocera/fsoverlay/etc/samba/smb-secure.conf diff --git a/board/fsoverlay/etc/samba/smb.conf b/board/batocera/fsoverlay/etc/samba/smb.conf similarity index 100% rename from board/fsoverlay/etc/samba/smb.conf rename to board/batocera/fsoverlay/etc/samba/smb.conf diff --git a/board/fsoverlay/etc/sixad.profile b/board/batocera/fsoverlay/etc/sixad.profile similarity index 100% rename from board/fsoverlay/etc/sixad.profile rename to board/batocera/fsoverlay/etc/sixad.profile diff --git a/board/fsoverlay/etc/usbmount/usbmount.conf b/board/batocera/fsoverlay/etc/usbmount/usbmount.conf similarity index 100% rename from board/fsoverlay/etc/usbmount/usbmount.conf rename to board/batocera/fsoverlay/etc/usbmount/usbmount.conf diff --git a/board/fsoverlay/lib/udev/rules.d/usbmount.rules b/board/batocera/fsoverlay/lib/udev/rules.d/usbmount.rules similarity index 100% rename from board/fsoverlay/lib/udev/rules.d/usbmount.rules rename to board/batocera/fsoverlay/lib/udev/rules.d/usbmount.rules diff --git a/board/ingenic/jz4770/create-boot-script.sh b/board/batocera/ingenic/jz4770/create-boot-script.sh similarity index 100% rename from board/ingenic/jz4770/create-boot-script.sh rename to board/batocera/ingenic/jz4770/create-boot-script.sh diff --git a/board/ingenic/jz4770/fsoverlay/.gitkeep b/board/batocera/ingenic/jz4770/fsoverlay/.gitkeep similarity index 100% rename from board/ingenic/jz4770/fsoverlay/.gitkeep rename to board/batocera/ingenic/jz4770/fsoverlay/.gitkeep diff --git a/board/ingenic/jz4770/genimage.cfg b/board/batocera/ingenic/jz4770/genimage.cfg similarity index 100% rename from board/ingenic/jz4770/genimage.cfg rename to board/batocera/ingenic/jz4770/genimage.cfg diff --git a/board/ingenic/jz4770/linux-defconfig-fragment.config b/board/batocera/ingenic/jz4770/linux-defconfig-fragment.config similarity index 100% rename from board/ingenic/jz4770/linux-defconfig-fragment.config rename to board/batocera/ingenic/jz4770/linux-defconfig-fragment.config diff --git a/board/ingenic/jz4770/linux-jz4770.config b/board/batocera/ingenic/jz4770/linux-jz4770.config similarity index 100% rename from board/ingenic/jz4770/linux-jz4770.config rename to board/batocera/ingenic/jz4770/linux-jz4770.config diff --git a/board/ingenic/jz4770/linux_patches/001-opendingux.patch b/board/batocera/ingenic/jz4770/linux_patches/001-opendingux.patch similarity index 100% rename from board/ingenic/jz4770/linux_patches/001-opendingux.patch rename to board/batocera/ingenic/jz4770/linux_patches/001-opendingux.patch diff --git a/board/ingenic/jz4770/patches/cairo/001-backtrace-symbols-use-libexecinfo.patch b/board/batocera/ingenic/jz4770/patches/cairo/001-backtrace-symbols-use-libexecinfo.patch similarity index 100% rename from board/ingenic/jz4770/patches/cairo/001-backtrace-symbols-use-libexecinfo.patch rename to board/batocera/ingenic/jz4770/patches/cairo/001-backtrace-symbols-use-libexecinfo.patch diff --git a/board/ingenic/jz4770/patches/cgenius/001-force-target-dingoo-cmake.patch b/board/batocera/ingenic/jz4770/patches/cgenius/001-force-target-dingoo-cmake.patch similarity index 100% rename from board/ingenic/jz4770/patches/cgenius/001-force-target-dingoo-cmake.patch rename to board/batocera/ingenic/jz4770/patches/cgenius/001-force-target-dingoo-cmake.patch diff --git a/board/ingenic/jz4770/patches/cgenius/002-cgenius-oldarch-cmake.patch b/board/batocera/ingenic/jz4770/patches/cgenius/002-cgenius-oldarch-cmake.patch similarity index 100% rename from board/ingenic/jz4770/patches/cgenius/002-cgenius-oldarch-cmake.patch rename to board/batocera/ingenic/jz4770/patches/cgenius/002-cgenius-oldarch-cmake.patch diff --git a/board/ingenic/jz4770/patches/cgenius/003-hack-tremor.patch b/board/batocera/ingenic/jz4770/patches/cgenius/003-hack-tremor.patch similarity index 100% rename from board/ingenic/jz4770/patches/cgenius/003-hack-tremor.patch rename to board/batocera/ingenic/jz4770/patches/cgenius/003-hack-tremor.patch diff --git a/board/ingenic/jz4770/patches/cgenius/004-hack-include-libs-path.patch b/board/batocera/ingenic/jz4770/patches/cgenius/004-hack-include-libs-path.patch similarity index 100% rename from board/ingenic/jz4770/patches/cgenius/004-hack-include-libs-path.patch rename to board/batocera/ingenic/jz4770/patches/cgenius/004-hack-include-libs-path.patch diff --git a/board/ingenic/jz4770/patches/cgenius/005-hack-link-curl-and-backtrace.patch b/board/batocera/ingenic/jz4770/patches/cgenius/005-hack-link-curl-and-backtrace.patch similarity index 100% rename from board/ingenic/jz4770/patches/cgenius/005-hack-link-curl-and-backtrace.patch rename to board/batocera/ingenic/jz4770/patches/cgenius/005-hack-link-curl-and-backtrace.patch diff --git a/board/ingenic/jz4770/patches/cgenius/006-hack-backtrace.patch b/board/batocera/ingenic/jz4770/patches/cgenius/006-hack-backtrace.patch similarity index 100% rename from board/ingenic/jz4770/patches/cgenius/006-hack-backtrace.patch rename to board/batocera/ingenic/jz4770/patches/cgenius/006-hack-backtrace.patch diff --git a/board/ingenic/jz4770/patches/connman/implicit.patch b/board/batocera/ingenic/jz4770/patches/connman/implicit.patch similarity index 100% rename from board/ingenic/jz4770/patches/connman/implicit.patch rename to board/batocera/ingenic/jz4770/patches/connman/implicit.patch diff --git a/board/ingenic/jz4770/patches/connman/libresolv.patch b/board/batocera/ingenic/jz4770/patches/connman/libresolv.patch similarity index 100% rename from board/ingenic/jz4770/patches/connman/libresolv.patch rename to board/batocera/ingenic/jz4770/patches/connman/libresolv.patch diff --git a/board/ingenic/jz4770/patches/connman/ppp-missing-header.patch b/board/batocera/ingenic/jz4770/patches/connman/ppp-missing-header.patch similarity index 100% rename from board/ingenic/jz4770/patches/connman/ppp-missing-header.patch rename to board/batocera/ingenic/jz4770/patches/connman/ppp-missing-header.patch diff --git a/board/ingenic/jz4770/patches/ecwolf/001-link-to-libfts.patch b/board/batocera/ingenic/jz4770/patches/ecwolf/001-link-to-libfts.patch similarity index 100% rename from board/ingenic/jz4770/patches/ecwolf/001-link-to-libfts.patch rename to board/batocera/ingenic/jz4770/patches/ecwolf/001-link-to-libfts.patch diff --git a/board/ingenic/jz4770/patches/fheroes2/001-libatomic.patch b/board/batocera/ingenic/jz4770/patches/fheroes2/001-libatomic.patch similarity index 100% rename from board/ingenic/jz4770/patches/fheroes2/001-libatomic.patch rename to board/batocera/ingenic/jz4770/patches/fheroes2/001-libatomic.patch diff --git a/board/ingenic/jz4770/patches/liblcf/fix-missing-cstdint.patch b/board/batocera/ingenic/jz4770/patches/liblcf/fix-missing-cstdint.patch similarity index 100% rename from board/ingenic/jz4770/patches/liblcf/fix-missing-cstdint.patch rename to board/batocera/ingenic/jz4770/patches/liblcf/fix-missing-cstdint.patch diff --git a/board/ingenic/jz4770/patches/libretro-gpsp/libretro-gpsp-jz4770.patch b/board/batocera/ingenic/jz4770/patches/libretro-gpsp/libretro-gpsp-jz4770.patch similarity index 100% rename from board/ingenic/jz4770/patches/libretro-gpsp/libretro-gpsp-jz4770.patch rename to board/batocera/ingenic/jz4770/patches/libretro-gpsp/libretro-gpsp-jz4770.patch diff --git a/board/ingenic/jz4770/patches/libretro-pc88/001-fix-bool-nullptr-mistake.patch b/board/batocera/ingenic/jz4770/patches/libretro-pc88/001-fix-bool-nullptr-mistake.patch similarity index 100% rename from board/ingenic/jz4770/patches/libretro-pc88/001-fix-bool-nullptr-mistake.patch rename to board/batocera/ingenic/jz4770/patches/libretro-pc88/001-fix-bool-nullptr-mistake.patch diff --git a/board/ingenic/jz4770/patches/libretro-pc98/001-fix-libretro-common-rthreads.patch b/board/batocera/ingenic/jz4770/patches/libretro-pc98/001-fix-libretro-common-rthreads.patch similarity index 100% rename from board/ingenic/jz4770/patches/libretro-pc98/001-fix-libretro-common-rthreads.patch rename to board/batocera/ingenic/jz4770/patches/libretro-pc98/001-fix-libretro-common-rthreads.patch diff --git a/board/ingenic/jz4770/patches/libretro-ppsspp/ppssp-001-mipmaps.patch b/board/batocera/ingenic/jz4770/patches/libretro-ppsspp/ppssp-001-mipmaps.patch similarity index 100% rename from board/ingenic/jz4770/patches/libretro-ppsspp/ppssp-001-mipmaps.patch rename to board/batocera/ingenic/jz4770/patches/libretro-ppsspp/ppssp-001-mipmaps.patch diff --git a/board/ingenic/jz4770/patches/libretro-ppsspp/ppssp-002-fix-mipscpudetect.patch b/board/batocera/ingenic/jz4770/patches/libretro-ppsspp/ppssp-002-fix-mipscpudetect.patch similarity index 100% rename from board/ingenic/jz4770/patches/libretro-ppsspp/ppssp-002-fix-mipscpudetect.patch rename to board/batocera/ingenic/jz4770/patches/libretro-ppsspp/ppssp-002-fix-mipscpudetect.patch diff --git a/board/ingenic/jz4770/patches/libretro-ppsspp/ppssp-003-fpermissive.patch b/board/batocera/ingenic/jz4770/patches/libretro-ppsspp/ppssp-003-fpermissive.patch similarity index 100% rename from board/ingenic/jz4770/patches/libretro-ppsspp/ppssp-003-fpermissive.patch rename to board/batocera/ingenic/jz4770/patches/libretro-ppsspp/ppssp-003-fpermissive.patch diff --git a/board/ingenic/jz4770/patches/libretro-ppsspp/ppssp-004-fix-gpurecord.patch b/board/batocera/ingenic/jz4770/patches/libretro-ppsspp/ppssp-004-fix-gpurecord.patch similarity index 100% rename from board/ingenic/jz4770/patches/libretro-ppsspp/ppssp-004-fix-gpurecord.patch rename to board/batocera/ingenic/jz4770/patches/libretro-ppsspp/ppssp-004-fix-gpurecord.patch diff --git a/board/ingenic/jz4770/patches/libretro-ppsspp/ppssp-005-fix-atomic.patch b/board/batocera/ingenic/jz4770/patches/libretro-ppsspp/ppssp-005-fix-atomic.patch similarity index 100% rename from board/ingenic/jz4770/patches/libretro-ppsspp/ppssp-005-fix-atomic.patch rename to board/batocera/ingenic/jz4770/patches/libretro-ppsspp/ppssp-005-fix-atomic.patch diff --git a/board/ingenic/jz4770/patches/libretro-px68k/001-path-max.patch b/board/batocera/ingenic/jz4770/patches/libretro-px68k/001-path-max.patch similarity index 100% rename from board/ingenic/jz4770/patches/libretro-px68k/001-path-max.patch rename to board/batocera/ingenic/jz4770/patches/libretro-px68k/001-path-max.patch diff --git a/board/ingenic/jz4770/patches/libretro-snes9x-next/001-mipsel-support.patch b/board/batocera/ingenic/jz4770/patches/libretro-snes9x-next/001-mipsel-support.patch similarity index 100% rename from board/ingenic/jz4770/patches/libretro-snes9x-next/001-mipsel-support.patch rename to board/batocera/ingenic/jz4770/patches/libretro-snes9x-next/001-mipsel-support.patch diff --git a/board/ingenic/jz4770/patches/libretro-zc210/001-fix-libretro-common-rthreads.patch b/board/batocera/ingenic/jz4770/patches/libretro-zc210/001-fix-libretro-common-rthreads.patch similarity index 100% rename from board/ingenic/jz4770/patches/libretro-zc210/001-fix-libretro-common-rthreads.patch rename to board/batocera/ingenic/jz4770/patches/libretro-zc210/001-fix-libretro-common-rthreads.patch diff --git a/board/ingenic/jz4770/patches/openbor4432/001-mipsel-target.patch b/board/batocera/ingenic/jz4770/patches/openbor4432/001-mipsel-target.patch similarity index 100% rename from board/ingenic/jz4770/patches/openbor4432/001-mipsel-target.patch rename to board/batocera/ingenic/jz4770/patches/openbor4432/001-mipsel-target.patch diff --git a/board/ingenic/jz4770/patches/openbor4432/002-no-mallinfo.patch b/board/batocera/ingenic/jz4770/patches/openbor4432/002-no-mallinfo.patch similarity index 100% rename from board/ingenic/jz4770/patches/openbor4432/002-no-mallinfo.patch rename to board/batocera/ingenic/jz4770/patches/openbor4432/002-no-mallinfo.patch diff --git a/board/ingenic/jz4770/patches/openbor6412/001-mipsel-target.patch b/board/batocera/ingenic/jz4770/patches/openbor6412/001-mipsel-target.patch similarity index 100% rename from board/ingenic/jz4770/patches/openbor6412/001-mipsel-target.patch rename to board/batocera/ingenic/jz4770/patches/openbor6412/001-mipsel-target.patch diff --git a/board/ingenic/jz4770/patches/openbor6412/002-no-mallinfo.patch b/board/batocera/ingenic/jz4770/patches/openbor6412/002-no-mallinfo.patch similarity index 100% rename from board/ingenic/jz4770/patches/openbor6412/002-no-mallinfo.patch rename to board/batocera/ingenic/jz4770/patches/openbor6412/002-no-mallinfo.patch diff --git a/board/ingenic/jz4770/patches/openbor7142/001-mipsel-target.patch b/board/batocera/ingenic/jz4770/patches/openbor7142/001-mipsel-target.patch similarity index 100% rename from board/ingenic/jz4770/patches/openbor7142/001-mipsel-target.patch rename to board/batocera/ingenic/jz4770/patches/openbor7142/001-mipsel-target.patch diff --git a/board/ingenic/jz4770/patches/openbor7142/002-no-mallinfo.patch b/board/batocera/ingenic/jz4770/patches/openbor7142/002-no-mallinfo.patch similarity index 100% rename from board/ingenic/jz4770/patches/openbor7142/002-no-mallinfo.patch rename to board/batocera/ingenic/jz4770/patches/openbor7142/002-no-mallinfo.patch diff --git a/board/ingenic/jz4770/patches/openbor7530/001-mipsel-target.patch b/board/batocera/ingenic/jz4770/patches/openbor7530/001-mipsel-target.patch similarity index 100% rename from board/ingenic/jz4770/patches/openbor7530/001-mipsel-target.patch rename to board/batocera/ingenic/jz4770/patches/openbor7530/001-mipsel-target.patch diff --git a/board/ingenic/jz4770/patches/openbor7530/002-no-mallinfo.patch b/board/batocera/ingenic/jz4770/patches/openbor7530/002-no-mallinfo.patch similarity index 100% rename from board/ingenic/jz4770/patches/openbor7530/002-no-mallinfo.patch rename to board/batocera/ingenic/jz4770/patches/openbor7530/002-no-mallinfo.patch diff --git a/board/ingenic/jz4770/patches/pacman/argz-replace.patch b/board/batocera/ingenic/jz4770/patches/pacman/argz-replace.patch similarity index 100% rename from board/ingenic/jz4770/patches/pacman/argz-replace.patch rename to board/batocera/ingenic/jz4770/patches/pacman/argz-replace.patch diff --git a/board/ingenic/jz4770/patches/plymouth/0001-plymouth-disable-execinfo.patch b/board/batocera/ingenic/jz4770/patches/plymouth/0001-plymouth-disable-execinfo.patch similarity index 100% rename from board/ingenic/jz4770/patches/plymouth/0001-plymouth-disable-execinfo.patch rename to board/batocera/ingenic/jz4770/patches/plymouth/0001-plymouth-disable-execinfo.patch diff --git a/board/ingenic/jz4770/patches/plymouth/0002-libintl.patch b/board/batocera/ingenic/jz4770/patches/plymouth/0002-libintl.patch similarity index 100% rename from board/ingenic/jz4770/patches/plymouth/0002-libintl.patch rename to board/batocera/ingenic/jz4770/patches/plymouth/0002-libintl.patch diff --git a/board/ingenic/jz4770/patches/plymouth/0003-plymouth-rpmatch.patch b/board/batocera/ingenic/jz4770/patches/plymouth/0003-plymouth-rpmatch.patch similarity index 100% rename from board/ingenic/jz4770/patches/plymouth/0003-plymouth-rpmatch.patch rename to board/batocera/ingenic/jz4770/patches/plymouth/0003-plymouth-rpmatch.patch diff --git a/board/ingenic/jz4770/patches/ppsspp/ppssp-001-mipmaps.patch b/board/batocera/ingenic/jz4770/patches/ppsspp/ppssp-001-mipmaps.patch similarity index 100% rename from board/ingenic/jz4770/patches/ppsspp/ppssp-001-mipmaps.patch rename to board/batocera/ingenic/jz4770/patches/ppsspp/ppssp-001-mipmaps.patch diff --git a/board/ingenic/jz4770/patches/ppsspp/ppssp-002-fix-mipscpudetect.patch b/board/batocera/ingenic/jz4770/patches/ppsspp/ppssp-002-fix-mipscpudetect.patch similarity index 100% rename from board/ingenic/jz4770/patches/ppsspp/ppssp-002-fix-mipscpudetect.patch rename to board/batocera/ingenic/jz4770/patches/ppsspp/ppssp-002-fix-mipscpudetect.patch diff --git a/board/ingenic/jz4770/patches/ppsspp/ppssp-003-fpermissive.patch b/board/batocera/ingenic/jz4770/patches/ppsspp/ppssp-003-fpermissive.patch similarity index 100% rename from board/ingenic/jz4770/patches/ppsspp/ppssp-003-fpermissive.patch rename to board/batocera/ingenic/jz4770/patches/ppsspp/ppssp-003-fpermissive.patch diff --git a/board/ingenic/jz4770/patches/ppsspp/ppssp-004-fix-gpurecord.patch b/board/batocera/ingenic/jz4770/patches/ppsspp/ppssp-004-fix-gpurecord.patch similarity index 100% rename from board/ingenic/jz4770/patches/ppsspp/ppssp-004-fix-gpurecord.patch rename to board/batocera/ingenic/jz4770/patches/ppsspp/ppssp-004-fix-gpurecord.patch diff --git a/board/ingenic/jz4770/patches/ppsspp/ppssp-005-fix-atomic.patch b/board/batocera/ingenic/jz4770/patches/ppsspp/ppssp-005-fix-atomic.patch similarity index 100% rename from board/ingenic/jz4770/patches/ppsspp/ppssp-005-fix-atomic.patch rename to board/batocera/ingenic/jz4770/patches/ppsspp/ppssp-005-fix-atomic.patch diff --git a/board/ingenic/jz4770/patches/reglinux-emulationstation/000-fix-cmake.patch b/board/batocera/ingenic/jz4770/patches/reglinux-emulationstation/000-fix-cmake.patch similarity index 100% rename from board/ingenic/jz4770/patches/reglinux-emulationstation/000-fix-cmake.patch rename to board/batocera/ingenic/jz4770/patches/reglinux-emulationstation/000-fix-cmake.patch diff --git a/board/ingenic/jz4770/patches/thextech/001-freeimagelite-disable-png-mips-msa-optimizations.patch b/board/batocera/ingenic/jz4770/patches/thextech/001-freeimagelite-disable-png-mips-msa-optimizations.patch similarity index 100% rename from board/ingenic/jz4770/patches/thextech/001-freeimagelite-disable-png-mips-msa-optimizations.patch rename to board/batocera/ingenic/jz4770/patches/thextech/001-freeimagelite-disable-png-mips-msa-optimizations.patch diff --git a/board/ingenic/jz4770/patches/ubiboot/000-stack-protector.patch b/board/batocera/ingenic/jz4770/patches/ubiboot/000-stack-protector.patch similarity index 100% rename from board/ingenic/jz4770/patches/ubiboot/000-stack-protector.patch rename to board/batocera/ingenic/jz4770/patches/ubiboot/000-stack-protector.patch diff --git a/board/ingenic/jz4770/patches/ubiboot/001-batocera.patch.disabled b/board/batocera/ingenic/jz4770/patches/ubiboot/001-batocera.patch.disabled similarity index 100% rename from board/ingenic/jz4770/patches/ubiboot/001-batocera.patch.disabled rename to board/batocera/ingenic/jz4770/patches/ubiboot/001-batocera.patch.disabled diff --git a/board/mediatek/fsoverlay/.gitkeep b/board/batocera/mediatek/fsoverlay/.gitkeep similarity index 100% rename from board/mediatek/fsoverlay/.gitkeep rename to board/batocera/mediatek/fsoverlay/.gitkeep diff --git a/board/mediatek/mt8395/fsoverlay/.gitkeep b/board/batocera/mediatek/mt8395/fsoverlay/.gitkeep similarity index 100% rename from board/mediatek/mt8395/fsoverlay/.gitkeep rename to board/batocera/mediatek/mt8395/fsoverlay/.gitkeep diff --git a/board/mediatek/mt8395/linux-defconfig.config b/board/batocera/mediatek/mt8395/linux-defconfig.config similarity index 100% rename from board/mediatek/mt8395/linux-defconfig.config rename to board/batocera/mediatek/mt8395/linux-defconfig.config diff --git a/board/mediatek/mt8395/linux_patches/.gitkeep b/board/batocera/mediatek/mt8395/linux_patches/.gitkeep similarity index 100% rename from board/mediatek/mt8395/linux_patches/.gitkeep rename to board/batocera/mediatek/mt8395/linux_patches/.gitkeep diff --git a/board/mediatek/mt8395/patches/.gitkeep b/board/batocera/mediatek/mt8395/patches/.gitkeep similarity index 100% rename from board/mediatek/mt8395/patches/.gitkeep rename to board/batocera/mediatek/mt8395/patches/.gitkeep diff --git a/board/mediatek/mt8395/radxa-nio-12l/boot/extlinux.conf b/board/batocera/mediatek/mt8395/radxa-nio-12l/boot/extlinux.conf similarity index 100% rename from board/mediatek/mt8395/radxa-nio-12l/boot/extlinux.conf rename to board/batocera/mediatek/mt8395/radxa-nio-12l/boot/extlinux.conf diff --git a/board/mediatek/mt8395/radxa-nio-12l/create-boot-script.sh b/board/batocera/mediatek/mt8395/radxa-nio-12l/create-boot-script.sh similarity index 100% rename from board/mediatek/mt8395/radxa-nio-12l/create-boot-script.sh rename to board/batocera/mediatek/mt8395/radxa-nio-12l/create-boot-script.sh diff --git a/board/mediatek/mt8395/radxa-nio-12l/genimage.cfg b/board/batocera/mediatek/mt8395/radxa-nio-12l/genimage.cfg similarity index 100% rename from board/mediatek/mt8395/radxa-nio-12l/genimage.cfg rename to board/batocera/mediatek/mt8395/radxa-nio-12l/genimage.cfg diff --git a/board/mediatek/patches/.gitkeep b/board/batocera/mediatek/patches/.gitkeep similarity index 100% rename from board/mediatek/patches/.gitkeep rename to board/batocera/mediatek/patches/.gitkeep diff --git a/board/patches/bluez5_utils/001-fix-ell-cross-compile-error.patch b/board/batocera/patches/bluez5_utils/001-fix-ell-cross-compile-error.patch similarity index 100% rename from board/patches/bluez5_utils/001-fix-ell-cross-compile-error.patch rename to board/batocera/patches/bluez5_utils/001-fix-ell-cross-compile-error.patch diff --git a/board/patches/bluez5_utils/002-trust-sixaxis.patch b/board/batocera/patches/bluez5_utils/002-trust-sixaxis.patch similarity index 100% rename from board/patches/bluez5_utils/002-trust-sixaxis.patch rename to board/batocera/patches/bluez5_utils/002-trust-sixaxis.patch diff --git a/board/patches/busybox/board-no-busybox-link.patch b/board/batocera/patches/busybox/board-no-busybox-link.patch similarity index 100% rename from board/patches/busybox/board-no-busybox-link.patch rename to board/batocera/patches/busybox/board-no-busybox-link.patch diff --git a/board/patches/cairo/001-disable-tests.patch b/board/batocera/patches/cairo/001-disable-tests.patch similarity index 100% rename from board/patches/cairo/001-disable-tests.patch rename to board/batocera/patches/cairo/001-disable-tests.patch diff --git a/board/patches/dracut/board-add-busybox-rootfs.patch b/board/batocera/patches/dracut/board-add-busybox-rootfs.patch similarity index 100% rename from board/patches/dracut/board-add-busybox-rootfs.patch rename to board/batocera/patches/dracut/board-add-busybox-rootfs.patch diff --git a/board/patches/dracut/board-plymouth-no-systemd.patch b/board/batocera/patches/dracut/board-plymouth-no-systemd.patch similarity index 100% rename from board/patches/dracut/board-plymouth-no-systemd.patch rename to board/batocera/patches/dracut/board-plymouth-no-systemd.patch diff --git a/board/patches/efibootmgr/001-return-entry-if-found-before-end-of-list.patch b/board/batocera/patches/efibootmgr/001-return-entry-if-found-before-end-of-list.patch similarity index 100% rename from board/patches/efibootmgr/001-return-entry-if-found-before-end-of-list.patch rename to board/batocera/patches/efibootmgr/001-return-entry-if-found-before-end-of-list.patch diff --git a/board/patches/evtest/001-info-options.patch b/board/batocera/patches/evtest/001-info-options.patch similarity index 100% rename from board/patches/evtest/001-info-options.patch rename to board/batocera/patches/evtest/001-info-options.patch diff --git a/board/patches/ffmpeg/ffmpeg-001-libreelec.patch b/board/batocera/patches/ffmpeg/ffmpeg-001-libreelec.patch similarity index 100% rename from board/patches/ffmpeg/ffmpeg-001-libreelec.patch rename to board/batocera/patches/ffmpeg/ffmpeg-001-libreelec.patch diff --git a/board/patches/glibc/001-glibc-localedef.patch b/board/batocera/patches/glibc/001-glibc-localedef.patch similarity index 100% rename from board/patches/glibc/001-glibc-localedef.patch rename to board/batocera/patches/glibc/001-glibc-localedef.patch diff --git a/board/patches/grub2/001-remove-messages.patch b/board/batocera/patches/grub2/001-remove-messages.patch similarity index 100% rename from board/patches/grub2/001-remove-messages.patch rename to board/batocera/patches/grub2/001-remove-messages.patch diff --git a/board/patches/libcrossguid/001-gcc13-fix-missing-cstdint.patch b/board/batocera/patches/libcrossguid/001-gcc13-fix-missing-cstdint.patch similarity index 100% rename from board/patches/libcrossguid/001-gcc13-fix-missing-cstdint.patch rename to board/batocera/patches/libcrossguid/001-gcc13-fix-missing-cstdint.patch diff --git a/board/patches/libfm/001-libfm-fancymounts.patch b/board/batocera/patches/libfm/001-libfm-fancymounts.patch similarity index 100% rename from board/patches/libfm/001-libfm-fancymounts.patch rename to board/batocera/patches/libfm/001-libfm-fancymounts.patch diff --git a/board/patches/libfuse/001-allow-empty.patch b/board/batocera/patches/libfuse/001-allow-empty.patch similarity index 100% rename from board/patches/libfuse/001-allow-empty.patch rename to board/batocera/patches/libfuse/001-allow-empty.patch diff --git a/board/patches/lirc-tools/001-compile.patch b/board/batocera/patches/lirc-tools/001-compile.patch similarity index 100% rename from board/patches/lirc-tools/001-compile.patch rename to board/batocera/patches/lirc-tools/001-compile.patch diff --git a/board/patches/openbox/001-libglib2-fix.patch b/board/batocera/patches/openbox/001-libglib2-fix.patch similarity index 100% rename from board/patches/openbox/001-libglib2-fix.patch rename to board/batocera/patches/openbox/001-libglib2-fix.patch diff --git a/board/patches/pcmanfm/001-clean-goto.patch b/board/batocera/patches/pcmanfm/001-clean-goto.patch similarity index 100% rename from board/patches/pcmanfm/001-clean-goto.patch rename to board/batocera/patches/pcmanfm/001-clean-goto.patch diff --git a/board/patches/pcmanfm/001-pcmanfm-removerootwarning.patch b/board/batocera/patches/pcmanfm/001-pcmanfm-removerootwarning.patch similarity index 100% rename from board/patches/pcmanfm/001-pcmanfm-removerootwarning.patch rename to board/batocera/patches/pcmanfm/001-pcmanfm-removerootwarning.patch diff --git a/board/patches/procps-ng/board-ncurses.patch b/board/batocera/patches/procps-ng/board-ncurses.patch similarity index 100% rename from board/patches/procps-ng/board-ncurses.patch rename to board/batocera/patches/procps-ng/board-ncurses.patch diff --git a/board/patches/pulseaudio/001-rawoption.patch b/board/batocera/patches/pulseaudio/001-rawoption.patch similarity index 100% rename from board/patches/pulseaudio/001-rawoption.patch rename to board/batocera/patches/pulseaudio/001-rawoption.patch diff --git a/board/patches/pulseaudio/002-rawprofileoption.patch b/board/batocera/patches/pulseaudio/002-rawprofileoption.patch similarity index 100% rename from board/patches/pulseaudio/002-rawprofileoption.patch rename to board/batocera/patches/pulseaudio/002-rawprofileoption.patch diff --git a/board/patches/sdl2/001-drm-resolution.patch b/board/batocera/patches/sdl2/001-drm-resolution.patch similarity index 100% rename from board/patches/sdl2/001-drm-resolution.patch rename to board/batocera/patches/sdl2/001-drm-resolution.patch diff --git a/board/patches/sdl2/002-drm-conn.patch b/board/batocera/patches/sdl2/002-drm-conn.patch similarity index 100% rename from board/patches/sdl2/002-drm-conn.patch rename to board/batocera/patches/sdl2/002-drm-conn.patch diff --git a/board/patches/sdl2/003-video-priortiy.patch b/board/batocera/patches/sdl2/003-video-priortiy.patch similarity index 100% rename from board/patches/sdl2/003-video-priortiy.patch rename to board/batocera/patches/sdl2/003-video-priortiy.patch diff --git a/board/patches/sdl2/004-rle-accel-force-O2.patch b/board/batocera/patches/sdl2/004-rle-accel-force-O2.patch similarity index 100% rename from board/patches/sdl2/004-rle-accel-force-O2.patch rename to board/batocera/patches/sdl2/004-rle-accel-force-O2.patch diff --git a/board/patches/sdl2/005-crc-is-zero.patch b/board/batocera/patches/sdl2/005-crc-is-zero.patch similarity index 100% rename from board/patches/sdl2/005-crc-is-zero.patch rename to board/batocera/patches/sdl2/005-crc-is-zero.patch diff --git a/board/patches/sdl2/sdl2_SDL_SCREEN.patch b/board/batocera/patches/sdl2/sdl2_SDL_SCREEN.patch similarity index 100% rename from board/patches/sdl2/sdl2_SDL_SCREEN.patch rename to board/batocera/patches/sdl2/sdl2_SDL_SCREEN.patch diff --git a/board/patches/sdl2/sdl2_accelerometers_are_not_joysticks.patch b/board/batocera/patches/sdl2/sdl2_accelerometers_are_not_joysticks.patch similarity index 100% rename from board/patches/sdl2/sdl2_accelerometers_are_not_joysticks.patch rename to board/batocera/patches/sdl2/sdl2_accelerometers_are_not_joysticks.patch diff --git a/board/patches/sdl2/sdl2_add_video_mali_gles2.patch b/board/batocera/patches/sdl2/sdl2_add_video_mali_gles2.patch similarity index 100% rename from board/patches/sdl2/sdl2_add_video_mali_gles2.patch rename to board/batocera/patches/sdl2/sdl2_add_video_mali_gles2.patch diff --git a/board/patches/sdl2/sdl2_buttons_doesnt_make_joysticks.patch b/board/batocera/patches/sdl2/sdl2_buttons_doesnt_make_joysticks.patch similarity index 100% rename from board/patches/sdl2/sdl2_buttons_doesnt_make_joysticks.patch rename to board/batocera/patches/sdl2/sdl2_buttons_doesnt_make_joysticks.patch diff --git a/board/patches/sdl2/sdl2_disable_gamepadmapping.patch b/board/batocera/patches/sdl2/sdl2_disable_gamepadmapping.patch similarity index 100% rename from board/patches/sdl2/sdl2_disable_gamepadmapping.patch rename to board/batocera/patches/sdl2/sdl2_disable_gamepadmapping.patch diff --git a/board/patches/sdl2/sdl2_disable_joystickShouldIgnoreEvent.patch b/board/batocera/patches/sdl2/sdl2_disable_joystickShouldIgnoreEvent.patch similarity index 100% rename from board/patches/sdl2/sdl2_disable_joystickShouldIgnoreEvent.patch rename to board/batocera/patches/sdl2/sdl2_disable_joystickShouldIgnoreEvent.patch diff --git a/board/patches/sdl2/sdl2_fix_pad_name.patch b/board/batocera/patches/sdl2/sdl2_fix_pad_name.patch similarity index 100% rename from board/patches/sdl2/sdl2_fix_pad_name.patch rename to board/batocera/patches/sdl2/sdl2_fix_pad_name.patch diff --git a/board/patches/sdl2/sdl2_input_as_retroarch_udev.patch b/board/batocera/patches/sdl2/sdl2_input_as_retroarch_udev.patch similarity index 100% rename from board/patches/sdl2/sdl2_input_as_retroarch_udev.patch rename to board/batocera/patches/sdl2/sdl2_input_as_retroarch_udev.patch diff --git a/board/patches/sdl2/sdl2_input_evdev_at_first_unrelease_button.patch b/board/batocera/patches/sdl2/sdl2_input_evdev_at_first_unrelease_button.patch similarity index 100% rename from board/patches/sdl2/sdl2_input_evdev_at_first_unrelease_button.patch rename to board/batocera/patches/sdl2/sdl2_input_evdev_at_first_unrelease_button.patch diff --git a/board/patches/sdl2/sdl2_input_event_after_close.patch b/board/batocera/patches/sdl2/sdl2_input_event_after_close.patch similarity index 100% rename from board/patches/sdl2/sdl2_input_event_after_close.patch rename to board/batocera/patches/sdl2/sdl2_input_event_after_close.patch diff --git a/board/patches/sdl2/sdl2_input_p003_extra_functions.patch b/board/batocera/patches/sdl2/sdl2_input_p003_extra_functions.patch similarity index 100% rename from board/patches/sdl2/sdl2_input_p003_extra_functions.patch rename to board/batocera/patches/sdl2/sdl2_input_p003_extra_functions.patch diff --git a/board/patches/sdl2/sdl2_input_p004_keyboard-open-tty-just-in-time_and_evdev.patch b/board/batocera/patches/sdl2/sdl2_input_p004_keyboard-open-tty-just-in-time_and_evdev.patch similarity index 100% rename from board/patches/sdl2/sdl2_input_p004_keyboard-open-tty-just-in-time_and_evdev.patch rename to board/batocera/patches/sdl2/sdl2_input_p004_keyboard-open-tty-just-in-time_and_evdev.patch diff --git a/board/patches/sdl2/sdl2_input_p005_limit_ABS_max.patch b/board/batocera/patches/sdl2/sdl2_input_p005_limit_ABS_max.patch similarity index 100% rename from board/patches/sdl2/sdl2_input_p005_limit_ABS_max.patch rename to board/batocera/patches/sdl2/sdl2_input_p005_limit_ABS_max.patch diff --git a/board/patches/sdl2/sdl2_input_p006_sort_devices.patch b/board/batocera/patches/sdl2/sdl2_input_p006_sort_devices.patch similarity index 100% rename from board/patches/sdl2/sdl2_input_p006_sort_devices.patch rename to board/batocera/patches/sdl2/sdl2_input_p006_sort_devices.patch diff --git a/board/patches/sdl2/sdl2_input_p007_udev_buttons.patch b/board/batocera/patches/sdl2/sdl2_input_p007_udev_buttons.patch similarity index 100% rename from board/patches/sdl2/sdl2_input_p007_udev_buttons.patch rename to board/batocera/patches/sdl2/sdl2_input_p007_udev_buttons.patch diff --git a/board/patches/sdl2/sdl2_input_p008_disable_internal_mappings.patch b/board/batocera/patches/sdl2/sdl2_input_p008_disable_internal_mappings.patch similarity index 100% rename from board/patches/sdl2/sdl2_input_p008_disable_internal_mappings.patch rename to board/batocera/patches/sdl2/sdl2_input_p008_disable_internal_mappings.patch diff --git a/board/patches/sdl2/sdl2_input_p009_hat_definition.patch b/board/batocera/patches/sdl2/sdl2_input_p009_hat_definition.patch similarity index 100% rename from board/patches/sdl2/sdl2_input_p009_hat_definition.patch rename to board/batocera/patches/sdl2/sdl2_input_p009_hat_definition.patch diff --git a/board/patches/sdl2/sdl2_older_gbm.patch b/board/batocera/patches/sdl2/sdl2_older_gbm.patch similarity index 100% rename from board/patches/sdl2/sdl2_older_gbm.patch rename to board/batocera/patches/sdl2/sdl2_older_gbm.patch diff --git a/board/patches/sdl2/sdl2_x11modes.c_2.28.1_to_2.0.14.patch b/board/batocera/patches/sdl2/sdl2_x11modes.c_2.28.1_to_2.0.14.patch similarity index 100% rename from board/patches/sdl2/sdl2_x11modes.c_2.28.1_to_2.0.14.patch rename to board/batocera/patches/sdl2/sdl2_x11modes.c_2.28.1_to_2.0.14.patch diff --git a/board/patches/sdl_sound/0003-use-sdl2.patch b/board/batocera/patches/sdl_sound/0003-use-sdl2.patch similarity index 100% rename from board/patches/sdl_sound/0003-use-sdl2.patch rename to board/batocera/patches/sdl_sound/0003-use-sdl2.patch diff --git a/board/patches/sway/000-allow-running-as-root.patch b/board/batocera/patches/sway/000-allow-running-as-root.patch similarity index 100% rename from board/patches/sway/000-allow-running-as-root.patch rename to board/batocera/patches/sway/000-allow-running-as-root.patch diff --git a/board/patches/usbmount/0003-ntfs3g.patch b/board/batocera/patches/usbmount/0003-ntfs3g.patch similarity index 100% rename from board/patches/usbmount/0003-ntfs3g.patch rename to board/batocera/patches/usbmount/0003-ntfs3g.patch diff --git a/board/patches/usbmount/003-usbmount-sdcard.patch b/board/batocera/patches/usbmount/003-usbmount-sdcard.patch similarity index 100% rename from board/patches/usbmount/003-usbmount-sdcard.patch rename to board/batocera/patches/usbmount/003-usbmount-sdcard.patch diff --git a/board/patches/usbmount/004-usbmount-fancy-mount-points.patch b/board/batocera/patches/usbmount/004-usbmount-fancy-mount-points.patch similarity index 100% rename from board/patches/usbmount/004-usbmount-fancy-mount-points.patch rename to board/batocera/patches/usbmount/004-usbmount-fancy-mount-points.patch diff --git a/board/patches/wine/000-disable-install-mono-and-gecko.patch b/board/batocera/patches/wine/000-disable-install-mono-and-gecko.patch similarity index 100% rename from board/patches/wine/000-disable-install-mono-and-gecko.patch rename to board/batocera/patches/wine/000-disable-install-mono-and-gecko.patch diff --git a/board/patches/xapp_xinit/001-disable-xauth.patch b/board/batocera/patches/xapp_xinit/001-disable-xauth.patch similarity index 100% rename from board/patches/xapp_xinit/001-disable-xauth.patch rename to board/batocera/patches/xapp_xinit/001-disable-xauth.patch diff --git a/board/patches/xapp_xinit/002-failure-diagnostics.patch b/board/batocera/patches/xapp_xinit/002-failure-diagnostics.patch similarity index 100% rename from board/patches/xapp_xinit/002-failure-diagnostics.patch rename to board/batocera/patches/xapp_xinit/002-failure-diagnostics.patch diff --git a/board/patches/xapp_xrandr/xapp_xrandr-outputs-resolutions-rotations.patch b/board/batocera/patches/xapp_xrandr/xapp_xrandr-outputs-resolutions-rotations.patch similarity index 100% rename from board/patches/xapp_xrandr/xapp_xrandr-outputs-resolutions-rotations.patch rename to board/batocera/patches/xapp_xrandr/xapp_xrandr-outputs-resolutions-rotations.patch diff --git a/board/qualcomm/sd845/odin/create-boot-script.sh b/board/batocera/qualcomm/sd845/odin/create-boot-script.sh similarity index 100% rename from board/qualcomm/sd845/odin/create-boot-script.sh rename to board/batocera/qualcomm/sd845/odin/create-boot-script.sh diff --git a/board/qualcomm/sd845/odin/fsoverlay/etc/init.d/S05user b/board/batocera/qualcomm/sd845/odin/fsoverlay/etc/init.d/S05user similarity index 100% rename from board/qualcomm/sd845/odin/fsoverlay/etc/init.d/S05user rename to board/batocera/qualcomm/sd845/odin/fsoverlay/etc/init.d/S05user diff --git a/board/qualcomm/sd845/odin/genimage.cfg b/board/batocera/qualcomm/sd845/odin/genimage.cfg similarity index 100% rename from board/qualcomm/sd845/odin/genimage.cfg rename to board/batocera/qualcomm/sd845/odin/genimage.cfg diff --git a/board/qualcomm/sd845/odin/grub.cfg b/board/batocera/qualcomm/sd845/odin/grub.cfg similarity index 100% rename from board/qualcomm/sd845/odin/grub.cfg rename to board/batocera/qualcomm/sd845/odin/grub.cfg diff --git a/board/qualcomm/sd845/odin/linux-defconfig-fragment.config b/board/batocera/qualcomm/sd845/odin/linux-defconfig-fragment.config similarity index 100% rename from board/qualcomm/sd845/odin/linux-defconfig-fragment.config rename to board/batocera/qualcomm/sd845/odin/linux-defconfig-fragment.config diff --git a/board/qualcomm/sd845/odin/linux_patches/0001-iio-adc-qcom-spmi-adc5-add-more-channels-needed-by-o.patch b/board/batocera/qualcomm/sd845/odin/linux_patches/0001-iio-adc-qcom-spmi-adc5-add-more-channels-needed-by-o.patch similarity index 100% rename from board/qualcomm/sd845/odin/linux_patches/0001-iio-adc-qcom-spmi-adc5-add-more-channels-needed-by-o.patch rename to board/batocera/qualcomm/sd845/odin/linux_patches/0001-iio-adc-qcom-spmi-adc5-add-more-channels-needed-by-o.patch diff --git a/board/qualcomm/sd845/odin/linux_patches/0002-Revert-ASoC-codecs-wcd934x-Use-.prepare-and-.shutdow.patch b/board/batocera/qualcomm/sd845/odin/linux_patches/0002-Revert-ASoC-codecs-wcd934x-Use-.prepare-and-.shutdow.patch similarity index 100% rename from board/qualcomm/sd845/odin/linux_patches/0002-Revert-ASoC-codecs-wcd934x-Use-.prepare-and-.shutdow.patch rename to board/batocera/qualcomm/sd845/odin/linux_patches/0002-Revert-ASoC-codecs-wcd934x-Use-.prepare-and-.shutdow.patch diff --git a/board/qualcomm/sd845/odin/linux_patches/0003-drm-Add-orientation-quirk-for-AYN-Odin.patch b/board/batocera/qualcomm/sd845/odin/linux_patches/0003-drm-Add-orientation-quirk-for-AYN-Odin.patch similarity index 100% rename from board/qualcomm/sd845/odin/linux_patches/0003-drm-Add-orientation-quirk-for-AYN-Odin.patch rename to board/batocera/qualcomm/sd845/odin/linux_patches/0003-drm-Add-orientation-quirk-for-AYN-Odin.patch diff --git a/board/qualcomm/sd845/odin/linux_patches/0004-Input-add-AYN-Odin-gamepad-driver.patch b/board/batocera/qualcomm/sd845/odin/linux_patches/0004-Input-add-AYN-Odin-gamepad-driver.patch similarity index 100% rename from board/qualcomm/sd845/odin/linux_patches/0004-Input-add-AYN-Odin-gamepad-driver.patch rename to board/batocera/qualcomm/sd845/odin/linux_patches/0004-Input-add-AYN-Odin-gamepad-driver.patch diff --git a/board/qualcomm/sd845/odin/linux_patches/0005-arm64-dts-ayn-odin-Batocera-specific-changes.patch b/board/batocera/qualcomm/sd845/odin/linux_patches/0005-arm64-dts-ayn-odin-Batocera-specific-changes.patch similarity index 100% rename from board/qualcomm/sd845/odin/linux_patches/0005-arm64-dts-ayn-odin-Batocera-specific-changes.patch rename to board/batocera/qualcomm/sd845/odin/linux_patches/0005-arm64-dts-ayn-odin-Batocera-specific-changes.patch diff --git a/board/qualcomm/sd845/odin/patches/alsa-lib/0001-Enabled-extended-namehints-in-alsa.conf.patch b/board/batocera/qualcomm/sd845/odin/patches/alsa-lib/0001-Enabled-extended-namehints-in-alsa.conf.patch similarity index 100% rename from board/qualcomm/sd845/odin/patches/alsa-lib/0001-Enabled-extended-namehints-in-alsa.conf.patch rename to board/batocera/qualcomm/sd845/odin/patches/alsa-lib/0001-Enabled-extended-namehints-in-alsa.conf.patch diff --git a/board/qualcomm/sd845/odin/patches/alsa-ucm-conf/0001-Add-Odin-configuration.patch b/board/batocera/qualcomm/sd845/odin/patches/alsa-ucm-conf/0001-Add-Odin-configuration.patch similarity index 100% rename from board/qualcomm/sd845/odin/patches/alsa-ucm-conf/0001-Add-Odin-configuration.patch rename to board/batocera/qualcomm/sd845/odin/patches/alsa-ucm-conf/0001-Add-Odin-configuration.patch diff --git a/board/rockchip/fsoverlay/.gitkeep b/board/batocera/rockchip/fsoverlay/.gitkeep similarity index 100% rename from board/rockchip/fsoverlay/.gitkeep rename to board/batocera/rockchip/fsoverlay/.gitkeep diff --git a/board/rockchip/patches/ffmpeg/ffmpeg-001-v4l2-drmprime.patch b/board/batocera/rockchip/patches/ffmpeg/ffmpeg-001-v4l2-drmprime.patch similarity index 100% rename from board/rockchip/patches/ffmpeg/ffmpeg-001-v4l2-drmprime.patch rename to board/batocera/rockchip/patches/ffmpeg/ffmpeg-001-v4l2-drmprime.patch diff --git a/board/rockchip/patches/ffmpeg/ffmpeg-001-v4l2-request.patch b/board/batocera/rockchip/patches/ffmpeg/ffmpeg-001-v4l2-request.patch similarity index 100% rename from board/rockchip/patches/ffmpeg/ffmpeg-001-v4l2-request.patch rename to board/batocera/rockchip/patches/ffmpeg/ffmpeg-001-v4l2-request.patch diff --git a/board/rockchip/patches/ffmpeg/ffmpeg-001-vf-deinterlace-v4l2m2m.patch b/board/batocera/rockchip/patches/ffmpeg/ffmpeg-001-vf-deinterlace-v4l2m2m.patch similarity index 100% rename from board/rockchip/patches/ffmpeg/ffmpeg-001-vf-deinterlace-v4l2m2m.patch rename to board/batocera/rockchip/patches/ffmpeg/ffmpeg-001-vf-deinterlace-v4l2m2m.patch diff --git a/board/rockchip/patches/ffmpeg/ffmpeg-002-deint_v4l2m2m-increase-input-and-output-buffers.patch b/board/batocera/rockchip/patches/ffmpeg/ffmpeg-002-deint_v4l2m2m-increase-input-and-output-buffers.patch similarity index 100% rename from board/rockchip/patches/ffmpeg/ffmpeg-002-deint_v4l2m2m-increase-input-and-output-buffers.patch rename to board/batocera/rockchip/patches/ffmpeg/ffmpeg-002-deint_v4l2m2m-increase-input-and-output-buffers.patch diff --git a/board/rockchip/patches/mupen64plus-video-glide64mk2/add-left-offset-parameter.patch b/board/batocera/rockchip/patches/mupen64plus-video-glide64mk2/add-left-offset-parameter.patch similarity index 100% rename from board/rockchip/patches/mupen64plus-video-glide64mk2/add-left-offset-parameter.patch rename to board/batocera/rockchip/patches/mupen64plus-video-glide64mk2/add-left-offset-parameter.patch diff --git a/board/rockchip/patches/mupen64plus-video-rice/add-left-offset-parameter.patch b/board/batocera/rockchip/patches/mupen64plus-video-rice/add-left-offset-parameter.patch similarity index 100% rename from board/rockchip/patches/mupen64plus-video-rice/add-left-offset-parameter.patch rename to board/batocera/rockchip/patches/mupen64plus-video-rice/add-left-offset-parameter.patch diff --git a/board/rockchip/patches/mupen64plus-video-rice/updates-wip.patch b/board/batocera/rockchip/patches/mupen64plus-video-rice/updates-wip.patch similarity index 100% rename from board/rockchip/patches/mupen64plus-video-rice/updates-wip.patch rename to board/batocera/rockchip/patches/mupen64plus-video-rice/updates-wip.patch diff --git a/board/rockchip/patches/sugarbox/001-gles.patch b/board/batocera/rockchip/patches/sugarbox/001-gles.patch similarity index 100% rename from board/rockchip/patches/sugarbox/001-gles.patch rename to board/batocera/rockchip/patches/sugarbox/001-gles.patch diff --git a/board/rockchip/patches/switchres/001-relax-kmsdrm.patch b/board/batocera/rockchip/patches/switchres/001-relax-kmsdrm.patch similarity index 100% rename from board/rockchip/patches/switchres/001-relax-kmsdrm.patch rename to board/batocera/rockchip/patches/switchres/001-relax-kmsdrm.patch diff --git a/board/rockchip/rk3128/fsoverlay/etc/udev/rules.d/60-drm.rules b/board/batocera/rockchip/rk3128/fsoverlay/etc/udev/rules.d/60-drm.rules similarity index 100% rename from board/rockchip/rk3128/fsoverlay/etc/udev/rules.d/60-drm.rules rename to board/batocera/rockchip/rk3128/fsoverlay/etc/udev/rules.d/60-drm.rules diff --git a/board/rockchip/rk3128/fsoverlay/etc/udev/rules.d/80-headset.rules b/board/batocera/rockchip/rk3128/fsoverlay/etc/udev/rules.d/80-headset.rules similarity index 100% rename from board/rockchip/rk3128/fsoverlay/etc/udev/rules.d/80-headset.rules rename to board/batocera/rockchip/rk3128/fsoverlay/etc/udev/rules.d/80-headset.rules diff --git a/board/rockchip/rk3128/fsoverlay/etc/udev/rules.d/99-wx8-gamepad.rules b/board/batocera/rockchip/rk3128/fsoverlay/etc/udev/rules.d/99-wx8-gamepad.rules similarity index 100% rename from board/rockchip/rk3128/fsoverlay/etc/udev/rules.d/99-wx8-gamepad.rules rename to board/batocera/rockchip/rk3128/fsoverlay/etc/udev/rules.d/99-wx8-gamepad.rules diff --git a/board/rockchip/rk3128/fsoverlay/usr/bin/cputemp b/board/batocera/rockchip/rk3128/fsoverlay/usr/bin/cputemp similarity index 100% rename from board/rockchip/rk3128/fsoverlay/usr/bin/cputemp rename to board/batocera/rockchip/rk3128/fsoverlay/usr/bin/cputemp diff --git a/board/rockchip/rk3128/fsoverlay/usr/bin/headset-hotplug.sh b/board/batocera/rockchip/rk3128/fsoverlay/usr/bin/headset-hotplug.sh similarity index 100% rename from board/rockchip/rk3128/fsoverlay/usr/bin/headset-hotplug.sh rename to board/batocera/rockchip/rk3128/fsoverlay/usr/bin/headset-hotplug.sh diff --git a/board/rockchip/rk3128/fsoverlay/usr/share/pipewire/media-session.d/alsa-monitor.conf b/board/batocera/rockchip/rk3128/fsoverlay/usr/share/pipewire/media-session.d/alsa-monitor.conf similarity index 100% rename from board/rockchip/rk3128/fsoverlay/usr/share/pipewire/media-session.d/alsa-monitor.conf rename to board/batocera/rockchip/rk3128/fsoverlay/usr/share/pipewire/media-session.d/alsa-monitor.conf diff --git a/board/rockchip/rk3128/fsoverlay/usr/share/reglinux/configgen/scripts/governor.sh b/board/batocera/rockchip/rk3128/fsoverlay/usr/share/reglinux/configgen/scripts/governor.sh similarity index 100% rename from board/rockchip/rk3128/fsoverlay/usr/share/reglinux/configgen/scripts/governor.sh rename to board/batocera/rockchip/rk3128/fsoverlay/usr/share/reglinux/configgen/scripts/governor.sh diff --git a/board/rockchip/rk3128/linux-defconfig-fragment.config b/board/batocera/rockchip/rk3128/linux-defconfig-fragment.config similarity index 100% rename from board/rockchip/rk3128/linux-defconfig-fragment.config rename to board/batocera/rockchip/rk3128/linux-defconfig-fragment.config diff --git a/board/rockchip/rk3128/linux-defconfig.config b/board/batocera/rockchip/rk3128/linux-defconfig.config similarity index 100% rename from board/rockchip/rk3128/linux-defconfig.config rename to board/batocera/rockchip/rk3128/linux-defconfig.config diff --git a/board/rockchip/rk3128/linux_patches/0001-BACKPORT-arm64-don-t-zero-in-__copy_from_user-_inato.patch b/board/batocera/rockchip/rk3128/linux_patches/0001-BACKPORT-arm64-don-t-zero-in-__copy_from_user-_inato.patch similarity index 100% rename from board/rockchip/rk3128/linux_patches/0001-BACKPORT-arm64-don-t-zero-in-__copy_from_user-_inato.patch rename to board/batocera/rockchip/rk3128/linux_patches/0001-BACKPORT-arm64-don-t-zero-in-__copy_from_user-_inato.patch diff --git a/board/rockchip/rk3128/linux_patches/0001-gpu-bifrost_for_linux-Apply-patches-for-Vulkan.patch b/board/batocera/rockchip/rk3128/linux_patches/0001-gpu-bifrost_for_linux-Apply-patches-for-Vulkan.patch similarity index 100% rename from board/rockchip/rk3128/linux_patches/0001-gpu-bifrost_for_linux-Apply-patches-for-Vulkan.patch rename to board/batocera/rockchip/rk3128/linux_patches/0001-gpu-bifrost_for_linux-Apply-patches-for-Vulkan.patch diff --git a/board/rockchip/rk3128/linux_patches/0001-perf-cs-etm-fix-duplicate-def-of-traceid_list.patch b/board/batocera/rockchip/rk3128/linux_patches/0001-perf-cs-etm-fix-duplicate-def-of-traceid_list.patch similarity index 100% rename from board/rockchip/rk3128/linux_patches/0001-perf-cs-etm-fix-duplicate-def-of-traceid_list.patch rename to board/batocera/rockchip/rk3128/linux_patches/0001-perf-cs-etm-fix-duplicate-def-of-traceid_list.patch diff --git a/board/rockchip/rk3128/linux_patches/0001-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/board/batocera/rockchip/rk3128/linux_patches/0001-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch similarity index 100% rename from board/rockchip/rk3128/linux_patches/0001-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch rename to board/batocera/rockchip/rk3128/linux_patches/0001-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch diff --git a/board/rockchip/rk3128/linux_patches/0002-perf-bench-Share-some-global-variables-to-fix-build-.patch b/board/batocera/rockchip/rk3128/linux_patches/0002-perf-bench-Share-some-global-variables-to-fix-build-.patch similarity index 100% rename from board/rockchip/rk3128/linux_patches/0002-perf-bench-Share-some-global-variables-to-fix-build-.patch rename to board/batocera/rockchip/rk3128/linux_patches/0002-perf-bench-Share-some-global-variables-to-fix-build-.patch diff --git a/board/rockchip/rk3128/linux_patches/0003-perf-Make-perf-able-to-build-with-latest-libbfd.patch b/board/batocera/rockchip/rk3128/linux_patches/0003-perf-Make-perf-able-to-build-with-latest-libbfd.patch similarity index 100% rename from board/rockchip/rk3128/linux_patches/0003-perf-Make-perf-able-to-build-with-latest-libbfd.patch rename to board/batocera/rockchip/rk3128/linux_patches/0003-perf-Make-perf-able-to-build-with-latest-libbfd.patch diff --git a/board/rockchip/rk3128/linux_patches/0006-nf_conntrack_core-Fix-gcc-10-compilation.patch b/board/batocera/rockchip/rk3128/linux_patches/0006-nf_conntrack_core-Fix-gcc-10-compilation.patch similarity index 100% rename from board/rockchip/rk3128/linux_patches/0006-nf_conntrack_core-Fix-gcc-10-compilation.patch rename to board/batocera/rockchip/rk3128/linux_patches/0006-nf_conntrack_core-Fix-gcc-10-compilation.patch diff --git a/board/rockchip/rk3128/linux_patches/0007-wlcore-debugfs-Remove-unused-variable-res.patch b/board/batocera/rockchip/rk3128/linux_patches/0007-wlcore-debugfs-Remove-unused-variable-res.patch similarity index 100% rename from board/rockchip/rk3128/linux_patches/0007-wlcore-debugfs-Remove-unused-variable-res.patch rename to board/batocera/rockchip/rk3128/linux_patches/0007-wlcore-debugfs-Remove-unused-variable-res.patch diff --git a/board/rockchip/rk3128/linux_patches/0008-usb-ehci-avoid-gcc-10-zero-length-bounds-warning.patch b/board/batocera/rockchip/rk3128/linux_patches/0008-usb-ehci-avoid-gcc-10-zero-length-bounds-warning.patch similarity index 100% rename from board/rockchip/rk3128/linux_patches/0008-usb-ehci-avoid-gcc-10-zero-length-bounds-warning.patch rename to board/batocera/rockchip/rk3128/linux_patches/0008-usb-ehci-avoid-gcc-10-zero-length-bounds-warning.patch diff --git a/board/rockchip/rk3128/linux_patches/0009-gcc-10-warnings-fix-low-hanging-fruit.patch b/board/batocera/rockchip/rk3128/linux_patches/0009-gcc-10-warnings-fix-low-hanging-fruit.patch similarity index 100% rename from board/rockchip/rk3128/linux_patches/0009-gcc-10-warnings-fix-low-hanging-fruit.patch rename to board/batocera/rockchip/rk3128/linux_patches/0009-gcc-10-warnings-fix-low-hanging-fruit.patch diff --git a/board/rockchip/rk3128/linux_patches/0010-Fix-joystick-analog.c-GCC-10-Wrestrict-warning.patch b/board/batocera/rockchip/rk3128/linux_patches/0010-Fix-joystick-analog.c-GCC-10-Wrestrict-warning.patch similarity index 100% rename from board/rockchip/rk3128/linux_patches/0010-Fix-joystick-analog.c-GCC-10-Wrestrict-warning.patch rename to board/batocera/rockchip/rk3128/linux_patches/0010-Fix-joystick-analog.c-GCC-10-Wrestrict-warning.patch diff --git a/board/rockchip/rk3128/linux_patches/0011-drivers-net-phy-mdio_bus-Fix-gcc-10-Wrestrict.patch b/board/batocera/rockchip/rk3128/linux_patches/0011-drivers-net-phy-mdio_bus-Fix-gcc-10-Wrestrict.patch similarity index 100% rename from board/rockchip/rk3128/linux_patches/0011-drivers-net-phy-mdio_bus-Fix-gcc-10-Wrestrict.patch rename to board/batocera/rockchip/rk3128/linux_patches/0011-drivers-net-phy-mdio_bus-Fix-gcc-10-Wrestrict.patch diff --git a/board/rockchip/rk3128/linux_patches/0013-rg351p-battery.patch b/board/batocera/rockchip/rk3128/linux_patches/0013-rg351p-battery.patch similarity index 100% rename from board/rockchip/rk3128/linux_patches/0013-rg351p-battery.patch rename to board/batocera/rockchip/rk3128/linux_patches/0013-rg351p-battery.patch diff --git a/board/rockchip/rk3128/linux_patches/0014-gcc-13-fixup.patch b/board/batocera/rockchip/rk3128/linux_patches/0014-gcc-13-fixup.patch similarity index 100% rename from board/rockchip/rk3128/linux_patches/0014-gcc-13-fixup.patch rename to board/batocera/rockchip/rk3128/linux_patches/0014-gcc-13-fixup.patch diff --git a/board/rockchip/rk3128/linux_patches/linux-tools-libtraceevent.patch b/board/batocera/rockchip/rk3128/linux_patches/linux-tools-libtraceevent.patch similarity index 100% rename from board/rockchip/rk3128/linux_patches/linux-tools-libtraceevent.patch rename to board/batocera/rockchip/rk3128/linux_patches/linux-tools-libtraceevent.patch diff --git a/board/rockchip/rk3128/linux_patches/linux-usbhid-quircks.patch b/board/batocera/rockchip/rk3128/linux_patches/linux-usbhid-quircks.patch similarity index 100% rename from board/rockchip/rk3128/linux_patches/linux-usbhid-quircks.patch rename to board/batocera/rockchip/rk3128/linux_patches/linux-usbhid-quircks.patch diff --git a/board/rockchip/rk3128/linux_patches/linux-wiimote-abs-not-hat.patch b/board/batocera/rockchip/rk3128/linux_patches/linux-wiimote-abs-not-hat.patch similarity index 100% rename from board/rockchip/rk3128/linux_patches/linux-wiimote-abs-not-hat.patch rename to board/batocera/rockchip/rk3128/linux_patches/linux-wiimote-abs-not-hat.patch diff --git a/board/rockchip/rk3128/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch b/board/batocera/rockchip/rk3128/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch similarity index 100% rename from board/rockchip/rk3128/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch rename to board/batocera/rockchip/rk3128/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch diff --git a/board/rockchip/rk3128/patches/batocera-emulationstation/001-mixer.patch b/board/batocera/rockchip/rk3128/patches/batocera-emulationstation/001-mixer.patch similarity index 100% rename from board/rockchip/rk3128/patches/batocera-emulationstation/001-mixer.patch rename to board/batocera/rockchip/rk3128/patches/batocera-emulationstation/001-mixer.patch diff --git a/board/rockchip/rk3128/patches/libcec/000-disable-linux-api.patch b/board/batocera/rockchip/rk3128/patches/libcec/000-disable-linux-api.patch similarity index 100% rename from board/rockchip/rk3128/patches/libcec/000-disable-linux-api.patch rename to board/batocera/rockchip/rk3128/patches/libcec/000-disable-linux-api.patch diff --git a/board/rockchip/rk3128/patches/ppsspp/board-maxwindow.patch b/board/batocera/rockchip/rk3128/patches/ppsspp/board-maxwindow.patch similarity index 100% rename from board/rockchip/rk3128/patches/ppsspp/board-maxwindow.patch rename to board/batocera/rockchip/rk3128/patches/ppsspp/board-maxwindow.patch diff --git a/board/rockchip/rk3128/patches/rockchip-rga/001-fix-meson-build.patch b/board/batocera/rockchip/rk3128/patches/rockchip-rga/001-fix-meson-build.patch similarity index 100% rename from board/rockchip/rk3128/patches/rockchip-rga/001-fix-meson-build.patch rename to board/batocera/rockchip/rk3128/patches/rockchip-rga/001-fix-meson-build.patch diff --git a/board/rockchip/rk3128/patches/sdl2/board-config-Link-to-rga.patch b/board/batocera/rockchip/rk3128/patches/sdl2/board-config-Link-to-rga.patch similarity index 100% rename from board/rockchip/rk3128/patches/sdl2/board-config-Link-to-rga.patch rename to board/batocera/rockchip/rk3128/patches/sdl2/board-config-Link-to-rga.patch diff --git a/board/rockchip/rk3128/patches/uboot-powkiddy-a13/001-fix-uboot-gcc13.patch b/board/batocera/rockchip/rk3128/patches/uboot-powkiddy-a13/001-fix-uboot-gcc13.patch similarity index 100% rename from board/rockchip/rk3128/patches/uboot-powkiddy-a13/001-fix-uboot-gcc13.patch rename to board/batocera/rockchip/rk3128/patches/uboot-powkiddy-a13/001-fix-uboot-gcc13.patch diff --git a/board/rockchip/rk3128/patches/uboot-ps5000/001-fix-uboot-gcc13.patch b/board/batocera/rockchip/rk3128/patches/uboot-ps5000/001-fix-uboot-gcc13.patch similarity index 100% rename from board/rockchip/rk3128/patches/uboot-ps5000/001-fix-uboot-gcc13.patch rename to board/batocera/rockchip/rk3128/patches/uboot-ps5000/001-fix-uboot-gcc13.patch diff --git a/board/rockchip/rk3128/patches/uboot-ps7000/001-fix-uboot-gcc13.patch b/board/batocera/rockchip/rk3128/patches/uboot-ps7000/001-fix-uboot-gcc13.patch similarity index 100% rename from board/rockchip/rk3128/patches/uboot-ps7000/001-fix-uboot-gcc13.patch rename to board/batocera/rockchip/rk3128/patches/uboot-ps7000/001-fix-uboot-gcc13.patch diff --git a/board/rockchip/rk3128/powkiddy-a13/boot/extlinux.conf b/board/batocera/rockchip/rk3128/powkiddy-a13/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3128/powkiddy-a13/boot/extlinux.conf rename to board/batocera/rockchip/rk3128/powkiddy-a13/boot/extlinux.conf diff --git a/board/rockchip/rk3128/powkiddy-a13/create-boot-script.sh b/board/batocera/rockchip/rk3128/powkiddy-a13/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3128/powkiddy-a13/create-boot-script.sh rename to board/batocera/rockchip/rk3128/powkiddy-a13/create-boot-script.sh diff --git a/board/rockchip/rk3128/powkiddy-a13/genimage.cfg b/board/batocera/rockchip/rk3128/powkiddy-a13/genimage.cfg similarity index 100% rename from board/rockchip/rk3128/powkiddy-a13/genimage.cfg rename to board/batocera/rockchip/rk3128/powkiddy-a13/genimage.cfg diff --git a/board/rockchip/rk3128/ps5000/boot/extlinux.conf b/board/batocera/rockchip/rk3128/ps5000/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3128/ps5000/boot/extlinux.conf rename to board/batocera/rockchip/rk3128/ps5000/boot/extlinux.conf diff --git a/board/rockchip/rk3128/ps5000/create-boot-script.sh b/board/batocera/rockchip/rk3128/ps5000/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3128/ps5000/create-boot-script.sh rename to board/batocera/rockchip/rk3128/ps5000/create-boot-script.sh diff --git a/board/rockchip/rk3128/ps5000/genimage.cfg b/board/batocera/rockchip/rk3128/ps5000/genimage.cfg similarity index 100% rename from board/rockchip/rk3128/ps5000/genimage.cfg rename to board/batocera/rockchip/rk3128/ps5000/genimage.cfg diff --git a/board/rockchip/rk3128/ps7000/boot/extlinux.conf b/board/batocera/rockchip/rk3128/ps7000/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3128/ps7000/boot/extlinux.conf rename to board/batocera/rockchip/rk3128/ps7000/boot/extlinux.conf diff --git a/board/rockchip/rk3128/ps7000/create-boot-script.sh b/board/batocera/rockchip/rk3128/ps7000/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3128/ps7000/create-boot-script.sh rename to board/batocera/rockchip/rk3128/ps7000/create-boot-script.sh diff --git a/board/rockchip/rk3128/ps7000/genimage.cfg b/board/batocera/rockchip/rk3128/ps7000/genimage.cfg similarity index 100% rename from board/rockchip/rk3128/ps7000/genimage.cfg rename to board/batocera/rockchip/rk3128/ps7000/genimage.cfg diff --git a/board/rockchip/rk3288/fsoverlay/usr/bin/cputemp b/board/batocera/rockchip/rk3288/fsoverlay/usr/bin/cputemp similarity index 100% rename from board/rockchip/rk3288/fsoverlay/usr/bin/cputemp rename to board/batocera/rockchip/rk3288/fsoverlay/usr/bin/cputemp diff --git a/board/rockchip/rk3288/fsoverlay/usr/bin/gputemp b/board/batocera/rockchip/rk3288/fsoverlay/usr/bin/gputemp similarity index 100% rename from board/rockchip/rk3288/fsoverlay/usr/bin/gputemp rename to board/batocera/rockchip/rk3288/fsoverlay/usr/bin/gputemp diff --git a/board/rockchip/rk3288/fsoverlay/usr/share/alsa/cards/Analog.conf b/board/batocera/rockchip/rk3288/fsoverlay/usr/share/alsa/cards/Analog.conf similarity index 100% rename from board/rockchip/rk3288/fsoverlay/usr/share/alsa/cards/Analog.conf rename to board/batocera/rockchip/rk3288/fsoverlay/usr/share/alsa/cards/Analog.conf diff --git a/board/rockchip/rk3288/fsoverlay/usr/share/alsa/cards/SPDIF.conf b/board/batocera/rockchip/rk3288/fsoverlay/usr/share/alsa/cards/SPDIF.conf similarity index 100% rename from board/rockchip/rk3288/fsoverlay/usr/share/alsa/cards/SPDIF.conf rename to board/batocera/rockchip/rk3288/fsoverlay/usr/share/alsa/cards/SPDIF.conf diff --git a/board/rockchip/rk3288/fsoverlay/usr/share/alsa/cards/simple-card.conf b/board/batocera/rockchip/rk3288/fsoverlay/usr/share/alsa/cards/simple-card.conf similarity index 100% rename from board/rockchip/rk3288/fsoverlay/usr/share/alsa/cards/simple-card.conf rename to board/batocera/rockchip/rk3288/fsoverlay/usr/share/alsa/cards/simple-card.conf diff --git a/board/rockchip/rk3288/linux-defconfig-fragment.config b/board/batocera/rockchip/rk3288/linux-defconfig-fragment.config similarity index 100% rename from board/rockchip/rk3288/linux-defconfig-fragment.config rename to board/batocera/rockchip/rk3288/linux-defconfig-fragment.config diff --git a/board/rockchip/rk3288/linux-defconfig.config b/board/batocera/rockchip/rk3288/linux-defconfig.config similarity index 100% rename from board/rockchip/rk3288/linux-defconfig.config rename to board/batocera/rockchip/rk3288/linux-defconfig.config diff --git a/board/rockchip/rk3288/linux_patches/linux-0001-RK3288-Merge-tinker-into-tinker-s.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-0001-RK3288-Merge-tinker-into-tinker-s.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-0001-RK3288-Merge-tinker-into-tinker-s.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-0001-RK3288-Merge-tinker-into-tinker-s.patch diff --git a/board/rockchip/rk3288/linux_patches/linux-0002-rockchip-from-list.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-0002-rockchip-from-list.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-0002-rockchip-from-list.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-0002-rockchip-from-list.patch diff --git a/board/rockchip/rk3288/linux_patches/linux-0011-v4l2-from-list.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-0011-v4l2-from-list.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-0011-v4l2-from-list.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-0011-v4l2-from-list.patch diff --git a/board/rockchip/rk3288/linux_patches/linux-0020-drm-from-list.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-0020-drm-from-list.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-0020-drm-from-list.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-0020-drm-from-list.patch diff --git a/board/rockchip/rk3288/linux_patches/linux-1001-v4l2-rockchip.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-1001-v4l2-rockchip.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-1001-v4l2-rockchip.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-1001-v4l2-rockchip.patch diff --git a/board/rockchip/rk3288/linux_patches/linux-1002-for-libreelec.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-1002-for-libreelec.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-1002-for-libreelec.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-1002-for-libreelec.patch diff --git a/board/rockchip/rk3288/linux_patches/linux-15khz.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-15khz.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-15khz.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-15khz.patch diff --git a/board/rockchip/rk3288/linux_patches/linux-2000-v4l2-wip-rkvdec-hevc.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-2000-v4l2-wip-rkvdec-hevc.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-2000-v4l2-wip-rkvdec-hevc.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-2000-v4l2-wip-rkvdec-hevc.patch diff --git a/board/rockchip/rk3288/linux_patches/linux-2001-v4l2-wip-iep-driver.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-2001-v4l2-wip-iep-driver.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-2001-v4l2-wip-iep-driver.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-2001-v4l2-wip-iep-driver.patch diff --git a/board/rockchip/rk3288/linux_patches/linux-2102-RK3288-DTSI-rk3288-Add-missing-SPI2-pinctrl.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-2102-RK3288-DTSI-rk3288-Add-missing-SPI2-pinctrl.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-2102-RK3288-DTSI-rk3288-Add-missing-SPI2-pinctrl.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-2102-RK3288-DTSI-rk3288-Add-missing-SPI2-pinctrl.patch diff --git a/board/rockchip/rk3288/linux_patches/linux-2105-ARM-DTS-rk3288-tinker-Enabling-SDIO-and-Wifi.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-2105-ARM-DTS-rk3288-tinker-Enabling-SDIO-and-Wifi.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-2105-ARM-DTS-rk3288-tinker-Enabling-SDIO-and-Wifi.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-2105-ARM-DTS-rk3288-tinker-Enabling-SDIO-and-Wifi.patch diff --git a/board/rockchip/rk3288/linux_patches/linux-2106-ARM-DTS-rk3288-tinker-Setup-the-Bluetooth-UART-pins.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-2106-ARM-DTS-rk3288-tinker-Setup-the-Bluetooth-UART-pins.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-2106-ARM-DTS-rk3288-tinker-Setup-the-Bluetooth-UART-pins.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-2106-ARM-DTS-rk3288-tinker-Setup-the-Bluetooth-UART-pins.patch diff --git a/board/rockchip/rk3288/linux_patches/linux-2107-ARM-DTSI-rk3288-tinker-Improving-the-CPU-max-voltage.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-2107-ARM-DTSI-rk3288-tinker-Improving-the-CPU-max-voltage.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-2107-ARM-DTSI-rk3288-tinker-Improving-the-CPU-max-voltage.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-2107-ARM-DTSI-rk3288-tinker-Improving-the-CPU-max-voltage.patch diff --git a/board/rockchip/rk3288/linux_patches/linux-2108-ARM-DTS-rk3288-tinker-Defined-the-I2C-interfaces.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-2108-ARM-DTS-rk3288-tinker-Defined-the-I2C-interfaces.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-2108-ARM-DTS-rk3288-tinker-Defined-the-I2C-interfaces.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-2108-ARM-DTS-rk3288-tinker-Defined-the-I2C-interfaces.patch diff --git a/board/rockchip/rk3288/linux_patches/linux-2109-ARM-DTS-rk3288-tinker-Defining-the-SPI-interface.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-2109-ARM-DTS-rk3288-tinker-Defining-the-SPI-interface.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-2109-ARM-DTS-rk3288-tinker-Defining-the-SPI-interface.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-2109-ARM-DTS-rk3288-tinker-Defining-the-SPI-interface.patch diff --git a/board/rockchip/rk3288/linux_patches/linux-2110-ARM-DTSI-rk3288-tinker-Defining-SDMMC-properties.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-2110-ARM-DTSI-rk3288-tinker-Defining-SDMMC-properties.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-2110-ARM-DTSI-rk3288-tinker-Defining-SDMMC-properties.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-2110-ARM-DTSI-rk3288-tinker-Defining-SDMMC-properties.patch diff --git a/board/rockchip/rk3288/linux_patches/linux-2112-ARM-DTSI-rk3288-disable-serial-dmas.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-2112-ARM-DTSI-rk3288-disable-serial-dmas.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-2112-ARM-DTSI-rk3288-disable-serial-dmas.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-2112-ARM-DTSI-rk3288-disable-serial-dmas.patch diff --git a/board/rockchip/rk3288/linux_patches/linux-2113-arm-dtsi-rk3288-add-GPU-500-Mhz-OPP.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-2113-arm-dtsi-rk3288-add-GPU-500-Mhz-OPP.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-2113-arm-dtsi-rk3288-add-GPU-500-Mhz-OPP.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-2113-arm-dtsi-rk3288-add-GPU-500-Mhz-OPP.patch diff --git a/board/rockchip/rk3288/linux_patches/linux-2114-clk-rockchip-add-all-known-operating-points-to-the-a.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-2114-clk-rockchip-add-all-known-operating-points-to-the-a.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-2114-clk-rockchip-add-all-known-operating-points-to-the-a.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-2114-clk-rockchip-add-all-known-operating-points-to-the-a.patch diff --git a/board/rockchip/rk3288/linux_patches/linux-2115-drivers-mmc-dw-mci-rockchip-Handle-ASUS-Tinkerboard.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-2115-drivers-mmc-dw-mci-rockchip-Handle-ASUS-Tinkerboard.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-2115-drivers-mmc-dw-mci-rockchip-Handle-ASUS-Tinkerboard.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-2115-drivers-mmc-dw-mci-rockchip-Handle-ASUS-Tinkerboard.patch diff --git a/board/rockchip/rk3288/linux_patches/linux-2116-spi-Added-support-for-Tinkerboard-s-SPI-interface.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-2116-spi-Added-support-for-Tinkerboard-s-SPI-interface.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-2116-spi-Added-support-for-Tinkerboard-s-SPI-interface.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-2116-spi-Added-support-for-Tinkerboard-s-SPI-interface.patch diff --git a/board/rockchip/rk3288/linux_patches/linux-2117-DTS_rearrange_thermal_zones.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-2117-DTS_rearrange_thermal_zones.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-2117-DTS_rearrange_thermal_zones.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-2117-DTS_rearrange_thermal_zones.patch diff --git a/board/rockchip/rk3288/linux_patches/linux-2118-workaround-broadcom-bt-serdev.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-2118-workaround-broadcom-bt-serdev.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-2118-workaround-broadcom-bt-serdev.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-2118-workaround-broadcom-bt-serdev.patch diff --git a/board/rockchip/rk3288/linux_patches/linux-2119-general-fix-reboot-from-kwiboo.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-2119-general-fix-reboot-from-kwiboo.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-2119-general-fix-reboot-from-kwiboo.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-2119-general-fix-reboot-from-kwiboo.patch diff --git a/board/rockchip/rk3288/linux_patches/linux-2120-brcmfmac-add-ap6330-firmware.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-2120-brcmfmac-add-ap6330-firmware.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-2120-brcmfmac-add-ap6330-firmware.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-2120-brcmfmac-add-ap6330-firmware.patch diff --git a/board/rockchip/rk3288/linux_patches/linux-RK3288-1.8GHz-and-boost.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-RK3288-1.8GHz-and-boost.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-RK3288-1.8GHz-and-boost.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-RK3288-1.8GHz-and-boost.patch diff --git a/board/rockchip/rk3288/linux_patches/linux-RK3288-MiQi-Adjust-cpu-and-gpu-regulator-configs-to-.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-RK3288-MiQi-Adjust-cpu-and-gpu-regulator-configs-to-.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-RK3288-MiQi-Adjust-cpu-and-gpu-regulator-configs-to-.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-RK3288-MiQi-Adjust-cpu-and-gpu-regulator-configs-to-.patch diff --git a/board/rockchip/rk3288/linux_patches/linux-rockchip-Enable-4K-60Hz-mode-on-RK3228-RK3328-RK3399-and-RK356x.patch b/board/batocera/rockchip/rk3288/linux_patches/linux-rockchip-Enable-4K-60Hz-mode-on-RK3228-RK3328-RK3399-and-RK356x.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/linux-rockchip-Enable-4K-60Hz-mode-on-RK3228-RK3328-RK3399-and-RK356x.patch rename to board/batocera/rockchip/rk3288/linux_patches/linux-rockchip-Enable-4K-60Hz-mode-on-RK3228-RK3328-RK3399-and-RK356x.patch diff --git a/board/rockchip/rk3288/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch b/board/batocera/rockchip/rk3288/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch similarity index 100% rename from board/rockchip/rk3288/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch rename to board/batocera/rockchip/rk3288/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch diff --git a/board/rockchip/rk3288/miqi/boot/extlinux.conf b/board/batocera/rockchip/rk3288/miqi/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3288/miqi/boot/extlinux.conf rename to board/batocera/rockchip/rk3288/miqi/boot/extlinux.conf diff --git a/board/rockchip/rk3288/miqi/create-boot-script.sh b/board/batocera/rockchip/rk3288/miqi/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3288/miqi/create-boot-script.sh rename to board/batocera/rockchip/rk3288/miqi/create-boot-script.sh diff --git a/board/rockchip/rk3288/miqi/genimage.cfg b/board/batocera/rockchip/rk3288/miqi/genimage.cfg similarity index 100% rename from board/rockchip/rk3288/miqi/genimage.cfg rename to board/batocera/rockchip/rk3288/miqi/genimage.cfg diff --git a/board/rockchip/rk3288/patches/bluez5_utils-5.47/bluez5_utils-add-rtl-bt.patch b/board/batocera/rockchip/rk3288/patches/bluez5_utils-5.47/bluez5_utils-add-rtl-bt.patch similarity index 100% rename from board/rockchip/rk3288/patches/bluez5_utils-5.47/bluez5_utils-add-rtl-bt.patch rename to board/batocera/rockchip/rk3288/patches/bluez5_utils-5.47/bluez5_utils-add-rtl-bt.patch diff --git a/board/rockchip/rk3288/patches/dxx-rebirth/001-fix-32bit-werror-useless-cast.patch b/board/batocera/rockchip/rk3288/patches/dxx-rebirth/001-fix-32bit-werror-useless-cast.patch similarity index 100% rename from board/rockchip/rk3288/patches/dxx-rebirth/001-fix-32bit-werror-useless-cast.patch rename to board/batocera/rockchip/rk3288/patches/dxx-rebirth/001-fix-32bit-werror-useless-cast.patch diff --git a/board/rockchip/rk3288/patches/moonlight-embedded/001-disable-rockchip-rga-mpp.patch b/board/batocera/rockchip/rk3288/patches/moonlight-embedded/001-disable-rockchip-rga-mpp.patch similarity index 100% rename from board/rockchip/rk3288/patches/moonlight-embedded/001-disable-rockchip-rga-mpp.patch rename to board/batocera/rockchip/rk3288/patches/moonlight-embedded/001-disable-rockchip-rga-mpp.patch diff --git a/board/rockchip/rk3288/tinkerboard/boot/extlinux.conf b/board/batocera/rockchip/rk3288/tinkerboard/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3288/tinkerboard/boot/extlinux.conf rename to board/batocera/rockchip/rk3288/tinkerboard/boot/extlinux.conf diff --git a/board/rockchip/rk3288/tinkerboard/create-boot-script.sh b/board/batocera/rockchip/rk3288/tinkerboard/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3288/tinkerboard/create-boot-script.sh rename to board/batocera/rockchip/rk3288/tinkerboard/create-boot-script.sh diff --git a/board/rockchip/rk3288/tinkerboard/genimage.cfg b/board/batocera/rockchip/rk3288/tinkerboard/genimage.cfg similarity index 100% rename from board/rockchip/rk3288/tinkerboard/genimage.cfg rename to board/batocera/rockchip/rk3288/tinkerboard/genimage.cfg diff --git a/board/rockchip/rk3326/boot/boot.ini b/board/batocera/rockchip/rk3326/boot/boot.ini similarity index 100% rename from board/rockchip/rk3326/boot/boot.ini rename to board/batocera/rockchip/rk3326/boot/boot.ini diff --git a/board/rockchip/rk3326/create-boot-script.sh b/board/batocera/rockchip/rk3326/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3326/create-boot-script.sh rename to board/batocera/rockchip/rk3326/create-boot-script.sh diff --git a/board/rockchip/rk3326/dts/rk3326-gameforce-chi.dts b/board/batocera/rockchip/rk3326/dts/rk3326-gameforce-chi.dts similarity index 100% rename from board/rockchip/rk3326/dts/rk3326-gameforce-chi.dts rename to board/batocera/rockchip/rk3326/dts/rk3326-gameforce-chi.dts diff --git a/board/rockchip/rk3326/fsoverlay/etc/init.d/S32colorbuttonled b/board/batocera/rockchip/rk3326/fsoverlay/etc/init.d/S32colorbuttonled similarity index 100% rename from board/rockchip/rk3326/fsoverlay/etc/init.d/S32colorbuttonled rename to board/batocera/rockchip/rk3326/fsoverlay/etc/init.d/S32colorbuttonled diff --git a/board/rockchip/rk3326/fsoverlay/usr/share/reglinux/configgen/scripts/governor.sh b/board/batocera/rockchip/rk3326/fsoverlay/usr/share/reglinux/configgen/scripts/governor.sh similarity index 100% rename from board/rockchip/rk3326/fsoverlay/usr/share/reglinux/configgen/scripts/governor.sh rename to board/batocera/rockchip/rk3326/fsoverlay/usr/share/reglinux/configgen/scripts/governor.sh diff --git a/board/rockchip/rk3326/genimage.cfg b/board/batocera/rockchip/rk3326/genimage.cfg similarity index 100% rename from board/rockchip/rk3326/genimage.cfg rename to board/batocera/rockchip/rk3326/genimage.cfg diff --git a/board/rockchip/rk3326/linux-defconfig-fragment.config b/board/batocera/rockchip/rk3326/linux-defconfig-fragment.config similarity index 100% rename from board/rockchip/rk3326/linux-defconfig-fragment.config rename to board/batocera/rockchip/rk3326/linux-defconfig-fragment.config diff --git a/board/rockchip/rk3326/linux-defconfig.config b/board/batocera/rockchip/rk3326/linux-defconfig.config similarity index 100% rename from board/rockchip/rk3326/linux-defconfig.config rename to board/batocera/rockchip/rk3326/linux-defconfig.config diff --git a/board/rockchip/rk3326/linux_patches/0000-rename-rk817-battery.patch b/board/batocera/rockchip/rk3326/linux_patches/0000-rename-rk817-battery.patch similarity index 100% rename from board/rockchip/rk3326/linux_patches/0000-rename-rk817-battery.patch rename to board/batocera/rockchip/rk3326/linux_patches/0000-rename-rk817-battery.patch diff --git a/board/rockchip/rk3326/linux_patches/0001-drm-panel-st7703-Add-GameForce-Chi-Panel-Support.patch b/board/batocera/rockchip/rk3326/linux_patches/0001-drm-panel-st7703-Add-GameForce-Chi-Panel-Support.patch similarity index 100% rename from board/rockchip/rk3326/linux_patches/0001-drm-panel-st7703-Add-GameForce-Chi-Panel-Support.patch rename to board/batocera/rockchip/rk3326/linux_patches/0001-drm-panel-st7703-Add-GameForce-Chi-Panel-Support.patch diff --git a/board/rockchip/rk3326/linux_patches/0002-add-input-polldev.patch b/board/batocera/rockchip/rk3326/linux_patches/0002-add-input-polldev.patch similarity index 100% rename from board/rockchip/rk3326/linux_patches/0002-add-input-polldev.patch rename to board/batocera/rockchip/rk3326/linux_patches/0002-add-input-polldev.patch diff --git a/board/rockchip/rk3326/linux_patches/0003-gameforce-joypad.patch b/board/batocera/rockchip/rk3326/linux_patches/0003-gameforce-joypad.patch similarity index 100% rename from board/rockchip/rk3326/linux_patches/0003-gameforce-joypad.patch rename to board/batocera/rockchip/rk3326/linux_patches/0003-gameforce-joypad.patch diff --git a/board/rockchip/rk3326/linux_patches/0004-joypad-device-driver-add-for-odroidgo2.patch b/board/batocera/rockchip/rk3326/linux_patches/0004-joypad-device-driver-add-for-odroidgo2.patch similarity index 100% rename from board/rockchip/rk3326/linux_patches/0004-joypad-device-driver-add-for-odroidgo2.patch rename to board/batocera/rockchip/rk3326/linux_patches/0004-joypad-device-driver-add-for-odroidgo2.patch diff --git a/board/rockchip/rk3326/linux_patches/0005-joypad-device-driver-add-for-odroidgo3.patch b/board/batocera/rockchip/rk3326/linux_patches/0005-joypad-device-driver-add-for-odroidgo3.patch similarity index 100% rename from board/rockchip/rk3326/linux_patches/0005-joypad-device-driver-add-for-odroidgo3.patch rename to board/batocera/rockchip/rk3326/linux_patches/0005-joypad-device-driver-add-for-odroidgo3.patch diff --git a/board/rockchip/rk3326/linux_patches/0006-Add-Anbernic-RG351V.patch b/board/batocera/rockchip/rk3326/linux_patches/0006-Add-Anbernic-RG351V.patch similarity index 100% rename from board/rockchip/rk3326/linux_patches/0006-Add-Anbernic-RG351V.patch rename to board/batocera/rockchip/rk3326/linux_patches/0006-Add-Anbernic-RG351V.patch diff --git a/board/rockchip/rk3326/linux_patches/0007-rk3326-dts-adjustments-odroid-go.patch b/board/batocera/rockchip/rk3326/linux_patches/0007-rk3326-dts-adjustments-odroid-go.patch similarity index 100% rename from board/rockchip/rk3326/linux_patches/0007-rk3326-dts-adjustments-odroid-go.patch rename to board/batocera/rockchip/rk3326/linux_patches/0007-rk3326-dts-adjustments-odroid-go.patch diff --git a/board/rockchip/rk3326/linux_patches/0008-rk3326-dts-adjustments-RG351.patch b/board/batocera/rockchip/rk3326/linux_patches/0008-rk3326-dts-adjustments-RG351.patch similarity index 100% rename from board/rockchip/rk3326/linux_patches/0008-rk3326-dts-adjustments-RG351.patch rename to board/batocera/rockchip/rk3326/linux_patches/0008-rk3326-dts-adjustments-RG351.patch diff --git a/board/rockchip/rk3326/linux_patches/0009-rk3326-fix-sound-from-rg351v.patch b/board/batocera/rockchip/rk3326/linux_patches/0009-rk3326-fix-sound-from-rg351v.patch similarity index 100% rename from board/rockchip/rk3326/linux_patches/0009-rk3326-fix-sound-from-rg351v.patch rename to board/batocera/rockchip/rk3326/linux_patches/0009-rk3326-fix-sound-from-rg351v.patch diff --git a/board/rockchip/rk3326/linux_patches/0010-add-esp8089-kernel-driver.patch b/board/batocera/rockchip/rk3326/linux_patches/0010-add-esp8089-kernel-driver.patch similarity index 100% rename from board/rockchip/rk3326/linux_patches/0010-add-esp8089-kernel-driver.patch rename to board/batocera/rockchip/rk3326/linux_patches/0010-add-esp8089-kernel-driver.patch diff --git a/board/rockchip/rk3326/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch b/board/batocera/rockchip/rk3326/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch similarity index 100% rename from board/rockchip/rk3326/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch rename to board/batocera/rockchip/rk3326/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch diff --git a/board/rockchip/rk3326/patches/alsa-ucm-conf/000-PlaybackVolume.patch b/board/batocera/rockchip/rk3326/patches/alsa-ucm-conf/000-PlaybackVolume.patch similarity index 100% rename from board/rockchip/rk3326/patches/alsa-ucm-conf/000-PlaybackVolume.patch rename to board/batocera/rockchip/rk3326/patches/alsa-ucm-conf/000-PlaybackVolume.patch diff --git a/board/rockchip/rk3326/patches/libretro-yabasanshiro/001-RK3326-to-Makefile.patch b/board/batocera/rockchip/rk3326/patches/libretro-yabasanshiro/001-RK3326-to-Makefile.patch similarity index 100% rename from board/rockchip/rk3326/patches/libretro-yabasanshiro/001-RK3326-to-Makefile.patch rename to board/batocera/rockchip/rk3326/patches/libretro-yabasanshiro/001-RK3326-to-Makefile.patch diff --git a/board/rockchip/rk3326/patches/ppsspp/board-maxwindow.patch b/board/batocera/rockchip/rk3326/patches/ppsspp/board-maxwindow.patch similarity index 100% rename from board/rockchip/rk3326/patches/ppsspp/board-maxwindow.patch rename to board/batocera/rockchip/rk3326/patches/ppsspp/board-maxwindow.patch diff --git a/board/rockchip/rk3328/fsoverlay/usr/bin/cputemp b/board/batocera/rockchip/rk3328/fsoverlay/usr/bin/cputemp similarity index 100% rename from board/rockchip/rk3328/fsoverlay/usr/bin/cputemp rename to board/batocera/rockchip/rk3328/fsoverlay/usr/bin/cputemp diff --git a/board/rockchip/rk3328/fsoverlay/usr/bin/gputemp b/board/batocera/rockchip/rk3328/fsoverlay/usr/bin/gputemp similarity index 100% rename from board/rockchip/rk3328/fsoverlay/usr/bin/gputemp rename to board/batocera/rockchip/rk3328/fsoverlay/usr/bin/gputemp diff --git a/board/rockchip/rk3328/fsoverlay/usr/share/alsa/cards/Analog.conf b/board/batocera/rockchip/rk3328/fsoverlay/usr/share/alsa/cards/Analog.conf similarity index 100% rename from board/rockchip/rk3328/fsoverlay/usr/share/alsa/cards/Analog.conf rename to board/batocera/rockchip/rk3328/fsoverlay/usr/share/alsa/cards/Analog.conf diff --git a/board/rockchip/rk3328/fsoverlay/usr/share/alsa/cards/SPDIF.conf b/board/batocera/rockchip/rk3328/fsoverlay/usr/share/alsa/cards/SPDIF.conf similarity index 100% rename from board/rockchip/rk3328/fsoverlay/usr/share/alsa/cards/SPDIF.conf rename to board/batocera/rockchip/rk3328/fsoverlay/usr/share/alsa/cards/SPDIF.conf diff --git a/board/rockchip/rk3328/fsoverlay/usr/share/alsa/cards/simple-card.conf b/board/batocera/rockchip/rk3328/fsoverlay/usr/share/alsa/cards/simple-card.conf similarity index 100% rename from board/rockchip/rk3328/fsoverlay/usr/share/alsa/cards/simple-card.conf rename to board/batocera/rockchip/rk3328/fsoverlay/usr/share/alsa/cards/simple-card.conf diff --git a/board/rockchip/rk3328/linux-defconfig-fragment.config b/board/batocera/rockchip/rk3328/linux-defconfig-fragment.config similarity index 100% rename from board/rockchip/rk3328/linux-defconfig-fragment.config rename to board/batocera/rockchip/rk3328/linux-defconfig-fragment.config diff --git a/board/rockchip/rk3328/linux-defconfig.config b/board/batocera/rockchip/rk3328/linux-defconfig.config similarity index 100% rename from board/rockchip/rk3328/linux-defconfig.config rename to board/batocera/rockchip/rk3328/linux-defconfig.config diff --git a/board/rockchip/rk3328/linux_patches/linux-0002-rockchip-from-list.patch b/board/batocera/rockchip/rk3328/linux_patches/linux-0002-rockchip-from-list.patch similarity index 100% rename from board/rockchip/rk3328/linux_patches/linux-0002-rockchip-from-list.patch rename to board/batocera/rockchip/rk3328/linux_patches/linux-0002-rockchip-from-list.patch diff --git a/board/rockchip/rk3328/linux_patches/linux-0011-v4l2-from-list.patch b/board/batocera/rockchip/rk3328/linux_patches/linux-0011-v4l2-from-list.patch similarity index 100% rename from board/rockchip/rk3328/linux_patches/linux-0011-v4l2-from-list.patch rename to board/batocera/rockchip/rk3328/linux_patches/linux-0011-v4l2-from-list.patch diff --git a/board/rockchip/rk3328/linux_patches/linux-0020-drm-from-list.patch b/board/batocera/rockchip/rk3328/linux_patches/linux-0020-drm-from-list.patch similarity index 100% rename from board/rockchip/rk3328/linux_patches/linux-0020-drm-from-list.patch rename to board/batocera/rockchip/rk3328/linux_patches/linux-0020-drm-from-list.patch diff --git a/board/rockchip/rk3328/linux_patches/linux-1001-v4l2-rockchip.patch b/board/batocera/rockchip/rk3328/linux_patches/linux-1001-v4l2-rockchip.patch similarity index 100% rename from board/rockchip/rk3328/linux_patches/linux-1001-v4l2-rockchip.patch rename to board/batocera/rockchip/rk3328/linux_patches/linux-1001-v4l2-rockchip.patch diff --git a/board/rockchip/rk3328/linux_patches/linux-1002-for-libreelec.patch b/board/batocera/rockchip/rk3328/linux_patches/linux-1002-for-libreelec.patch similarity index 100% rename from board/rockchip/rk3328/linux_patches/linux-1002-for-libreelec.patch rename to board/batocera/rockchip/rk3328/linux_patches/linux-1002-for-libreelec.patch diff --git a/board/rockchip/rk3328/linux_patches/linux-2000-v4l2-wip-rkvdec-hevc.patch b/board/batocera/rockchip/rk3328/linux_patches/linux-2000-v4l2-wip-rkvdec-hevc.patch similarity index 100% rename from board/rockchip/rk3328/linux_patches/linux-2000-v4l2-wip-rkvdec-hevc.patch rename to board/batocera/rockchip/rk3328/linux_patches/linux-2000-v4l2-wip-rkvdec-hevc.patch diff --git a/board/rockchip/rk3328/linux_patches/linux-2001-v4l2-wip-iep-driver.patch b/board/batocera/rockchip/rk3328/linux_patches/linux-2001-v4l2-wip-iep-driver.patch similarity index 100% rename from board/rockchip/rk3328/linux_patches/linux-2001-v4l2-wip-iep-driver.patch rename to board/batocera/rockchip/rk3328/linux_patches/linux-2001-v4l2-wip-iep-driver.patch diff --git a/board/rockchip/rk3328/linux_patches/linux-rockchip-Enable-4K-60Hz-mode-on-RK3228-RK3328-RK3399-and-RK356x.patch b/board/batocera/rockchip/rk3328/linux_patches/linux-rockchip-Enable-4K-60Hz-mode-on-RK3228-RK3328-RK3399-and-RK356x.patch similarity index 100% rename from board/rockchip/rk3328/linux_patches/linux-rockchip-Enable-4K-60Hz-mode-on-RK3228-RK3328-RK3399-and-RK356x.patch rename to board/batocera/rockchip/rk3328/linux_patches/linux-rockchip-Enable-4K-60Hz-mode-on-RK3228-RK3328-RK3399-and-RK356x.patch diff --git a/board/rockchip/rk3328/linux_patches/linux-sdmmc-sdio-emmc-improvements-for-RK3328.patch b/board/batocera/rockchip/rk3328/linux_patches/linux-sdmmc-sdio-emmc-improvements-for-RK3328.patch similarity index 100% rename from board/rockchip/rk3328/linux_patches/linux-sdmmc-sdio-emmc-improvements-for-RK3328.patch rename to board/batocera/rockchip/rk3328/linux_patches/linux-sdmmc-sdio-emmc-improvements-for-RK3328.patch diff --git a/board/rockchip/rk3328/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch b/board/batocera/rockchip/rk3328/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch similarity index 100% rename from board/rockchip/rk3328/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch rename to board/batocera/rockchip/rk3328/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch diff --git a/board/rockchip/rk3328/renegade/boot/extlinux.conf b/board/batocera/rockchip/rk3328/renegade/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3328/renegade/boot/extlinux.conf rename to board/batocera/rockchip/rk3328/renegade/boot/extlinux.conf diff --git a/board/rockchip/rk3328/renegade/create-boot-script.sh b/board/batocera/rockchip/rk3328/renegade/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3328/renegade/create-boot-script.sh rename to board/batocera/rockchip/rk3328/renegade/create-boot-script.sh diff --git a/board/rockchip/rk3328/renegade/genimage.cfg b/board/batocera/rockchip/rk3328/renegade/genimage.cfg similarity index 100% rename from board/rockchip/rk3328/renegade/genimage.cfg rename to board/batocera/rockchip/rk3328/renegade/genimage.cfg diff --git a/board/rockchip/rk3328/rock64/boot/extlinux.conf b/board/batocera/rockchip/rk3328/rock64/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3328/rock64/boot/extlinux.conf rename to board/batocera/rockchip/rk3328/rock64/boot/extlinux.conf diff --git a/board/rockchip/rk3328/rock64/create-boot-script.sh b/board/batocera/rockchip/rk3328/rock64/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3328/rock64/create-boot-script.sh rename to board/batocera/rockchip/rk3328/rock64/create-boot-script.sh diff --git a/board/rockchip/rk3328/rock64/genimage.cfg b/board/batocera/rockchip/rk3328/rock64/genimage.cfg similarity index 100% rename from board/rockchip/rk3328/rock64/genimage.cfg rename to board/batocera/rockchip/rk3328/rock64/genimage.cfg diff --git a/board/rockchip/rk3399/anbernic-rg552/boot/extlinux.conf b/board/batocera/rockchip/rk3399/anbernic-rg552/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3399/anbernic-rg552/boot/extlinux.conf rename to board/batocera/rockchip/rk3399/anbernic-rg552/boot/extlinux.conf diff --git a/board/rockchip/rk3399/anbernic-rg552/create-boot-script.sh b/board/batocera/rockchip/rk3399/anbernic-rg552/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3399/anbernic-rg552/create-boot-script.sh rename to board/batocera/rockchip/rk3399/anbernic-rg552/create-boot-script.sh diff --git a/board/rockchip/rk3399/anbernic-rg552/genimage.cfg b/board/batocera/rockchip/rk3399/anbernic-rg552/genimage.cfg similarity index 100% rename from board/rockchip/rk3399/anbernic-rg552/genimage.cfg rename to board/batocera/rockchip/rk3399/anbernic-rg552/genimage.cfg diff --git a/board/rockchip/rk3399/dts/rk3399-anbernic-rg552.dts b/board/batocera/rockchip/rk3399/dts/rk3399-anbernic-rg552.dts similarity index 100% rename from board/rockchip/rk3399/dts/rk3399-anbernic-rg552.dts rename to board/batocera/rockchip/rk3399/dts/rk3399-anbernic-rg552.dts diff --git a/board/rockchip/rk3399/dts/rk3399-nanopi-m4v2.dts b/board/batocera/rockchip/rk3399/dts/rk3399-nanopi-m4v2.dts similarity index 100% rename from board/rockchip/rk3399/dts/rk3399-nanopi-m4v2.dts rename to board/batocera/rockchip/rk3399/dts/rk3399-nanopi-m4v2.dts diff --git a/board/rockchip/rk3399/dts/rk3399-orangepi-4-lts.dts b/board/batocera/rockchip/rk3399/dts/rk3399-orangepi-4-lts.dts similarity index 100% rename from board/rockchip/rk3399/dts/rk3399-orangepi-4-lts.dts rename to board/batocera/rockchip/rk3399/dts/rk3399-orangepi-4-lts.dts diff --git a/board/rockchip/rk3399/dts/rk3399-orangepi-800.dts b/board/batocera/rockchip/rk3399/dts/rk3399-orangepi-800.dts similarity index 100% rename from board/rockchip/rk3399/dts/rk3399-orangepi-800.dts rename to board/batocera/rockchip/rk3399/dts/rk3399-orangepi-800.dts diff --git a/board/rockchip/rk3399/dts/rk3399-tinker-2.dts b/board/batocera/rockchip/rk3399/dts/rk3399-tinker-2.dts similarity index 100% rename from board/rockchip/rk3399/dts/rk3399-tinker-2.dts rename to board/batocera/rockchip/rk3399/dts/rk3399-tinker-2.dts diff --git a/board/rockchip/rk3399/fsoverlay/etc/init.d/S02fan b/board/batocera/rockchip/rk3399/fsoverlay/etc/init.d/S02fan similarity index 100% rename from board/rockchip/rk3399/fsoverlay/etc/init.d/S02fan rename to board/batocera/rockchip/rk3399/fsoverlay/etc/init.d/S02fan diff --git a/board/rockchip/rk3399/fsoverlay/etc/init.d/S02overclock b/board/batocera/rockchip/rk3399/fsoverlay/etc/init.d/S02overclock similarity index 100% rename from board/rockchip/rk3399/fsoverlay/etc/init.d/S02overclock rename to board/batocera/rockchip/rk3399/fsoverlay/etc/init.d/S02overclock diff --git a/board/rockchip/rk3399/fsoverlay/etc/init.d/S09gpiohdmi b/board/batocera/rockchip/rk3399/fsoverlay/etc/init.d/S09gpiohdmi similarity index 100% rename from board/rockchip/rk3399/fsoverlay/etc/init.d/S09gpiohdmi rename to board/batocera/rockchip/rk3399/fsoverlay/etc/init.d/S09gpiohdmi diff --git a/board/rockchip/rk3399/fsoverlay/etc/init.d/S31uwe5622 b/board/batocera/rockchip/rk3399/fsoverlay/etc/init.d/S31uwe5622 similarity index 100% rename from board/rockchip/rk3399/fsoverlay/etc/init.d/S31uwe5622 rename to board/batocera/rockchip/rk3399/fsoverlay/etc/init.d/S31uwe5622 diff --git a/board/rockchip/rk3399/fsoverlay/etc/init.d/S33checkhdmi b/board/batocera/rockchip/rk3399/fsoverlay/etc/init.d/S33checkhdmi similarity index 100% rename from board/rockchip/rk3399/fsoverlay/etc/init.d/S33checkhdmi rename to board/batocera/rockchip/rk3399/fsoverlay/etc/init.d/S33checkhdmi diff --git a/board/rockchip/rk3399/fsoverlay/etc/init.d/S49reloadwifi b/board/batocera/rockchip/rk3399/fsoverlay/etc/init.d/S49reloadwifi similarity index 100% rename from board/rockchip/rk3399/fsoverlay/etc/init.d/S49reloadwifi rename to board/batocera/rockchip/rk3399/fsoverlay/etc/init.d/S49reloadwifi diff --git a/board/rockchip/rk3399/fsoverlay/etc/udev/rules.d/99-rg552-keypad.rules b/board/batocera/rockchip/rk3399/fsoverlay/etc/udev/rules.d/99-rg552-keypad.rules similarity index 100% rename from board/rockchip/rk3399/fsoverlay/etc/udev/rules.d/99-rg552-keypad.rules rename to board/batocera/rockchip/rk3399/fsoverlay/etc/udev/rules.d/99-rg552-keypad.rules diff --git a/board/rockchip/rk3399/fsoverlay/lib/firmware/bt_configure_pskey.ini b/board/batocera/rockchip/rk3399/fsoverlay/lib/firmware/bt_configure_pskey.ini similarity index 100% rename from board/rockchip/rk3399/fsoverlay/lib/firmware/bt_configure_pskey.ini rename to board/batocera/rockchip/rk3399/fsoverlay/lib/firmware/bt_configure_pskey.ini diff --git a/board/rockchip/rk3399/fsoverlay/lib/firmware/bt_configure_rf.ini b/board/batocera/rockchip/rk3399/fsoverlay/lib/firmware/bt_configure_rf.ini similarity index 100% rename from board/rockchip/rk3399/fsoverlay/lib/firmware/bt_configure_rf.ini rename to board/batocera/rockchip/rk3399/fsoverlay/lib/firmware/bt_configure_rf.ini diff --git a/board/rockchip/rk3399/fsoverlay/lib/firmware/uwe5622/wcnmodem-38222.bin b/board/batocera/rockchip/rk3399/fsoverlay/lib/firmware/uwe5622/wcnmodem-38222.bin similarity index 100% rename from board/rockchip/rk3399/fsoverlay/lib/firmware/uwe5622/wcnmodem-38222.bin rename to board/batocera/rockchip/rk3399/fsoverlay/lib/firmware/uwe5622/wcnmodem-38222.bin diff --git a/board/rockchip/rk3399/fsoverlay/lib/firmware/uwe5622/wcnmodem.bin b/board/batocera/rockchip/rk3399/fsoverlay/lib/firmware/uwe5622/wcnmodem.bin similarity index 100% rename from board/rockchip/rk3399/fsoverlay/lib/firmware/uwe5622/wcnmodem.bin rename to board/batocera/rockchip/rk3399/fsoverlay/lib/firmware/uwe5622/wcnmodem.bin diff --git a/board/rockchip/rk3399/fsoverlay/lib/firmware/uwe5622/wifi_2355b001_1ant.ini b/board/batocera/rockchip/rk3399/fsoverlay/lib/firmware/uwe5622/wifi_2355b001_1ant.ini similarity index 100% rename from board/rockchip/rk3399/fsoverlay/lib/firmware/uwe5622/wifi_2355b001_1ant.ini rename to board/batocera/rockchip/rk3399/fsoverlay/lib/firmware/uwe5622/wifi_2355b001_1ant.ini diff --git a/board/rockchip/rk3399/fsoverlay/lib/firmware/wcnmodem.bin b/board/batocera/rockchip/rk3399/fsoverlay/lib/firmware/wcnmodem.bin similarity index 100% rename from board/rockchip/rk3399/fsoverlay/lib/firmware/wcnmodem.bin rename to board/batocera/rockchip/rk3399/fsoverlay/lib/firmware/wcnmodem.bin diff --git a/board/rockchip/rk3399/fsoverlay/lib/firmware/wifi_2355b001_1ant.ini b/board/batocera/rockchip/rk3399/fsoverlay/lib/firmware/wifi_2355b001_1ant.ini similarity index 100% rename from board/rockchip/rk3399/fsoverlay/lib/firmware/wifi_2355b001_1ant.ini rename to board/batocera/rockchip/rk3399/fsoverlay/lib/firmware/wifi_2355b001_1ant.ini diff --git a/board/rockchip/rk3399/fsoverlay/usr/bin/batocera-check-hdmi b/board/batocera/rockchip/rk3399/fsoverlay/usr/bin/batocera-check-hdmi similarity index 100% rename from board/rockchip/rk3399/fsoverlay/usr/bin/batocera-check-hdmi rename to board/batocera/rockchip/rk3399/fsoverlay/usr/bin/batocera-check-hdmi diff --git a/board/rockchip/rk3399/fsoverlay/usr/bin/cputemp b/board/batocera/rockchip/rk3399/fsoverlay/usr/bin/cputemp similarity index 100% rename from board/rockchip/rk3399/fsoverlay/usr/bin/cputemp rename to board/batocera/rockchip/rk3399/fsoverlay/usr/bin/cputemp diff --git a/board/rockchip/rk3399/fsoverlay/usr/bin/gputemp b/board/batocera/rockchip/rk3399/fsoverlay/usr/bin/gputemp similarity index 100% rename from board/rockchip/rk3399/fsoverlay/usr/bin/gputemp rename to board/batocera/rockchip/rk3399/fsoverlay/usr/bin/gputemp diff --git a/board/rockchip/rk3399/fsoverlay/usr/bin/hciattach_opi b/board/batocera/rockchip/rk3399/fsoverlay/usr/bin/hciattach_opi similarity index 100% rename from board/rockchip/rk3399/fsoverlay/usr/bin/hciattach_opi rename to board/batocera/rockchip/rk3399/fsoverlay/usr/bin/hciattach_opi diff --git a/board/rockchip/rk3399/fsoverlay/usr/share/alsa/cards/Analog.conf b/board/batocera/rockchip/rk3399/fsoverlay/usr/share/alsa/cards/Analog.conf similarity index 100% rename from board/rockchip/rk3399/fsoverlay/usr/share/alsa/cards/Analog.conf rename to board/batocera/rockchip/rk3399/fsoverlay/usr/share/alsa/cards/Analog.conf diff --git a/board/rockchip/rk3399/fsoverlay/usr/share/alsa/cards/SPDIF.conf b/board/batocera/rockchip/rk3399/fsoverlay/usr/share/alsa/cards/SPDIF.conf similarity index 100% rename from board/rockchip/rk3399/fsoverlay/usr/share/alsa/cards/SPDIF.conf rename to board/batocera/rockchip/rk3399/fsoverlay/usr/share/alsa/cards/SPDIF.conf diff --git a/board/rockchip/rk3399/fsoverlay/usr/share/alsa/cards/simple-card.conf b/board/batocera/rockchip/rk3399/fsoverlay/usr/share/alsa/cards/simple-card.conf similarity index 100% rename from board/rockchip/rk3399/fsoverlay/usr/share/alsa/cards/simple-card.conf rename to board/batocera/rockchip/rk3399/fsoverlay/usr/share/alsa/cards/simple-card.conf diff --git a/board/rockchip/rk3399/hugsun-x99/boot/extlinux.conf b/board/batocera/rockchip/rk3399/hugsun-x99/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3399/hugsun-x99/boot/extlinux.conf rename to board/batocera/rockchip/rk3399/hugsun-x99/boot/extlinux.conf diff --git a/board/rockchip/rk3399/hugsun-x99/create-boot-script.sh b/board/batocera/rockchip/rk3399/hugsun-x99/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3399/hugsun-x99/create-boot-script.sh rename to board/batocera/rockchip/rk3399/hugsun-x99/create-boot-script.sh diff --git a/board/rockchip/rk3399/hugsun-x99/genimage.cfg b/board/batocera/rockchip/rk3399/hugsun-x99/genimage.cfg similarity index 100% rename from board/rockchip/rk3399/hugsun-x99/genimage.cfg rename to board/batocera/rockchip/rk3399/hugsun-x99/genimage.cfg diff --git a/board/rockchip/rk3399/linux-defconfig-fragment.config b/board/batocera/rockchip/rk3399/linux-defconfig-fragment.config similarity index 100% rename from board/rockchip/rk3399/linux-defconfig-fragment.config rename to board/batocera/rockchip/rk3399/linux-defconfig-fragment.config diff --git a/board/rockchip/rk3399/linux-defconfig.config b/board/batocera/rockchip/rk3399/linux-defconfig.config similarity index 100% rename from board/rockchip/rk3399/linux-defconfig.config rename to board/batocera/rockchip/rk3399/linux-defconfig.config diff --git a/board/rockchip/rk3399/linux_patches/batocera-add-opi800-yaml.patch b/board/batocera/rockchip/rk3399/linux_patches/batocera-add-opi800-yaml.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/batocera-add-opi800-yaml.patch rename to board/batocera/rockchip/rk3399/linux_patches/batocera-add-opi800-yaml.patch diff --git a/board/rockchip/rk3399/linux_patches/batocera-add-uwe5622-driver.patch b/board/batocera/rockchip/rk3399/linux_patches/batocera-add-uwe5622-driver.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/batocera-add-uwe5622-driver.patch rename to board/batocera/rockchip/rk3399/linux_patches/batocera-add-uwe5622-driver.patch diff --git a/board/rockchip/rk3399/linux_patches/batocera-limit-vop-allowed-modes.patch b/board/batocera/rockchip/rk3399/linux_patches/batocera-limit-vop-allowed-modes.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/batocera-limit-vop-allowed-modes.patch rename to board/batocera/rockchip/rk3399/linux_patches/batocera-limit-vop-allowed-modes.patch diff --git a/board/rockchip/rk3399/linux_patches/board-nanopi-m4v2-dts-add-sound-card.patch b/board/batocera/rockchip/rk3399/linux_patches/board-nanopi-m4v2-dts-add-sound-card.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/board-nanopi-m4v2-dts-add-sound-card.patch rename to board/batocera/rockchip/rk3399/linux_patches/board-nanopi-m4v2-dts-add-sound-card.patch diff --git a/board/rockchip/rk3399/linux_patches/board-pbp-add-dp-alt-mode.patch b/board/batocera/rockchip/rk3399/linux_patches/board-pbp-add-dp-alt-mode.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/board-pbp-add-dp-alt-mode.patch rename to board/batocera/rockchip/rk3399/linux_patches/board-pbp-add-dp-alt-mode.patch diff --git a/board/rockchip/rk3399/linux_patches/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch b/board/batocera/rockchip/rk3399/linux_patches/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch rename to board/batocera/rockchip/rk3399/linux_patches/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch diff --git a/board/rockchip/rk3399/linux_patches/board-rockpro64-change-rx_delay-for-gmac.patch b/board/batocera/rockchip/rk3399/linux_patches/board-rockpro64-change-rx_delay-for-gmac.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/board-rockpro64-change-rx_delay-for-gmac.patch rename to board/batocera/rockchip/rk3399/linux_patches/board-rockpro64-change-rx_delay-for-gmac.patch diff --git a/board/rockchip/rk3399/linux_patches/board-rockpro64-fix-emmc.patch b/board/batocera/rockchip/rk3399/linux_patches/board-rockpro64-fix-emmc.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/board-rockpro64-fix-emmc.patch rename to board/batocera/rockchip/rk3399/linux_patches/board-rockpro64-fix-emmc.patch diff --git a/board/rockchip/rk3399/linux_patches/board-rockpro64-fix-spi1-flash-speed.patch b/board/batocera/rockchip/rk3399/linux_patches/board-rockpro64-fix-spi1-flash-speed.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/board-rockpro64-fix-spi1-flash-speed.patch rename to board/batocera/rockchip/rk3399/linux_patches/board-rockpro64-fix-spi1-flash-speed.patch diff --git a/board/rockchip/rk3399/linux_patches/board-rockpro64-work-led-heartbeat.patch b/board/batocera/rockchip/rk3399/linux_patches/board-rockpro64-work-led-heartbeat.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/board-rockpro64-work-led-heartbeat.patch rename to board/batocera/rockchip/rk3399/linux_patches/board-rockpro64-work-led-heartbeat.patch diff --git a/board/rockchip/rk3399/linux_patches/disable/manjaro-1003-drm-bridge-analogix_dp-Add-enable_psr-param.patch b/board/batocera/rockchip/rk3399/linux_patches/disable/manjaro-1003-drm-bridge-analogix_dp-Add-enable_psr-param.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/disable/manjaro-1003-drm-bridge-analogix_dp-Add-enable_psr-param.patch rename to board/batocera/rockchip/rk3399/linux_patches/disable/manjaro-1003-drm-bridge-analogix_dp-Add-enable_psr-param.patch diff --git a/board/rockchip/rk3399/linux_patches/disable/manjaro-1007-rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch b/board/batocera/rockchip/rk3399/linux_patches/disable/manjaro-1007-rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/disable/manjaro-1007-rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch rename to board/batocera/rockchip/rk3399/linux_patches/disable/manjaro-1007-rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch diff --git a/board/rockchip/rk3399/linux_patches/disable/manjaro-1011-drm-panfrost-scheduler-improvements.patch b/board/batocera/rockchip/rk3399/linux_patches/disable/manjaro-1011-drm-panfrost-scheduler-improvements.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/disable/manjaro-1011-drm-panfrost-scheduler-improvements.patch rename to board/batocera/rockchip/rk3399/linux_patches/disable/manjaro-1011-drm-panfrost-scheduler-improvements.patch diff --git a/board/rockchip/rk3399/linux_patches/disable/manjaro-4007-drm-rockchip-analogix_dp-Accept-drm_of_find_panel_or.patch b/board/batocera/rockchip/rk3399/linux_patches/disable/manjaro-4007-drm-rockchip-analogix_dp-Accept-drm_of_find_panel_or.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/disable/manjaro-4007-drm-rockchip-analogix_dp-Accept-drm_of_find_panel_or.patch rename to board/batocera/rockchip/rk3399/linux_patches/disable/manjaro-4007-drm-rockchip-analogix_dp-Accept-drm_of_find_panel_or.patch diff --git a/board/rockchip/rk3399/linux_patches/disable/manjaro-4008-drm-rockchip-analogix_dp-Fix-AUX-CH-enable-timeout.patch b/board/batocera/rockchip/rk3399/linux_patches/disable/manjaro-4008-drm-rockchip-analogix_dp-Fix-AUX-CH-enable-timeout.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/disable/manjaro-4008-drm-rockchip-analogix_dp-Fix-AUX-CH-enable-timeout.patch rename to board/batocera/rockchip/rk3399/linux_patches/disable/manjaro-4008-drm-rockchip-analogix_dp-Fix-AUX-CH-enable-timeout.patch diff --git a/board/rockchip/rk3399/linux_patches/disable/manjaro-4009-drm-bridge-analogix_dp-Fix-hpd-handling.patch b/board/batocera/rockchip/rk3399/linux_patches/disable/manjaro-4009-drm-bridge-analogix_dp-Fix-hpd-handling.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/disable/manjaro-4009-drm-bridge-analogix_dp-Fix-hpd-handling.patch rename to board/batocera/rockchip/rk3399/linux_patches/disable/manjaro-4009-drm-bridge-analogix_dp-Fix-hpd-handling.patch diff --git a/board/rockchip/rk3399/linux_patches/disable/manjaro-4021-drm-bridge-synopsys-dw_hdmi-Filter-bad-resolution.patch b/board/batocera/rockchip/rk3399/linux_patches/disable/manjaro-4021-drm-bridge-synopsys-dw_hdmi-Filter-bad-resolution.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/disable/manjaro-4021-drm-bridge-synopsys-dw_hdmi-Filter-bad-resolution.patch rename to board/batocera/rockchip/rk3399/linux_patches/disable/manjaro-4021-drm-bridge-synopsys-dw_hdmi-Filter-bad-resolution.patch diff --git a/board/rockchip/rk3399/linux_patches/drv-spi-spidev-remove-warnings.patch b/board/batocera/rockchip/rk3399/linux_patches/drv-spi-spidev-remove-warnings.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/drv-spi-spidev-remove-warnings.patch rename to board/batocera/rockchip/rk3399/linux_patches/drv-spi-spidev-remove-warnings.patch diff --git a/board/rockchip/rk3399/linux_patches/general-add-miniDP-dt-doc.patch b/board/batocera/rockchip/rk3399/linux_patches/general-add-miniDP-dt-doc.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/general-add-miniDP-dt-doc.patch rename to board/batocera/rockchip/rk3399/linux_patches/general-add-miniDP-dt-doc.patch diff --git a/board/rockchip/rk3399/linux_patches/general-add-miniDP-virtual-extcon.patch b/board/batocera/rockchip/rk3399/linux_patches/general-add-miniDP-virtual-extcon.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/general-add-miniDP-virtual-extcon.patch rename to board/batocera/rockchip/rk3399/linux_patches/general-add-miniDP-virtual-extcon.patch diff --git a/board/rockchip/rk3399/linux_patches/general-add-pll-hdmi-timings.patch b/board/batocera/rockchip/rk3399/linux_patches/general-add-pll-hdmi-timings.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/general-add-pll-hdmi-timings.patch rename to board/batocera/rockchip/rk3399/linux_patches/general-add-pll-hdmi-timings.patch diff --git a/board/rockchip/rk3399/linux_patches/general-add-xtx-spi-nor-chips.patch b/board/batocera/rockchip/rk3399/linux_patches/general-add-xtx-spi-nor-chips.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/general-add-xtx-spi-nor-chips.patch rename to board/batocera/rockchip/rk3399/linux_patches/general-add-xtx-spi-nor-chips.patch diff --git a/board/rockchip/rk3399/linux_patches/general-cryptov1-trng.patch b/board/batocera/rockchip/rk3399/linux_patches/general-cryptov1-trng.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/general-cryptov1-trng.patch rename to board/batocera/rockchip/rk3399/linux_patches/general-cryptov1-trng.patch diff --git a/board/rockchip/rk3399/linux_patches/general-disable-mtu-validation.patch b/board/batocera/rockchip/rk3399/linux_patches/general-disable-mtu-validation.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/general-disable-mtu-validation.patch rename to board/batocera/rockchip/rk3399/linux_patches/general-disable-mtu-validation.patch diff --git a/board/rockchip/rk3399/linux_patches/general-fix-es8316-kernel-panic.patch b/board/batocera/rockchip/rk3399/linux_patches/general-fix-es8316-kernel-panic.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/general-fix-es8316-kernel-panic.patch rename to board/batocera/rockchip/rk3399/linux_patches/general-fix-es8316-kernel-panic.patch diff --git a/board/rockchip/rk3399/linux_patches/general-fix-inno-usb2-phy-init.patch b/board/batocera/rockchip/rk3399/linux_patches/general-fix-inno-usb2-phy-init.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/general-fix-inno-usb2-phy-init.patch rename to board/batocera/rockchip/rk3399/linux_patches/general-fix-inno-usb2-phy-init.patch diff --git a/board/rockchip/rk3399/linux_patches/general-fix-mmc-signal-voltage-before-reboot.patch b/board/batocera/rockchip/rk3399/linux_patches/general-fix-mmc-signal-voltage-before-reboot.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/general-fix-mmc-signal-voltage-before-reboot.patch rename to board/batocera/rockchip/rk3399/linux_patches/general-fix-mmc-signal-voltage-before-reboot.patch diff --git a/board/rockchip/rk3399/linux_patches/general-increasing_DMA_block_memory_allocation_to_2048.patch b/board/batocera/rockchip/rk3399/linux_patches/general-increasing_DMA_block_memory_allocation_to_2048.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/general-increasing_DMA_block_memory_allocation_to_2048.patch rename to board/batocera/rockchip/rk3399/linux_patches/general-increasing_DMA_block_memory_allocation_to_2048.patch diff --git a/board/rockchip/rk3399/linux_patches/general-possibility-of-disabling-rk808-rtc.patch b/board/batocera/rockchip/rk3399/linux_patches/general-possibility-of-disabling-rk808-rtc.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/general-possibility-of-disabling-rk808-rtc.patch rename to board/batocera/rockchip/rk3399/linux_patches/general-possibility-of-disabling-rk808-rtc.patch diff --git a/board/rockchip/rk3399/linux_patches/general-rk808-configurable-switch-voltage-steps.patch b/board/batocera/rockchip/rk3399/linux_patches/general-rk808-configurable-switch-voltage-steps.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/general-rk808-configurable-switch-voltage-steps.patch rename to board/batocera/rockchip/rk3399/linux_patches/general-rk808-configurable-switch-voltage-steps.patch diff --git a/board/rockchip/rk3399/linux_patches/general-rt5651-add-mclk.patch b/board/batocera/rockchip/rk3399/linux_patches/general-rt5651-add-mclk.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/general-rt5651-add-mclk.patch rename to board/batocera/rockchip/rk3399/linux_patches/general-rt5651-add-mclk.patch diff --git a/board/rockchip/rk3399/linux_patches/general-v4l2-iep-driver.patch b/board/batocera/rockchip/rk3399/linux_patches/general-v4l2-iep-driver.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/general-v4l2-iep-driver.patch rename to board/batocera/rockchip/rk3399/linux_patches/general-v4l2-iep-driver.patch diff --git a/board/rockchip/rk3399/linux_patches/general-v4l2-rkvdec-00-fixes.patch b/board/batocera/rockchip/rk3399/linux_patches/general-v4l2-rkvdec-00-fixes.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/general-v4l2-rkvdec-00-fixes.patch rename to board/batocera/rockchip/rk3399/linux_patches/general-v4l2-rkvdec-00-fixes.patch diff --git a/board/rockchip/rk3399/linux_patches/general-v4l2-rkvdec-01-vp9.patch b/board/batocera/rockchip/rk3399/linux_patches/general-v4l2-rkvdec-01-vp9.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/general-v4l2-rkvdec-01-vp9.patch rename to board/batocera/rockchip/rk3399/linux_patches/general-v4l2-rkvdec-01-vp9.patch diff --git a/board/rockchip/rk3399/linux_patches/general-v4l2-rkvdec-02-hevc.patch b/board/batocera/rockchip/rk3399/linux_patches/general-v4l2-rkvdec-02-hevc.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/general-v4l2-rkvdec-02-hevc.patch rename to board/batocera/rockchip/rk3399/linux_patches/general-v4l2-rkvdec-02-hevc.patch diff --git a/board/rockchip/rk3399/linux_patches/general-workaround-broadcom-bt-serdev.patch b/board/batocera/rockchip/rk3399/linux_patches/general-workaround-broadcom-bt-serdev.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/general-workaround-broadcom-bt-serdev.patch rename to board/batocera/rockchip/rk3399/linux_patches/general-workaround-broadcom-bt-serdev.patch diff --git a/board/rockchip/rk3399/linux_patches/linux-0000-drivers-gpu-drm-panel-add-rg552-s-panel.patch b/board/batocera/rockchip/rk3399/linux_patches/linux-0000-drivers-gpu-drm-panel-add-rg552-s-panel.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/linux-0000-drivers-gpu-drm-panel-add-rg552-s-panel.patch rename to board/batocera/rockchip/rk3399/linux_patches/linux-0000-drivers-gpu-drm-panel-add-rg552-s-panel.patch diff --git a/board/rockchip/rk3399/linux_patches/linux-0001-add-input-polldev.patch b/board/batocera/rockchip/rk3399/linux_patches/linux-0001-add-input-polldev.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/linux-0001-add-input-polldev.patch rename to board/batocera/rockchip/rk3399/linux_patches/linux-0001-add-input-polldev.patch diff --git a/board/rockchip/rk3399/linux_patches/linux-0002-drivers-add-rg552-singleadcjoy.patch b/board/batocera/rockchip/rk3399/linux_patches/linux-0002-drivers-add-rg552-singleadcjoy.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/linux-0002-drivers-add-rg552-singleadcjoy.patch rename to board/batocera/rockchip/rk3399/linux_patches/linux-0002-drivers-add-rg552-singleadcjoy.patch diff --git a/board/rockchip/rk3399/linux_patches/linux-0003-rename_cw2015_battery.patch b/board/batocera/rockchip/rk3399/linux_patches/linux-0003-rename_cw2015_battery.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/linux-0003-rename_cw2015_battery.patch rename to board/batocera/rockchip/rk3399/linux_patches/linux-0003-rename_cw2015_battery.patch diff --git a/board/rockchip/rk3399/linux_patches/linux-0004-adc-revert.patch b/board/batocera/rockchip/rk3399/linux_patches/linux-0004-adc-revert.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/linux-0004-adc-revert.patch rename to board/batocera/rockchip/rk3399/linux_patches/linux-0004-adc-revert.patch diff --git a/board/rockchip/rk3399/linux_patches/linux-0014-fix-uwe5622-park-link-policy.patch b/board/batocera/rockchip/rk3399/linux_patches/linux-0014-fix-uwe5622-park-link-policy.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/linux-0014-fix-uwe5622-park-link-policy.patch rename to board/batocera/rockchip/rk3399/linux_patches/linux-0014-fix-uwe5622-park-link-policy.patch diff --git a/board/rockchip/rk3399/linux_patches/linux-battery-quircks.patch b/board/batocera/rockchip/rk3399/linux_patches/linux-battery-quircks.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/linux-battery-quircks.patch rename to board/batocera/rockchip/rk3399/linux_patches/linux-battery-quircks.patch diff --git a/board/rockchip/rk3399/linux_patches/linux-usbhid-quircks.patch b/board/batocera/rockchip/rk3399/linux_patches/linux-usbhid-quircks.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/linux-usbhid-quircks.patch rename to board/batocera/rockchip/rk3399/linux_patches/linux-usbhid-quircks.patch diff --git a/board/rockchip/rk3399/linux_patches/linux-wiimote-abs-not-hat.patch b/board/batocera/rockchip/rk3399/linux_patches/linux-wiimote-abs-not-hat.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/linux-wiimote-abs-not-hat.patch rename to board/batocera/rockchip/rk3399/linux_patches/linux-wiimote-abs-not-hat.patch diff --git a/board/rockchip/rk3399/linux_patches/manjaro-1005-panfrost-Silence-Panfrost-gem-shrinker-loggin.patch b/board/batocera/rockchip/rk3399/linux_patches/manjaro-1005-panfrost-Silence-Panfrost-gem-shrinker-loggin.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/manjaro-1005-panfrost-Silence-Panfrost-gem-shrinker-loggin.patch rename to board/batocera/rockchip/rk3399/linux_patches/manjaro-1005-panfrost-Silence-Panfrost-gem-shrinker-loggin.patch diff --git a/board/rockchip/rk3399/linux_patches/media-0001-dma-mapping-let-dma_alloc_noncontiguous-allow-DMA_AT.patch b/board/batocera/rockchip/rk3399/linux_patches/media-0001-dma-mapping-let-dma_alloc_noncontiguous-allow-DMA_AT.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/media-0001-dma-mapping-let-dma_alloc_noncontiguous-allow-DMA_AT.patch rename to board/batocera/rockchip/rk3399/linux_patches/media-0001-dma-mapping-let-dma_alloc_noncontiguous-allow-DMA_AT.patch diff --git a/board/rockchip/rk3399/linux_patches/media-0002-Enable-non-coherent-dst-bufs-for-Hantro-V4L2-driver.patch b/board/batocera/rockchip/rk3399/linux_patches/media-0002-Enable-non-coherent-dst-bufs-for-Hantro-V4L2-driver.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/media-0002-Enable-non-coherent-dst-bufs-for-Hantro-V4L2-driver.patch rename to board/batocera/rockchip/rk3399/linux_patches/media-0002-Enable-non-coherent-dst-bufs-for-Hantro-V4L2-driver.patch diff --git a/board/rockchip/rk3399/linux_patches/media-0003-Enable-non-coherent-dst-bufs-for-Rkvdec-V4L2-driver.patch b/board/batocera/rockchip/rk3399/linux_patches/media-0003-Enable-non-coherent-dst-bufs-for-Rkvdec-V4L2-driver.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/media-0003-Enable-non-coherent-dst-bufs-for-Rkvdec-V4L2-driver.patch rename to board/batocera/rockchip/rk3399/linux_patches/media-0003-Enable-non-coherent-dst-bufs-for-Rkvdec-V4L2-driver.patch diff --git a/board/rockchip/rk3399/linux_patches/net-usb-r8152-add-LED-configuration-from-OF.patch b/board/batocera/rockchip/rk3399/linux_patches/net-usb-r8152-add-LED-configuration-from-OF.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/net-usb-r8152-add-LED-configuration-from-OF.patch rename to board/batocera/rockchip/rk3399/linux_patches/net-usb-r8152-add-LED-configuration-from-OF.patch diff --git a/board/rockchip/rk3399/linux_patches/regulator-add-fan53200-driver.patch b/board/batocera/rockchip/rk3399/linux_patches/regulator-add-fan53200-driver.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/regulator-add-fan53200-driver.patch rename to board/batocera/rockchip/rk3399/linux_patches/regulator-add-fan53200-driver.patch diff --git a/board/rockchip/rk3399/linux_patches/retrolx-fix-hugsun-x99-dts-missing-vopl-node.patch b/board/batocera/rockchip/rk3399/linux_patches/retrolx-fix-hugsun-x99-dts-missing-vopl-node.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/retrolx-fix-hugsun-x99-dts-missing-vopl-node.patch rename to board/batocera/rockchip/rk3399/linux_patches/retrolx-fix-hugsun-x99-dts-missing-vopl-node.patch diff --git a/board/rockchip/rk3399/linux_patches/rk3308-0001-pinctrl-slew-mux.patch b/board/batocera/rockchip/rk3399/linux_patches/rk3308-0001-pinctrl-slew-mux.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/rk3308-0001-pinctrl-slew-mux.patch rename to board/batocera/rockchip/rk3399/linux_patches/rk3308-0001-pinctrl-slew-mux.patch diff --git a/board/rockchip/rk3399/linux_patches/rk3308-0002-iodomains.patch b/board/batocera/rockchip/rk3399/linux_patches/rk3308-0002-iodomains.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/rk3308-0002-iodomains.patch rename to board/batocera/rockchip/rk3399/linux_patches/rk3308-0002-iodomains.patch diff --git a/board/rockchip/rk3399/linux_patches/rk3308-0003-pinctrl-io-voltage-domains.patch b/board/batocera/rockchip/rk3399/linux_patches/rk3308-0003-pinctrl-io-voltage-domains.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/rk3308-0003-pinctrl-io-voltage-domains.patch rename to board/batocera/rockchip/rk3399/linux_patches/rk3308-0003-pinctrl-io-voltage-domains.patch diff --git a/board/rockchip/rk3399/linux_patches/rk3328-add-dmc-driver.patch b/board/batocera/rockchip/rk3399/linux_patches/rk3328-add-dmc-driver.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/rk3328-add-dmc-driver.patch rename to board/batocera/rockchip/rk3399/linux_patches/rk3328-add-dmc-driver.patch diff --git a/board/rockchip/rk3399/linux_patches/rk3399-add-sclk-i2sout-src-clock.patch b/board/batocera/rockchip/rk3399/linux_patches/rk3399-add-sclk-i2sout-src-clock.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/rk3399-add-sclk-i2sout-src-clock.patch rename to board/batocera/rockchip/rk3399/linux_patches/rk3399-add-sclk-i2sout-src-clock.patch diff --git a/board/rockchip/rk3399/linux_patches/rk3399-dmc-polling-rate.patch b/board/batocera/rockchip/rk3399/linux_patches/rk3399-dmc-polling-rate.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/rk3399-dmc-polling-rate.patch rename to board/batocera/rockchip/rk3399/linux_patches/rk3399-dmc-polling-rate.patch diff --git a/board/rockchip/rk3399/linux_patches/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch b/board/batocera/rockchip/rk3399/linux_patches/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch rename to board/batocera/rockchip/rk3399/linux_patches/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch diff --git a/board/rockchip/rk3399/linux_patches/rk3399-fix-pci-phy.patch b/board/batocera/rockchip/rk3399/linux_patches/rk3399-fix-pci-phy.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/rk3399-fix-pci-phy.patch rename to board/batocera/rockchip/rk3399/linux_patches/rk3399-fix-pci-phy.patch diff --git a/board/rockchip/rk3399/linux_patches/rk3399-fix-usb-phy.patch b/board/batocera/rockchip/rk3399/linux_patches/rk3399-fix-usb-phy.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/rk3399-fix-usb-phy.patch rename to board/batocera/rockchip/rk3399/linux_patches/rk3399-fix-usb-phy.patch diff --git a/board/rockchip/rk3399/linux_patches/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch b/board/batocera/rockchip/rk3399/linux_patches/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch rename to board/batocera/rockchip/rk3399/linux_patches/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch diff --git a/board/rockchip/rk3399/linux_patches/rk3399-sd-drive-level-8ma.patch b/board/batocera/rockchip/rk3399/linux_patches/rk3399-sd-drive-level-8ma.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/rk3399-sd-drive-level-8ma.patch rename to board/batocera/rockchip/rk3399/linux_patches/rk3399-sd-drive-level-8ma.patch diff --git a/board/rockchip/rk3399/linux_patches/rk3399-sd-pwr-pinctrl.patch b/board/batocera/rockchip/rk3399/linux_patches/rk3399-sd-pwr-pinctrl.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/rk3399-sd-pwr-pinctrl.patch rename to board/batocera/rockchip/rk3399/linux_patches/rk3399-sd-pwr-pinctrl.patch diff --git a/board/rockchip/rk3399/linux_patches/rk3399-unlock-temperature.patch b/board/batocera/rockchip/rk3399/linux_patches/rk3399-unlock-temperature.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/rk3399-unlock-temperature.patch rename to board/batocera/rockchip/rk3399/linux_patches/rk3399-unlock-temperature.patch diff --git a/board/rockchip/rk3399/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch b/board/batocera/rockchip/rk3399/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch rename to board/batocera/rockchip/rk3399/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch diff --git a/board/rockchip/rk3399/linux_patches/wifi-4003-add-bcm43342-chip.patch b/board/batocera/rockchip/rk3399/linux_patches/wifi-4003-add-bcm43342-chip.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/wifi-4003-add-bcm43342-chip.patch rename to board/batocera/rockchip/rk3399/linux_patches/wifi-4003-add-bcm43342-chip.patch diff --git a/board/rockchip/rk3399/linux_patches/xxx-linux-rockchip-Enable-4K-60Hz-mode-on-RK3228-RK3328-RK3399-and-RK356x.patch b/board/batocera/rockchip/rk3399/linux_patches/xxx-linux-rockchip-Enable-4K-60Hz-mode-on-RK3228-RK3328-RK3399-and-RK356x.patch similarity index 100% rename from board/rockchip/rk3399/linux_patches/xxx-linux-rockchip-Enable-4K-60Hz-mode-on-RK3228-RK3328-RK3399-and-RK356x.patch rename to board/batocera/rockchip/rk3399/linux_patches/xxx-linux-rockchip-Enable-4K-60Hz-mode-on-RK3228-RK3328-RK3399-and-RK356x.patch diff --git a/board/rockchip/rk3399/nanopi-m4v2/boot/extlinux.conf b/board/batocera/rockchip/rk3399/nanopi-m4v2/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3399/nanopi-m4v2/boot/extlinux.conf rename to board/batocera/rockchip/rk3399/nanopi-m4v2/boot/extlinux.conf diff --git a/board/rockchip/rk3399/nanopi-m4v2/create-boot-script.sh b/board/batocera/rockchip/rk3399/nanopi-m4v2/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3399/nanopi-m4v2/create-boot-script.sh rename to board/batocera/rockchip/rk3399/nanopi-m4v2/create-boot-script.sh diff --git a/board/rockchip/rk3399/nanopi-m4v2/genimage.cfg b/board/batocera/rockchip/rk3399/nanopi-m4v2/genimage.cfg similarity index 100% rename from board/rockchip/rk3399/nanopi-m4v2/genimage.cfg rename to board/batocera/rockchip/rk3399/nanopi-m4v2/genimage.cfg diff --git a/board/rockchip/rk3399/orangepi-4-lts/boot/extlinux.conf b/board/batocera/rockchip/rk3399/orangepi-4-lts/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3399/orangepi-4-lts/boot/extlinux.conf rename to board/batocera/rockchip/rk3399/orangepi-4-lts/boot/extlinux.conf diff --git a/board/rockchip/rk3399/orangepi-4-lts/create-boot-script.sh b/board/batocera/rockchip/rk3399/orangepi-4-lts/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3399/orangepi-4-lts/create-boot-script.sh rename to board/batocera/rockchip/rk3399/orangepi-4-lts/create-boot-script.sh diff --git a/board/rockchip/rk3399/orangepi-4-lts/genimage.cfg b/board/batocera/rockchip/rk3399/orangepi-4-lts/genimage.cfg similarity index 100% rename from board/rockchip/rk3399/orangepi-4-lts/genimage.cfg rename to board/batocera/rockchip/rk3399/orangepi-4-lts/genimage.cfg diff --git a/board/rockchip/rk3399/orangepi-800/boot/extlinux.conf b/board/batocera/rockchip/rk3399/orangepi-800/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3399/orangepi-800/boot/extlinux.conf rename to board/batocera/rockchip/rk3399/orangepi-800/boot/extlinux.conf diff --git a/board/rockchip/rk3399/orangepi-800/create-boot-script.sh b/board/batocera/rockchip/rk3399/orangepi-800/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3399/orangepi-800/create-boot-script.sh rename to board/batocera/rockchip/rk3399/orangepi-800/create-boot-script.sh diff --git a/board/rockchip/rk3399/orangepi-800/genimage.cfg b/board/batocera/rockchip/rk3399/orangepi-800/genimage.cfg similarity index 100% rename from board/rockchip/rk3399/orangepi-800/genimage.cfg rename to board/batocera/rockchip/rk3399/orangepi-800/genimage.cfg diff --git a/board/rockchip/rk3399/patches/atf/0001-rk3399-atf-fix-baud.patch b/board/batocera/rockchip/rk3399/patches/atf/0001-rk3399-atf-fix-baud.patch similarity index 100% rename from board/rockchip/rk3399/patches/atf/0001-rk3399-atf-fix-baud.patch rename to board/batocera/rockchip/rk3399/patches/atf/0001-rk3399-atf-fix-baud.patch diff --git a/board/rockchip/rk3399/patches/libdrm/libdrm-0001-add-rockchip-10bits-formats.patch b/board/batocera/rockchip/rk3399/patches/libdrm/libdrm-0001-add-rockchip-10bits-formats.patch similarity index 100% rename from board/rockchip/rk3399/patches/libdrm/libdrm-0001-add-rockchip-10bits-formats.patch rename to board/batocera/rockchip/rk3399/patches/libdrm/libdrm-0001-add-rockchip-10bits-formats.patch diff --git a/board/rockchip/rk3399/patches/moonlight-embedded/001-force-sdl-audio.patch b/board/batocera/rockchip/rk3399/patches/moonlight-embedded/001-force-sdl-audio.patch similarity index 100% rename from board/rockchip/rk3399/patches/moonlight-embedded/001-force-sdl-audio.patch rename to board/batocera/rockchip/rk3399/patches/moonlight-embedded/001-force-sdl-audio.patch diff --git a/board/rockchip/rk3399/patches/ppsspp/004-limit-to-big-cores.patch b/board/batocera/rockchip/rk3399/patches/ppsspp/004-limit-to-big-cores.patch similarity index 100% rename from board/rockchip/rk3399/patches/ppsspp/004-limit-to-big-cores.patch rename to board/batocera/rockchip/rk3399/patches/ppsspp/004-limit-to-big-cores.patch diff --git a/board/rockchip/rk3399/rock-pi-4/boot/extlinux.conf b/board/batocera/rockchip/rk3399/rock-pi-4/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3399/rock-pi-4/boot/extlinux.conf rename to board/batocera/rockchip/rk3399/rock-pi-4/boot/extlinux.conf diff --git a/board/rockchip/rk3399/rock-pi-4/create-boot-script.sh b/board/batocera/rockchip/rk3399/rock-pi-4/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3399/rock-pi-4/create-boot-script.sh rename to board/batocera/rockchip/rk3399/rock-pi-4/create-boot-script.sh diff --git a/board/rockchip/rk3399/rock-pi-4/genimage.cfg b/board/batocera/rockchip/rk3399/rock-pi-4/genimage.cfg similarity index 100% rename from board/rockchip/rk3399/rock-pi-4/genimage.cfg rename to board/batocera/rockchip/rk3399/rock-pi-4/genimage.cfg diff --git a/board/rockchip/rk3399/rock960/boot/extlinux.conf b/board/batocera/rockchip/rk3399/rock960/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3399/rock960/boot/extlinux.conf rename to board/batocera/rockchip/rk3399/rock960/boot/extlinux.conf diff --git a/board/rockchip/rk3399/rock960/create-boot-script.sh b/board/batocera/rockchip/rk3399/rock960/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3399/rock960/create-boot-script.sh rename to board/batocera/rockchip/rk3399/rock960/create-boot-script.sh diff --git a/board/rockchip/rk3399/rock960/genimage.cfg b/board/batocera/rockchip/rk3399/rock960/genimage.cfg similarity index 100% rename from board/rockchip/rk3399/rock960/genimage.cfg rename to board/batocera/rockchip/rk3399/rock960/genimage.cfg diff --git a/board/rockchip/rk3399/rockpro64/boot/extlinux.conf b/board/batocera/rockchip/rk3399/rockpro64/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3399/rockpro64/boot/extlinux.conf rename to board/batocera/rockchip/rk3399/rockpro64/boot/extlinux.conf diff --git a/board/rockchip/rk3399/rockpro64/create-boot-script.sh b/board/batocera/rockchip/rk3399/rockpro64/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3399/rockpro64/create-boot-script.sh rename to board/batocera/rockchip/rk3399/rockpro64/create-boot-script.sh diff --git a/board/rockchip/rk3399/rockpro64/genimage.cfg b/board/batocera/rockchip/rk3399/rockpro64/genimage.cfg similarity index 100% rename from board/rockchip/rk3399/rockpro64/genimage.cfg rename to board/batocera/rockchip/rk3399/rockpro64/genimage.cfg diff --git a/board/rockchip/rk3399/tinkerboard2/boot/extlinux.conf b/board/batocera/rockchip/rk3399/tinkerboard2/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3399/tinkerboard2/boot/extlinux.conf rename to board/batocera/rockchip/rk3399/tinkerboard2/boot/extlinux.conf diff --git a/board/rockchip/rk3399/tinkerboard2/create-boot-script.sh b/board/batocera/rockchip/rk3399/tinkerboard2/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3399/tinkerboard2/create-boot-script.sh rename to board/batocera/rockchip/rk3399/tinkerboard2/create-boot-script.sh diff --git a/board/rockchip/rk3399/tinkerboard2/genimage.cfg b/board/batocera/rockchip/rk3399/tinkerboard2/genimage.cfg similarity index 100% rename from board/rockchip/rk3399/tinkerboard2/genimage.cfg rename to board/batocera/rockchip/rk3399/tinkerboard2/genimage.cfg diff --git a/board/rockchip/rk3568/anbernic-rgxx3/boot/extlinux.conf b/board/batocera/rockchip/rk3568/anbernic-rgxx3/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3568/anbernic-rgxx3/boot/extlinux.conf rename to board/batocera/rockchip/rk3568/anbernic-rgxx3/boot/extlinux.conf diff --git a/board/rockchip/rk3568/anbernic-rgxx3/build-uboot.sh b/board/batocera/rockchip/rk3568/anbernic-rgxx3/build-uboot.sh similarity index 94% rename from board/rockchip/rk3568/anbernic-rgxx3/build-uboot.sh rename to board/batocera/rockchip/rk3568/anbernic-rgxx3/build-uboot.sh index 6fe13d2e2a6..68ad81c978c 100755 --- a/board/rockchip/rk3568/anbernic-rgxx3/build-uboot.sh +++ b/board/batocera/rockchip/rk3568/anbernic-rgxx3/build-uboot.sh @@ -19,7 +19,7 @@ IMAGES_DIR=$3 #cd u-boot # Apply patches if any -#PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/rockchip/rk3568/patches/uboot/*.patch" +#PATCHES="${BR2_EXTERNAL_BATOCERA_PATH}/board/batocera/rockchip/rk3568/patches/uboot/*.patch" #for patch in $PATCHES #do #echo "Applying patch: $patch" diff --git a/board/rockchip/rk3568/anbernic-rgxx3/create-boot-script.sh b/board/batocera/rockchip/rk3568/anbernic-rgxx3/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3568/anbernic-rgxx3/create-boot-script.sh rename to board/batocera/rockchip/rk3568/anbernic-rgxx3/create-boot-script.sh diff --git a/board/rockchip/rk3568/anbernic-rgxx3/fsoverlay/etc/modprobe.d/8192cu.conf b/board/batocera/rockchip/rk3568/anbernic-rgxx3/fsoverlay/etc/modprobe.d/8192cu.conf similarity index 100% rename from board/rockchip/rk3568/anbernic-rgxx3/fsoverlay/etc/modprobe.d/8192cu.conf rename to board/batocera/rockchip/rk3568/anbernic-rgxx3/fsoverlay/etc/modprobe.d/8192cu.conf diff --git a/board/rockchip/rk3568/anbernic-rgxx3/fsoverlay/etc/udev/rules.d/99-adc-keys.rules b/board/batocera/rockchip/rk3568/anbernic-rgxx3/fsoverlay/etc/udev/rules.d/99-adc-keys.rules similarity index 100% rename from board/rockchip/rk3568/anbernic-rgxx3/fsoverlay/etc/udev/rules.d/99-adc-keys.rules rename to board/batocera/rockchip/rk3568/anbernic-rgxx3/fsoverlay/etc/udev/rules.d/99-adc-keys.rules diff --git a/board/rockchip/rk3568/anbernic-rgxx3/genimage.cfg b/board/batocera/rockchip/rk3568/anbernic-rgxx3/genimage.cfg similarity index 100% rename from board/rockchip/rk3568/anbernic-rgxx3/genimage.cfg rename to board/batocera/rockchip/rk3568/anbernic-rgxx3/genimage.cfg diff --git a/board/rockchip/rk3568/dts/rk3566-anbernic-rg353v-v2.dts b/board/batocera/rockchip/rk3568/dts/rk3566-anbernic-rg353v-v2.dts similarity index 100% rename from board/rockchip/rk3568/dts/rk3566-anbernic-rg353v-v2.dts rename to board/batocera/rockchip/rk3568/dts/rk3566-anbernic-rg353v-v2.dts diff --git a/board/rockchip/rk3568/dts/rk3566-rock-3c.dts b/board/batocera/rockchip/rk3568/dts/rk3566-rock-3c.dts similarity index 100% rename from board/rockchip/rk3568/dts/rk3566-rock-3c.dts rename to board/batocera/rockchip/rk3568/dts/rk3566-rock-3c.dts diff --git a/board/rockchip/rk3568/dts/rk3568-firefly-roc-pc.dts b/board/batocera/rockchip/rk3568/dts/rk3568-firefly-roc-pc.dts similarity index 100% rename from board/rockchip/rk3568/dts/rk3568-firefly-roc-pc.dts rename to board/batocera/rockchip/rk3568/dts/rk3568-firefly-roc-pc.dts diff --git a/board/rockchip/rk3568/firefly-station-m2/boot/extlinux.conf b/board/batocera/rockchip/rk3568/firefly-station-m2/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3568/firefly-station-m2/boot/extlinux.conf rename to board/batocera/rockchip/rk3568/firefly-station-m2/boot/extlinux.conf diff --git a/board/rockchip/rk3568/firefly-station-m2/build-uboot.sh b/board/batocera/rockchip/rk3568/firefly-station-m2/build-uboot.sh similarity index 100% rename from board/rockchip/rk3568/firefly-station-m2/build-uboot.sh rename to board/batocera/rockchip/rk3568/firefly-station-m2/build-uboot.sh diff --git a/board/rockchip/rk3568/firefly-station-m2/create-boot-script.sh b/board/batocera/rockchip/rk3568/firefly-station-m2/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3568/firefly-station-m2/create-boot-script.sh rename to board/batocera/rockchip/rk3568/firefly-station-m2/create-boot-script.sh diff --git a/board/rockchip/rk3568/firefly-station-m2/genimage.cfg b/board/batocera/rockchip/rk3568/firefly-station-m2/genimage.cfg similarity index 100% rename from board/rockchip/rk3568/firefly-station-m2/genimage.cfg rename to board/batocera/rockchip/rk3568/firefly-station-m2/genimage.cfg diff --git a/board/rockchip/rk3568/firefly-station-p2/boot/extlinux.conf b/board/batocera/rockchip/rk3568/firefly-station-p2/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3568/firefly-station-p2/boot/extlinux.conf rename to board/batocera/rockchip/rk3568/firefly-station-p2/boot/extlinux.conf diff --git a/board/rockchip/rk3568/firefly-station-p2/build-uboot.sh b/board/batocera/rockchip/rk3568/firefly-station-p2/build-uboot.sh similarity index 100% rename from board/rockchip/rk3568/firefly-station-p2/build-uboot.sh rename to board/batocera/rockchip/rk3568/firefly-station-p2/build-uboot.sh diff --git a/board/rockchip/rk3568/firefly-station-p2/create-boot-script.sh b/board/batocera/rockchip/rk3568/firefly-station-p2/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3568/firefly-station-p2/create-boot-script.sh rename to board/batocera/rockchip/rk3568/firefly-station-p2/create-boot-script.sh diff --git a/board/rockchip/rk3568/firefly-station-p2/genimage.cfg b/board/batocera/rockchip/rk3568/firefly-station-p2/genimage.cfg similarity index 100% rename from board/rockchip/rk3568/firefly-station-p2/genimage.cfg rename to board/batocera/rockchip/rk3568/firefly-station-p2/genimage.cfg diff --git a/board/rockchip/rk3568/fsoverlay/usr/bin/cputemp b/board/batocera/rockchip/rk3568/fsoverlay/usr/bin/cputemp similarity index 100% rename from board/rockchip/rk3568/fsoverlay/usr/bin/cputemp rename to board/batocera/rockchip/rk3568/fsoverlay/usr/bin/cputemp diff --git a/board/rockchip/rk3568/fsoverlay/usr/bin/gputemp b/board/batocera/rockchip/rk3568/fsoverlay/usr/bin/gputemp similarity index 100% rename from board/rockchip/rk3568/fsoverlay/usr/bin/gputemp rename to board/batocera/rockchip/rk3568/fsoverlay/usr/bin/gputemp diff --git a/board/rockchip/rk3568/fsoverlay/usr/share/alsa/cards/Analog.conf b/board/batocera/rockchip/rk3568/fsoverlay/usr/share/alsa/cards/Analog.conf similarity index 100% rename from board/rockchip/rk3568/fsoverlay/usr/share/alsa/cards/Analog.conf rename to board/batocera/rockchip/rk3568/fsoverlay/usr/share/alsa/cards/Analog.conf diff --git a/board/rockchip/rk3568/fsoverlay/usr/share/alsa/cards/SPDIF.conf b/board/batocera/rockchip/rk3568/fsoverlay/usr/share/alsa/cards/SPDIF.conf similarity index 100% rename from board/rockchip/rk3568/fsoverlay/usr/share/alsa/cards/SPDIF.conf rename to board/batocera/rockchip/rk3568/fsoverlay/usr/share/alsa/cards/SPDIF.conf diff --git a/board/rockchip/rk3568/fsoverlay/usr/share/alsa/cards/simple-card.conf b/board/batocera/rockchip/rk3568/fsoverlay/usr/share/alsa/cards/simple-card.conf similarity index 100% rename from board/rockchip/rk3568/fsoverlay/usr/share/alsa/cards/simple-card.conf rename to board/batocera/rockchip/rk3568/fsoverlay/usr/share/alsa/cards/simple-card.conf diff --git a/board/rockchip/rk3568/linux-defconfig-fragment.config b/board/batocera/rockchip/rk3568/linux-defconfig-fragment.config similarity index 100% rename from board/rockchip/rk3568/linux-defconfig-fragment.config rename to board/batocera/rockchip/rk3568/linux-defconfig-fragment.config diff --git a/board/rockchip/rk3568/linux-defconfig.config b/board/batocera/rockchip/rk3568/linux-defconfig.config similarity index 100% rename from board/rockchip/rk3568/linux-defconfig.config rename to board/batocera/rockchip/rk3568/linux-defconfig.config diff --git a/board/rockchip/rk3568/linux_patches/linux-0000-rename-rk817-battery.patch b/board/batocera/rockchip/rk3568/linux_patches/linux-0000-rename-rk817-battery.patch similarity index 100% rename from board/rockchip/rk3568/linux_patches/linux-0000-rename-rk817-battery.patch rename to board/batocera/rockchip/rk3568/linux_patches/linux-0000-rename-rk817-battery.patch diff --git a/board/rockchip/rk3568/linux_patches/linux-0001-singleadc-joypad.patch b/board/batocera/rockchip/rk3568/linux_patches/linux-0001-singleadc-joypad.patch similarity index 100% rename from board/rockchip/rk3568/linux_patches/linux-0001-singleadc-joypad.patch rename to board/batocera/rockchip/rk3568/linux_patches/linux-0001-singleadc-joypad.patch diff --git a/board/rockchip/rk3568/linux_patches/linux-0002-rg353vs-input.patch b/board/batocera/rockchip/rk3568/linux_patches/linux-0002-rg353vs-input.patch similarity index 100% rename from board/rockchip/rk3568/linux_patches/linux-0002-rg353vs-input.patch rename to board/batocera/rockchip/rk3568/linux_patches/linux-0002-rg353vs-input.patch diff --git a/board/rockchip/rk3568/linux_patches/linux-0003-rg503-input.patch b/board/batocera/rockchip/rk3568/linux_patches/linux-0003-rg503-input.patch similarity index 100% rename from board/rockchip/rk3568/linux_patches/linux-0003-rg503-input.patch rename to board/batocera/rockchip/rk3568/linux_patches/linux-0003-rg503-input.patch diff --git a/board/rockchip/rk3568/linux_patches/linux-0004-rg353v-input.patch b/board/batocera/rockchip/rk3568/linux_patches/linux-0004-rg353v-input.patch similarity index 100% rename from board/rockchip/rk3568/linux_patches/linux-0004-rg353v-input.patch rename to board/batocera/rockchip/rk3568/linux_patches/linux-0004-rg353v-input.patch diff --git a/board/rockchip/rk3568/linux_patches/linux-0005-rg353p-input.patch b/board/batocera/rockchip/rk3568/linux_patches/linux-0005-rg353p-input.patch similarity index 100% rename from board/rockchip/rk3568/linux_patches/linux-0005-rg353p-input.patch rename to board/batocera/rockchip/rk3568/linux_patches/linux-0005-rg353p-input.patch diff --git a/board/rockchip/rk3568/linux_patches/linux-0006-rg353ps-input.patch b/board/batocera/rockchip/rk3568/linux_patches/linux-0006-rg353ps-input.patch similarity index 100% rename from board/rockchip/rk3568/linux_patches/linux-0006-rg353ps-input.patch rename to board/batocera/rockchip/rk3568/linux_patches/linux-0006-rg353ps-input.patch diff --git a/board/rockchip/rk3568/linux_patches/linux-0007-rgxx-input.patch b/board/batocera/rockchip/rk3568/linux_patches/linux-0007-rgxx-input.patch similarity index 100% rename from board/rockchip/rk3568/linux_patches/linux-0007-rgxx-input.patch rename to board/batocera/rockchip/rk3568/linux_patches/linux-0007-rgxx-input.patch diff --git a/board/rockchip/rk3568/linux_patches/linux-0008-add-odroid-m1s.patch b/board/batocera/rockchip/rk3568/linux_patches/linux-0008-add-odroid-m1s.patch similarity index 100% rename from board/rockchip/rk3568/linux_patches/linux-0008-add-odroid-m1s.patch rename to board/batocera/rockchip/rk3568/linux_patches/linux-0008-add-odroid-m1s.patch diff --git a/board/rockchip/rk3568/linux_patches/linux-1000-patchwork-hwrng-add-hwrng-support-for-Rockchip-RK3568.patch b/board/batocera/rockchip/rk3568/linux_patches/linux-1000-patchwork-hwrng-add-hwrng-support-for-Rockchip-RK3568.patch similarity index 100% rename from board/rockchip/rk3568/linux_patches/linux-1000-patchwork-hwrng-add-hwrng-support-for-Rockchip-RK3568.patch rename to board/batocera/rockchip/rk3568/linux_patches/linux-1000-patchwork-hwrng-add-hwrng-support-for-Rockchip-RK3568.patch diff --git a/board/rockchip/rk3568/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch b/board/batocera/rockchip/rk3568/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch similarity index 100% rename from board/rockchip/rk3568/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch rename to board/batocera/rockchip/rk3568/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch diff --git a/board/rockchip/rk3568/odroid-m1/boot.cmd b/board/batocera/rockchip/rk3568/odroid-m1/boot.cmd similarity index 100% rename from board/rockchip/rk3568/odroid-m1/boot.cmd rename to board/batocera/rockchip/rk3568/odroid-m1/boot.cmd diff --git a/board/rockchip/rk3568/odroid-m1/boot/boot-logo.bmp.gz b/board/batocera/rockchip/rk3568/odroid-m1/boot/boot-logo.bmp.gz similarity index 100% rename from board/rockchip/rk3568/odroid-m1/boot/boot-logo.bmp.gz rename to board/batocera/rockchip/rk3568/odroid-m1/boot/boot-logo.bmp.gz diff --git a/board/rockchip/rk3568/odroid-m1/boot/boot.scr b/board/batocera/rockchip/rk3568/odroid-m1/boot/boot.scr similarity index 100% rename from board/rockchip/rk3568/odroid-m1/boot/boot.scr rename to board/batocera/rockchip/rk3568/odroid-m1/boot/boot.scr diff --git a/board/rockchip/rk3568/odroid-m1/boot/extlinux.conf b/board/batocera/rockchip/rk3568/odroid-m1/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3568/odroid-m1/boot/extlinux.conf rename to board/batocera/rockchip/rk3568/odroid-m1/boot/extlinux.conf diff --git a/board/rockchip/rk3568/odroid-m1/build-uboot.sh b/board/batocera/rockchip/rk3568/odroid-m1/build-uboot.sh similarity index 100% rename from board/rockchip/rk3568/odroid-m1/build-uboot.sh rename to board/batocera/rockchip/rk3568/odroid-m1/build-uboot.sh diff --git a/board/rockchip/rk3568/odroid-m1/create-boot-script.sh b/board/batocera/rockchip/rk3568/odroid-m1/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3568/odroid-m1/create-boot-script.sh rename to board/batocera/rockchip/rk3568/odroid-m1/create-boot-script.sh diff --git a/board/rockchip/rk3568/odroid-m1/genimage.cfg b/board/batocera/rockchip/rk3568/odroid-m1/genimage.cfg similarity index 100% rename from board/rockchip/rk3568/odroid-m1/genimage.cfg rename to board/batocera/rockchip/rk3568/odroid-m1/genimage.cfg diff --git a/board/rockchip/rk3568/odroid-m1s/boot/extlinux.conf b/board/batocera/rockchip/rk3568/odroid-m1s/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3568/odroid-m1s/boot/extlinux.conf rename to board/batocera/rockchip/rk3568/odroid-m1s/boot/extlinux.conf diff --git a/board/rockchip/rk3568/odroid-m1s/create-boot-script.sh b/board/batocera/rockchip/rk3568/odroid-m1s/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3568/odroid-m1s/create-boot-script.sh rename to board/batocera/rockchip/rk3568/odroid-m1s/create-boot-script.sh diff --git a/board/rockchip/rk3568/odroid-m1s/genimage.cfg b/board/batocera/rockchip/rk3568/odroid-m1s/genimage.cfg similarity index 100% rename from board/rockchip/rk3568/odroid-m1s/genimage.cfg rename to board/batocera/rockchip/rk3568/odroid-m1s/genimage.cfg diff --git a/board/rockchip/rk3568/patches/.keep b/board/batocera/rockchip/rk3568/patches/.keep similarity index 100% rename from board/rockchip/rk3568/patches/.keep rename to board/batocera/rockchip/rk3568/patches/.keep diff --git a/board/rockchip/rk3568/patches/uboot/001-fix-ethernet-odroid-m1s.patch b/board/batocera/rockchip/rk3568/patches/uboot/001-fix-ethernet-odroid-m1s.patch similarity index 100% rename from board/rockchip/rk3568/patches/uboot/001-fix-ethernet-odroid-m1s.patch rename to board/batocera/rockchip/rk3568/patches/uboot/001-fix-ethernet-odroid-m1s.patch diff --git a/board/rockchip/rk3568/rock-3a/boot/extlinux.conf b/board/batocera/rockchip/rk3568/rock-3a/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3568/rock-3a/boot/extlinux.conf rename to board/batocera/rockchip/rk3568/rock-3a/boot/extlinux.conf diff --git a/board/rockchip/rk3568/rock-3a/build-uboot.sh b/board/batocera/rockchip/rk3568/rock-3a/build-uboot.sh similarity index 100% rename from board/rockchip/rk3568/rock-3a/build-uboot.sh rename to board/batocera/rockchip/rk3568/rock-3a/build-uboot.sh diff --git a/board/rockchip/rk3568/rock-3a/create-boot-script.sh b/board/batocera/rockchip/rk3568/rock-3a/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3568/rock-3a/create-boot-script.sh rename to board/batocera/rockchip/rk3568/rock-3a/create-boot-script.sh diff --git a/board/rockchip/rk3568/rock-3a/genimage.cfg b/board/batocera/rockchip/rk3568/rock-3a/genimage.cfg similarity index 100% rename from board/rockchip/rk3568/rock-3a/genimage.cfg rename to board/batocera/rockchip/rk3568/rock-3a/genimage.cfg diff --git a/board/rockchip/rk3568/rock-3a/rock3a-uboot.img b/board/batocera/rockchip/rk3568/rock-3a/rock3a-uboot.img similarity index 100% rename from board/rockchip/rk3568/rock-3a/rock3a-uboot.img rename to board/batocera/rockchip/rk3568/rock-3a/rock3a-uboot.img diff --git a/board/rockchip/rk3568/rock-3c/boot/extlinux.conf b/board/batocera/rockchip/rk3568/rock-3c/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3568/rock-3c/boot/extlinux.conf rename to board/batocera/rockchip/rk3568/rock-3c/boot/extlinux.conf diff --git a/board/rockchip/rk3568/rock-3c/build-uboot.sh b/board/batocera/rockchip/rk3568/rock-3c/build-uboot.sh similarity index 100% rename from board/rockchip/rk3568/rock-3c/build-uboot.sh rename to board/batocera/rockchip/rk3568/rock-3c/build-uboot.sh diff --git a/board/rockchip/rk3568/rock-3c/create-boot-script.sh b/board/batocera/rockchip/rk3568/rock-3c/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3568/rock-3c/create-boot-script.sh rename to board/batocera/rockchip/rk3568/rock-3c/create-boot-script.sh diff --git a/board/rockchip/rk3568/rock-3c/genimage.cfg b/board/batocera/rockchip/rk3568/rock-3c/genimage.cfg similarity index 100% rename from board/rockchip/rk3568/rock-3c/genimage.cfg rename to board/batocera/rockchip/rk3568/rock-3c/genimage.cfg diff --git a/board/rockchip/rk3588/bananapi-m7/boot/extlinux.conf b/board/batocera/rockchip/rk3588/bananapi-m7/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3588/bananapi-m7/boot/extlinux.conf rename to board/batocera/rockchip/rk3588/bananapi-m7/boot/extlinux.conf diff --git a/board/rockchip/rk3588/bananapi-m7/create-boot-script.sh b/board/batocera/rockchip/rk3588/bananapi-m7/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3588/bananapi-m7/create-boot-script.sh rename to board/batocera/rockchip/rk3588/bananapi-m7/create-boot-script.sh diff --git a/board/rockchip/rk3588/bananapi-m7/genimage.cfg b/board/batocera/rockchip/rk3588/bananapi-m7/genimage.cfg similarity index 100% rename from board/rockchip/rk3588/bananapi-m7/genimage.cfg rename to board/batocera/rockchip/rk3588/bananapi-m7/genimage.cfg diff --git a/board/rockchip/rk3588/dts/rk3588s-gameforce-ace.dts b/board/batocera/rockchip/rk3588/dts/rk3588s-gameforce-ace.dts similarity index 100% rename from board/rockchip/rk3588/dts/rk3588s-gameforce-ace.dts rename to board/batocera/rockchip/rk3588/dts/rk3588s-gameforce-ace.dts diff --git a/board/rockchip/rk3588/firefly-station-m3/boot/extlinux.conf b/board/batocera/rockchip/rk3588/firefly-station-m3/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3588/firefly-station-m3/boot/extlinux.conf rename to board/batocera/rockchip/rk3588/firefly-station-m3/boot/extlinux.conf diff --git a/board/rockchip/rk3588/firefly-station-m3/create-boot-script.sh b/board/batocera/rockchip/rk3588/firefly-station-m3/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3588/firefly-station-m3/create-boot-script.sh rename to board/batocera/rockchip/rk3588/firefly-station-m3/create-boot-script.sh diff --git a/board/rockchip/rk3588/firefly-station-m3/genimage.cfg b/board/batocera/rockchip/rk3588/firefly-station-m3/genimage.cfg similarity index 100% rename from board/rockchip/rk3588/firefly-station-m3/genimage.cfg rename to board/batocera/rockchip/rk3588/firefly-station-m3/genimage.cfg diff --git a/board/rockchip/rk3588/fsoverlay/etc/asound.conf b/board/batocera/rockchip/rk3588/fsoverlay/etc/asound.conf similarity index 100% rename from board/rockchip/rk3588/fsoverlay/etc/asound.conf rename to board/batocera/rockchip/rk3588/fsoverlay/etc/asound.conf diff --git a/board/rockchip/rk3588/fsoverlay/etc/init.d/S02fan b/board/batocera/rockchip/rk3588/fsoverlay/etc/init.d/S02fan similarity index 100% rename from board/rockchip/rk3588/fsoverlay/etc/init.d/S02fan rename to board/batocera/rockchip/rk3588/fsoverlay/etc/init.d/S02fan diff --git a/board/rockchip/rk3588/fsoverlay/etc/init.d/S06audio b/board/batocera/rockchip/rk3588/fsoverlay/etc/init.d/S06audio similarity index 100% rename from board/rockchip/rk3588/fsoverlay/etc/init.d/S06audio rename to board/batocera/rockchip/rk3588/fsoverlay/etc/init.d/S06audio diff --git a/board/rockchip/rk3588/fsoverlay/etc/init.d/S10rk3588 b/board/batocera/rockchip/rk3588/fsoverlay/etc/init.d/S10rk3588 similarity index 100% rename from board/rockchip/rk3588/fsoverlay/etc/init.d/S10rk3588 rename to board/batocera/rockchip/rk3588/fsoverlay/etc/init.d/S10rk3588 diff --git a/board/rockchip/rk3588/fsoverlay/etc/inittab b/board/batocera/rockchip/rk3588/fsoverlay/etc/inittab similarity index 100% rename from board/rockchip/rk3588/fsoverlay/etc/inittab rename to board/batocera/rockchip/rk3588/fsoverlay/etc/inittab diff --git a/board/rockchip/rk3588/fsoverlay/etc/opts.9tripod_rk3588s_Board b/board/batocera/rockchip/rk3588/fsoverlay/etc/opts.9tripod_rk3588s_Board similarity index 100% rename from board/rockchip/rk3588/fsoverlay/etc/opts.9tripod_rk3588s_Board rename to board/batocera/rockchip/rk3588/fsoverlay/etc/opts.9tripod_rk3588s_Board diff --git a/board/rockchip/rk3588/fsoverlay/etc/udev/rules.d/0001.enable_rga_mpp_aceleration.rules b/board/batocera/rockchip/rk3588/fsoverlay/etc/udev/rules.d/0001.enable_rga_mpp_aceleration.rules similarity index 100% rename from board/rockchip/rk3588/fsoverlay/etc/udev/rules.d/0001.enable_rga_mpp_aceleration.rules rename to board/batocera/rockchip/rk3588/fsoverlay/etc/udev/rules.d/0001.enable_rga_mpp_aceleration.rules diff --git a/board/rockchip/rk3588/fsoverlay/lib/firmware/brcm/BCM4345C5.hcd b/board/batocera/rockchip/rk3588/fsoverlay/lib/firmware/brcm/BCM4345C5.hcd similarity index 100% rename from board/rockchip/rk3588/fsoverlay/lib/firmware/brcm/BCM4345C5.hcd rename to board/batocera/rockchip/rk3588/fsoverlay/lib/firmware/brcm/BCM4345C5.hcd diff --git a/board/rockchip/rk3588/fsoverlay/lib/firmware/brcm/brcmfmac43456-sdio.bin b/board/batocera/rockchip/rk3588/fsoverlay/lib/firmware/brcm/brcmfmac43456-sdio.bin similarity index 100% rename from board/rockchip/rk3588/fsoverlay/lib/firmware/brcm/brcmfmac43456-sdio.bin rename to board/batocera/rockchip/rk3588/fsoverlay/lib/firmware/brcm/brcmfmac43456-sdio.bin diff --git a/board/rockchip/rk3588/fsoverlay/lib/firmware/brcm/brcmfmac43456-sdio.txt b/board/batocera/rockchip/rk3588/fsoverlay/lib/firmware/brcm/brcmfmac43456-sdio.txt similarity index 100% rename from board/rockchip/rk3588/fsoverlay/lib/firmware/brcm/brcmfmac43456-sdio.txt rename to board/batocera/rockchip/rk3588/fsoverlay/lib/firmware/brcm/brcmfmac43456-sdio.txt diff --git a/board/rockchip/rk3588/fsoverlay/lib/firmware/mali_csffw.bin b/board/batocera/rockchip/rk3588/fsoverlay/lib/firmware/mali_csffw.bin similarity index 100% rename from board/rockchip/rk3588/fsoverlay/lib/firmware/mali_csffw.bin rename to board/batocera/rockchip/rk3588/fsoverlay/lib/firmware/mali_csffw.bin diff --git a/board/rockchip/rk3588/fsoverlay/usr/bin/brcm_patchram_plus b/board/batocera/rockchip/rk3588/fsoverlay/usr/bin/brcm_patchram_plus similarity index 100% rename from board/rockchip/rk3588/fsoverlay/usr/bin/brcm_patchram_plus rename to board/batocera/rockchip/rk3588/fsoverlay/usr/bin/brcm_patchram_plus diff --git a/board/rockchip/rk3588/fsoverlay/usr/share/alsa/cards/rockchip_rk809-.conf b/board/batocera/rockchip/rk3588/fsoverlay/usr/share/alsa/cards/rockchip_rk809-.conf similarity index 100% rename from board/rockchip/rk3588/fsoverlay/usr/share/alsa/cards/rockchip_rk809-.conf rename to board/batocera/rockchip/rk3588/fsoverlay/usr/share/alsa/cards/rockchip_rk809-.conf diff --git a/board/rockchip/rk3588/fsoverlay/usr/share/alsa/init/postinit b/board/batocera/rockchip/rk3588/fsoverlay/usr/share/alsa/init/postinit similarity index 100% rename from board/rockchip/rk3588/fsoverlay/usr/share/alsa/init/postinit rename to board/batocera/rockchip/rk3588/fsoverlay/usr/share/alsa/init/postinit diff --git a/board/rockchip/rk3588/fsoverlay/usr/share/alsa/init/rk809 b/board/batocera/rockchip/rk3588/fsoverlay/usr/share/alsa/init/rk809 similarity index 100% rename from board/rockchip/rk3588/fsoverlay/usr/share/alsa/init/rk809 rename to board/batocera/rockchip/rk3588/fsoverlay/usr/share/alsa/init/rk809 diff --git a/board/rockchip/rk3588/fsoverlay/usr/share/alsa/init/rockchip b/board/batocera/rockchip/rk3588/fsoverlay/usr/share/alsa/init/rockchip similarity index 100% rename from board/rockchip/rk3588/fsoverlay/usr/share/alsa/init/rockchip rename to board/batocera/rockchip/rk3588/fsoverlay/usr/share/alsa/init/rockchip diff --git a/board/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/conf.d/rockchip-es8316/rockchip-es8316.conf b/board/batocera/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/conf.d/rockchip-es8316/rockchip-es8316.conf similarity index 100% rename from board/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/conf.d/rockchip-es8316/rockchip-es8316.conf rename to board/batocera/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/conf.d/rockchip-es8316/rockchip-es8316.conf diff --git a/board/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/conf.d/rockchip-es8388/rockchip-es8388.conf b/board/batocera/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/conf.d/rockchip-es8388/rockchip-es8388.conf similarity index 100% rename from board/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/conf.d/rockchip-es8388/rockchip-es8388.conf rename to board/batocera/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/conf.d/rockchip-es8388/rockchip-es8388.conf diff --git a/board/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/conf.d/rockchip-hdmi0/Hdmi.conf b/board/batocera/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/conf.d/rockchip-hdmi0/Hdmi.conf similarity index 100% rename from board/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/conf.d/rockchip-hdmi0/Hdmi.conf rename to board/batocera/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/conf.d/rockchip-hdmi0/Hdmi.conf diff --git a/board/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/conf.d/rockchip-hdmi0/rockchip-hdmi0.conf b/board/batocera/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/conf.d/rockchip-hdmi0/rockchip-hdmi0.conf similarity index 100% rename from board/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/conf.d/rockchip-hdmi0/rockchip-hdmi0.conf rename to board/batocera/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/conf.d/rockchip-hdmi0/rockchip-hdmi0.conf diff --git a/board/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/conf.d/rockchip-hdmi1/Hdmi.conf b/board/batocera/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/conf.d/rockchip-hdmi1/Hdmi.conf similarity index 100% rename from board/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/conf.d/rockchip-hdmi1/Hdmi.conf rename to board/batocera/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/conf.d/rockchip-hdmi1/Hdmi.conf diff --git a/board/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/conf.d/rockchip-hdmi1/rockchip-hdmi1.conf b/board/batocera/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/conf.d/rockchip-hdmi1/rockchip-hdmi1.conf similarity index 100% rename from board/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/conf.d/rockchip-hdmi1/rockchip-hdmi1.conf rename to board/batocera/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/conf.d/rockchip-hdmi1/rockchip-hdmi1.conf diff --git a/board/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/es8388/HiFi.conf b/board/batocera/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/es8388/HiFi.conf similarity index 100% rename from board/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/es8388/HiFi.conf rename to board/batocera/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/es8388/HiFi.conf diff --git a/board/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/es8388/es8388.conf b/board/batocera/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/es8388/es8388.conf similarity index 100% rename from board/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/es8388/es8388.conf rename to board/batocera/rockchip/rk3588/fsoverlay/usr/share/alsa/ucm2/es8388/es8388.conf diff --git a/board/rockchip/rk3588/gameforce-ace/boot/extlinux.conf b/board/batocera/rockchip/rk3588/gameforce-ace/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3588/gameforce-ace/boot/extlinux.conf rename to board/batocera/rockchip/rk3588/gameforce-ace/boot/extlinux.conf diff --git a/board/rockchip/rk3588/gameforce-ace/create-boot-script.sh b/board/batocera/rockchip/rk3588/gameforce-ace/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3588/gameforce-ace/create-boot-script.sh rename to board/batocera/rockchip/rk3588/gameforce-ace/create-boot-script.sh diff --git a/board/rockchip/rk3588/gameforce-ace/genimage.cfg b/board/batocera/rockchip/rk3588/gameforce-ace/genimage.cfg similarity index 100% rename from board/rockchip/rk3588/gameforce-ace/genimage.cfg rename to board/batocera/rockchip/rk3588/gameforce-ace/genimage.cfg diff --git a/board/rockchip/rk3588/indiedroid-nova/boot/extlinux.conf b/board/batocera/rockchip/rk3588/indiedroid-nova/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3588/indiedroid-nova/boot/extlinux.conf rename to board/batocera/rockchip/rk3588/indiedroid-nova/boot/extlinux.conf diff --git a/board/rockchip/rk3588/indiedroid-nova/create-boot-script.sh b/board/batocera/rockchip/rk3588/indiedroid-nova/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3588/indiedroid-nova/create-boot-script.sh rename to board/batocera/rockchip/rk3588/indiedroid-nova/create-boot-script.sh diff --git a/board/rockchip/rk3588/indiedroid-nova/genimage.cfg b/board/batocera/rockchip/rk3588/indiedroid-nova/genimage.cfg similarity index 100% rename from board/rockchip/rk3588/indiedroid-nova/genimage.cfg rename to board/batocera/rockchip/rk3588/indiedroid-nova/genimage.cfg diff --git a/board/rockchip/rk3588/khadas-edge-2/boot/extlinux.conf b/board/batocera/rockchip/rk3588/khadas-edge-2/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3588/khadas-edge-2/boot/extlinux.conf rename to board/batocera/rockchip/rk3588/khadas-edge-2/boot/extlinux.conf diff --git a/board/rockchip/rk3588/khadas-edge-2/create-boot-script.sh b/board/batocera/rockchip/rk3588/khadas-edge-2/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3588/khadas-edge-2/create-boot-script.sh rename to board/batocera/rockchip/rk3588/khadas-edge-2/create-boot-script.sh diff --git a/board/rockchip/rk3588/khadas-edge-2/genimage.cfg b/board/batocera/rockchip/rk3588/khadas-edge-2/genimage.cfg similarity index 100% rename from board/rockchip/rk3588/khadas-edge-2/genimage.cfg rename to board/batocera/rockchip/rk3588/khadas-edge-2/genimage.cfg diff --git a/board/rockchip/rk3588/linux-defconfig-fragment.config b/board/batocera/rockchip/rk3588/linux-defconfig-fragment.config similarity index 100% rename from board/rockchip/rk3588/linux-defconfig-fragment.config rename to board/batocera/rockchip/rk3588/linux-defconfig-fragment.config diff --git a/board/rockchip/rk3588/linux-defconfig.config b/board/batocera/rockchip/rk3588/linux-defconfig.config similarity index 100% rename from board/rockchip/rk3588/linux-defconfig.config rename to board/batocera/rockchip/rk3588/linux-defconfig.config diff --git a/board/rockchip/rk3588/linux_patches/001-warnings-build-fix.patch b/board/batocera/rockchip/rk3588/linux_patches/001-warnings-build-fix.patch similarity index 100% rename from board/rockchip/rk3588/linux_patches/001-warnings-build-fix.patch rename to board/batocera/rockchip/rk3588/linux_patches/001-warnings-build-fix.patch diff --git a/board/rockchip/rk3588/linux_patches/002-radxa-wireless-a8-workaround.patch b/board/batocera/rockchip/rk3588/linux_patches/002-radxa-wireless-a8-workaround.patch similarity index 100% rename from board/rockchip/rk3588/linux_patches/002-radxa-wireless-a8-workaround.patch rename to board/batocera/rockchip/rk3588/linux_patches/002-radxa-wireless-a8-workaround.patch diff --git a/board/rockchip/rk3588/linux_patches/003-gameforce-ace-panel-dtsi.patch b/board/batocera/rockchip/rk3588/linux_patches/003-gameforce-ace-panel-dtsi.patch similarity index 100% rename from board/rockchip/rk3588/linux_patches/003-gameforce-ace-panel-dtsi.patch rename to board/batocera/rockchip/rk3588/linux_patches/003-gameforce-ace-panel-dtsi.patch diff --git a/board/rockchip/rk3588/linux_patches/004-rk3588-rename-cw2015-battery.patch b/board/batocera/rockchip/rk3588/linux_patches/004-rk3588-rename-cw2015-battery.patch similarity index 100% rename from board/rockchip/rk3588/linux_patches/004-rk3588-rename-cw2015-battery.patch rename to board/batocera/rockchip/rk3588/linux_patches/004-rk3588-rename-cw2015-battery.patch diff --git a/board/rockchip/rk3588/linux_patches/005-GameForce-Ace-joypad.patch b/board/batocera/rockchip/rk3588/linux_patches/005-GameForce-Ace-joypad.patch similarity index 100% rename from board/rockchip/rk3588/linux_patches/005-GameForce-Ace-joypad.patch rename to board/batocera/rockchip/rk3588/linux_patches/005-GameForce-Ace-joypad.patch diff --git a/board/rockchip/rk3588/linux_patches/006-enable-panthor.patch b/board/batocera/rockchip/rk3588/linux_patches/006-enable-panthor.patch similarity index 100% rename from board/rockchip/rk3588/linux_patches/006-enable-panthor.patch rename to board/batocera/rockchip/rk3588/linux_patches/006-enable-panthor.patch diff --git a/board/rockchip/rk3588/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch b/board/batocera/rockchip/rk3588/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch similarity index 100% rename from board/rockchip/rk3588/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch rename to board/batocera/rockchip/rk3588/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch diff --git a/board/rockchip/rk3588/mekotronics-r58/boot/extlinux.conf b/board/batocera/rockchip/rk3588/mekotronics-r58/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3588/mekotronics-r58/boot/extlinux.conf rename to board/batocera/rockchip/rk3588/mekotronics-r58/boot/extlinux.conf diff --git a/board/rockchip/rk3588/mekotronics-r58/create-boot-script.sh b/board/batocera/rockchip/rk3588/mekotronics-r58/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3588/mekotronics-r58/create-boot-script.sh rename to board/batocera/rockchip/rk3588/mekotronics-r58/create-boot-script.sh diff --git a/board/rockchip/rk3588/mekotronics-r58/genimage.cfg b/board/batocera/rockchip/rk3588/mekotronics-r58/genimage.cfg similarity index 100% rename from board/rockchip/rk3588/mekotronics-r58/genimage.cfg rename to board/batocera/rockchip/rk3588/mekotronics-r58/genimage.cfg diff --git a/board/rockchip/rk3588/orangepi-5-plus/boot/extlinux.conf b/board/batocera/rockchip/rk3588/orangepi-5-plus/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3588/orangepi-5-plus/boot/extlinux.conf rename to board/batocera/rockchip/rk3588/orangepi-5-plus/boot/extlinux.conf diff --git a/board/rockchip/rk3588/orangepi-5-plus/create-boot-script.sh b/board/batocera/rockchip/rk3588/orangepi-5-plus/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3588/orangepi-5-plus/create-boot-script.sh rename to board/batocera/rockchip/rk3588/orangepi-5-plus/create-boot-script.sh diff --git a/board/rockchip/rk3588/orangepi-5-plus/genimage.cfg b/board/batocera/rockchip/rk3588/orangepi-5-plus/genimage.cfg similarity index 100% rename from board/rockchip/rk3588/orangepi-5-plus/genimage.cfg rename to board/batocera/rockchip/rk3588/orangepi-5-plus/genimage.cfg diff --git a/board/rockchip/rk3588/orangepi-5/boot/extlinux.conf b/board/batocera/rockchip/rk3588/orangepi-5/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3588/orangepi-5/boot/extlinux.conf rename to board/batocera/rockchip/rk3588/orangepi-5/boot/extlinux.conf diff --git a/board/rockchip/rk3588/orangepi-5/create-boot-script.sh b/board/batocera/rockchip/rk3588/orangepi-5/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3588/orangepi-5/create-boot-script.sh rename to board/batocera/rockchip/rk3588/orangepi-5/create-boot-script.sh diff --git a/board/rockchip/rk3588/orangepi-5/genimage.cfg b/board/batocera/rockchip/rk3588/orangepi-5/genimage.cfg similarity index 100% rename from board/rockchip/rk3588/orangepi-5/genimage.cfg rename to board/batocera/rockchip/rk3588/orangepi-5/genimage.cfg diff --git a/board/rockchip/rk3588/orangepi-5b/boot/extlinux.conf b/board/batocera/rockchip/rk3588/orangepi-5b/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3588/orangepi-5b/boot/extlinux.conf rename to board/batocera/rockchip/rk3588/orangepi-5b/boot/extlinux.conf diff --git a/board/rockchip/rk3588/orangepi-5b/create-boot-script.sh b/board/batocera/rockchip/rk3588/orangepi-5b/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3588/orangepi-5b/create-boot-script.sh rename to board/batocera/rockchip/rk3588/orangepi-5b/create-boot-script.sh diff --git a/board/rockchip/rk3588/orangepi-5b/genimage.cfg b/board/batocera/rockchip/rk3588/orangepi-5b/genimage.cfg similarity index 100% rename from board/rockchip/rk3588/orangepi-5b/genimage.cfg rename to board/batocera/rockchip/rk3588/orangepi-5b/genimage.cfg diff --git a/board/rockchip/rk3588/patches/moonlight-embedded/001-force-sdl-audio.patch b/board/batocera/rockchip/rk3588/patches/moonlight-embedded/001-force-sdl-audio.patch similarity index 100% rename from board/rockchip/rk3588/patches/moonlight-embedded/001-force-sdl-audio.patch rename to board/batocera/rockchip/rk3588/patches/moonlight-embedded/001-force-sdl-audio.patch diff --git a/board/rockchip/rk3588/patches/mpv/0001-support_nv12.patch b/board/batocera/rockchip/rk3588/patches/mpv/0001-support_nv12.patch similarity index 100% rename from board/rockchip/rk3588/patches/mpv/0001-support_nv12.patch rename to board/batocera/rockchip/rk3588/patches/mpv/0001-support_nv12.patch diff --git a/board/rockchip/rk3588/patches/mpv/0002-support_dma_buffer_rendering.patch b/board/batocera/rockchip/rk3588/patches/mpv/0002-support_dma_buffer_rendering.patch similarity index 100% rename from board/rockchip/rk3588/patches/mpv/0002-support_dma_buffer_rendering.patch rename to board/batocera/rockchip/rk3588/patches/mpv/0002-support_dma_buffer_rendering.patch diff --git a/board/rockchip/rk3588/patches/mpv/0004-change_video_zplane_pos_to_1.patch b/board/batocera/rockchip/rk3588/patches/mpv/0004-change_video_zplane_pos_to_1.patch similarity index 100% rename from board/rockchip/rk3588/patches/mpv/0004-change_video_zplane_pos_to_1.patch rename to board/batocera/rockchip/rk3588/patches/mpv/0004-change_video_zplane_pos_to_1.patch diff --git a/board/rockchip/rk3588/patches/mpv/0005-stop_setting_zpos.patch b/board/batocera/rockchip/rk3588/patches/mpv/0005-stop_setting_zpos.patch similarity index 100% rename from board/rockchip/rk3588/patches/mpv/0005-stop_setting_zpos.patch rename to board/batocera/rockchip/rk3588/patches/mpv/0005-stop_setting_zpos.patch diff --git a/board/rockchip/rk3588/patches/mpv/0006-fix_create_framebuffer_error.patch b/board/batocera/rockchip/rk3588/patches/mpv/0006-fix_create_framebuffer_error.patch similarity index 100% rename from board/rockchip/rk3588/patches/mpv/0006-fix_create_framebuffer_error.patch rename to board/batocera/rockchip/rk3588/patches/mpv/0006-fix_create_framebuffer_error.patch diff --git a/board/rockchip/rk3588/patches/mpv/0007-support_nv12_10_dma_buffer.patch b/board/batocera/rockchip/rk3588/patches/mpv/0007-support_nv12_10_dma_buffer.patch similarity index 100% rename from board/rockchip/rk3588/patches/mpv/0007-support_nv12_10_dma_buffer.patch rename to board/batocera/rockchip/rk3588/patches/mpv/0007-support_nv12_10_dma_buffer.patch diff --git a/board/rockchip/rk3588/patches/ppsspp/004-limit-to-big-cores.patch b/board/batocera/rockchip/rk3588/patches/ppsspp/004-limit-to-big-cores.patch similarity index 100% rename from board/rockchip/rk3588/patches/ppsspp/004-limit-to-big-cores.patch rename to board/batocera/rockchip/rk3588/patches/ppsspp/004-limit-to-big-cores.patch diff --git a/board/rockchip/rk3588/patches/rtl8821cu/001-add-module-import.patch b/board/batocera/rockchip/rk3588/patches/rtl8821cu/001-add-module-import.patch similarity index 100% rename from board/rockchip/rk3588/patches/rtl8821cu/001-add-module-import.patch rename to board/batocera/rockchip/rk3588/patches/rtl8821cu/001-add-module-import.patch diff --git a/board/rockchip/rk3588/patches/sdl2/0001-opengles2-expand-more-support-format.patch b/board/batocera/rockchip/rk3588/patches/sdl2/0001-opengles2-expand-more-support-format.patch similarity index 100% rename from board/rockchip/rk3588/patches/sdl2/0001-opengles2-expand-more-support-format.patch rename to board/batocera/rockchip/rk3588/patches/sdl2/0001-opengles2-expand-more-support-format.patch diff --git a/board/rockchip/rk3588/patches/vita3k/001-fix-xxhash.patch b/board/batocera/rockchip/rk3588/patches/vita3k/001-fix-xxhash.patch similarity index 100% rename from board/rockchip/rk3588/patches/vita3k/001-fix-xxhash.patch rename to board/batocera/rockchip/rk3588/patches/vita3k/001-fix-xxhash.patch diff --git a/board/rockchip/rk3588/patches/xpad-noone/001-fix-input_device_enabled.patch b/board/batocera/rockchip/rk3588/patches/xpad-noone/001-fix-input_device_enabled.patch similarity index 100% rename from board/rockchip/rk3588/patches/xpad-noone/001-fix-input_device_enabled.patch rename to board/batocera/rockchip/rk3588/patches/xpad-noone/001-fix-input_device_enabled.patch diff --git a/board/rockchip/rk3588/quartzpro64/boot/extlinux.conf b/board/batocera/rockchip/rk3588/quartzpro64/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3588/quartzpro64/boot/extlinux.conf rename to board/batocera/rockchip/rk3588/quartzpro64/boot/extlinux.conf diff --git a/board/rockchip/rk3588/quartzpro64/create-boot-script.sh b/board/batocera/rockchip/rk3588/quartzpro64/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3588/quartzpro64/create-boot-script.sh rename to board/batocera/rockchip/rk3588/quartzpro64/create-boot-script.sh diff --git a/board/rockchip/rk3588/quartzpro64/genimage.cfg b/board/batocera/rockchip/rk3588/quartzpro64/genimage.cfg similarity index 100% rename from board/rockchip/rk3588/quartzpro64/genimage.cfg rename to board/batocera/rockchip/rk3588/quartzpro64/genimage.cfg diff --git a/board/rockchip/rk3588/rock-5a/boot/extlinux.conf b/board/batocera/rockchip/rk3588/rock-5a/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3588/rock-5a/boot/extlinux.conf rename to board/batocera/rockchip/rk3588/rock-5a/boot/extlinux.conf diff --git a/board/rockchip/rk3588/rock-5a/create-boot-script.sh b/board/batocera/rockchip/rk3588/rock-5a/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3588/rock-5a/create-boot-script.sh rename to board/batocera/rockchip/rk3588/rock-5a/create-boot-script.sh diff --git a/board/rockchip/rk3588/rock-5a/genimage.cfg b/board/batocera/rockchip/rk3588/rock-5a/genimage.cfg similarity index 100% rename from board/rockchip/rk3588/rock-5a/genimage.cfg rename to board/batocera/rockchip/rk3588/rock-5a/genimage.cfg diff --git a/board/rockchip/rk3588/rock-5b/boot/extlinux.conf b/board/batocera/rockchip/rk3588/rock-5b/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3588/rock-5b/boot/extlinux.conf rename to board/batocera/rockchip/rk3588/rock-5b/boot/extlinux.conf diff --git a/board/rockchip/rk3588/rock-5b/create-boot-script.sh b/board/batocera/rockchip/rk3588/rock-5b/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3588/rock-5b/create-boot-script.sh rename to board/batocera/rockchip/rk3588/rock-5b/create-boot-script.sh diff --git a/board/rockchip/rk3588/rock-5b/genimage.cfg b/board/batocera/rockchip/rk3588/rock-5b/genimage.cfg similarity index 100% rename from board/rockchip/rk3588/rock-5b/genimage.cfg rename to board/batocera/rockchip/rk3588/rock-5b/genimage.cfg diff --git a/board/rockchip/rk3588/rock-5c/boot/extlinux.conf b/board/batocera/rockchip/rk3588/rock-5c/boot/extlinux.conf similarity index 100% rename from board/rockchip/rk3588/rock-5c/boot/extlinux.conf rename to board/batocera/rockchip/rk3588/rock-5c/boot/extlinux.conf diff --git a/board/rockchip/rk3588/rock-5c/create-boot-script.sh b/board/batocera/rockchip/rk3588/rock-5c/create-boot-script.sh similarity index 100% rename from board/rockchip/rk3588/rock-5c/create-boot-script.sh rename to board/batocera/rockchip/rk3588/rock-5c/create-boot-script.sh diff --git a/board/rockchip/rk3588/rock-5c/genimage.cfg b/board/batocera/rockchip/rk3588/rock-5c/genimage.cfg similarity index 100% rename from board/rockchip/rk3588/rock-5c/genimage.cfg rename to board/batocera/rockchip/rk3588/rock-5c/genimage.cfg diff --git a/board/samsung/exynos5422/linux-defconfig-fragment.config b/board/batocera/samsung/exynos5422/linux-defconfig-fragment.config similarity index 100% rename from board/samsung/exynos5422/linux-defconfig-fragment.config rename to board/batocera/samsung/exynos5422/linux-defconfig-fragment.config diff --git a/board/samsung/exynos5422/linux-defconfig.config b/board/batocera/samsung/exynos5422/linux-defconfig.config similarity index 100% rename from board/samsung/exynos5422/linux-defconfig.config rename to board/batocera/samsung/exynos5422/linux-defconfig.config diff --git a/board/samsung/exynos5422/linux_patches/linux-battery-quircks.patch b/board/batocera/samsung/exynos5422/linux_patches/linux-battery-quircks.patch similarity index 100% rename from board/samsung/exynos5422/linux_patches/linux-battery-quircks.patch rename to board/batocera/samsung/exynos5422/linux_patches/linux-battery-quircks.patch diff --git a/board/samsung/exynos5422/linux_patches/linux-usbhid-quircks.patch b/board/batocera/samsung/exynos5422/linux_patches/linux-usbhid-quircks.patch similarity index 100% rename from board/samsung/exynos5422/linux_patches/linux-usbhid-quircks.patch rename to board/batocera/samsung/exynos5422/linux_patches/linux-usbhid-quircks.patch diff --git a/board/samsung/exynos5422/linux_patches/linux-wiimote-abs-not-hat.patch b/board/batocera/samsung/exynos5422/linux_patches/linux-wiimote-abs-not-hat.patch similarity index 100% rename from board/samsung/exynos5422/linux_patches/linux-wiimote-abs-not-hat.patch rename to board/batocera/samsung/exynos5422/linux_patches/linux-wiimote-abs-not-hat.patch diff --git a/board/samsung/exynos5422/linux_patches/samsung-0001-HACK-drm-set-DRM_RENDER_ALLOW-flag-on-DRM_IOCTL_MODE.patch b/board/batocera/samsung/exynos5422/linux_patches/samsung-0001-HACK-drm-set-DRM_RENDER_ALLOW-flag-on-DRM_IOCTL_MODE.patch similarity index 100% rename from board/samsung/exynos5422/linux_patches/samsung-0001-HACK-drm-set-DRM_RENDER_ALLOW-flag-on-DRM_IOCTL_MODE.patch rename to board/batocera/samsung/exynos5422/linux_patches/samsung-0001-HACK-drm-set-DRM_RENDER_ALLOW-flag-on-DRM_IOCTL_MODE.patch diff --git a/board/samsung/exynos5422/linux_patches/samsung-0002-WIP-media-videobuf2-always-enable-V4L2_MEMORY_FLAG_N.patch b/board/batocera/samsung/exynos5422/linux_patches/samsung-0002-WIP-media-videobuf2-always-enable-V4L2_MEMORY_FLAG_N.patch similarity index 100% rename from board/samsung/exynos5422/linux_patches/samsung-0002-WIP-media-videobuf2-always-enable-V4L2_MEMORY_FLAG_N.patch rename to board/batocera/samsung/exynos5422/linux_patches/samsung-0002-WIP-media-videobuf2-always-enable-V4L2_MEMORY_FLAG_N.patch diff --git a/board/samsung/exynos5422/linux_patches/samsung-0003-WIP-iommu-io-pgtable-arm-Fix-coherency-support-for-M.patch b/board/batocera/samsung/exynos5422/linux_patches/samsung-0003-WIP-iommu-io-pgtable-arm-Fix-coherency-support-for-M.patch similarity index 100% rename from board/samsung/exynos5422/linux_patches/samsung-0003-WIP-iommu-io-pgtable-arm-Fix-coherency-support-for-M.patch rename to board/batocera/samsung/exynos5422/linux_patches/samsung-0003-WIP-iommu-io-pgtable-arm-Fix-coherency-support-for-M.patch diff --git a/board/samsung/exynos5422/linux_patches/samsung-0004-WIP-soc-samsung-pm_domains-Bring-back-old-driver-imp.patch b/board/batocera/samsung/exynos5422/linux_patches/samsung-0004-WIP-soc-samsung-pm_domains-Bring-back-old-driver-imp.patch similarity index 100% rename from board/samsung/exynos5422/linux_patches/samsung-0004-WIP-soc-samsung-pm_domains-Bring-back-old-driver-imp.patch rename to board/batocera/samsung/exynos5422/linux_patches/samsung-0004-WIP-soc-samsung-pm_domains-Bring-back-old-driver-imp.patch diff --git a/board/samsung/exynos5422/linux_patches/samsung-0005-WIP-arm-dts-exynos5422-HC1-XU3-XU4-model-name-is-ODR.patch b/board/batocera/samsung/exynos5422/linux_patches/samsung-0005-WIP-arm-dts-exynos5422-HC1-XU3-XU4-model-name-is-ODR.patch similarity index 100% rename from board/samsung/exynos5422/linux_patches/samsung-0005-WIP-arm-dts-exynos5422-HC1-XU3-XU4-model-name-is-ODR.patch rename to board/batocera/samsung/exynos5422/linux_patches/samsung-0005-WIP-arm-dts-exynos5422-HC1-XU3-XU4-model-name-is-ODR.patch diff --git a/board/samsung/exynos5422/linux_patches/samsung-0006-WIP-media-s5p-mfc-Allow-cache-hints-for-queues.patch b/board/batocera/samsung/exynos5422/linux_patches/samsung-0006-WIP-media-s5p-mfc-Allow-cache-hints-for-queues.patch similarity index 100% rename from board/samsung/exynos5422/linux_patches/samsung-0006-WIP-media-s5p-mfc-Allow-cache-hints-for-queues.patch rename to board/batocera/samsung/exynos5422/linux_patches/samsung-0006-WIP-media-s5p-mfc-Allow-cache-hints-for-queues.patch diff --git a/board/samsung/exynos5422/linux_patches/samsung-0007-WIP-media-s5p-mfc-use-EAGAIN-not-EIO-for-MFCINST_ERR.patch b/board/batocera/samsung/exynos5422/linux_patches/samsung-0007-WIP-media-s5p-mfc-use-EAGAIN-not-EIO-for-MFCINST_ERR.patch similarity index 100% rename from board/samsung/exynos5422/linux_patches/samsung-0007-WIP-media-s5p-mfc-use-EAGAIN-not-EIO-for-MFCINST_ERR.patch rename to board/batocera/samsung/exynos5422/linux_patches/samsung-0007-WIP-media-s5p-mfc-use-EAGAIN-not-EIO-for-MFCINST_ERR.patch diff --git a/board/samsung/exynos5422/linux_patches/samsung-0008-WIP-ARM-dma-mapping-implement-alloc_noncontiguous.patch b/board/batocera/samsung/exynos5422/linux_patches/samsung-0008-WIP-ARM-dma-mapping-implement-alloc_noncontiguous.patch similarity index 100% rename from board/samsung/exynos5422/linux_patches/samsung-0008-WIP-ARM-dma-mapping-implement-alloc_noncontiguous.patch rename to board/batocera/samsung/exynos5422/linux_patches/samsung-0008-WIP-ARM-dma-mapping-implement-alloc_noncontiguous.patch diff --git a/board/samsung/exynos5422/linux_patches/samsung-0009-MEMEKA-ARM-dma-mapping-increase-DMA-coherent-pool-si.patch b/board/batocera/samsung/exynos5422/linux_patches/samsung-0009-MEMEKA-ARM-dma-mapping-increase-DMA-coherent-pool-si.patch similarity index 100% rename from board/samsung/exynos5422/linux_patches/samsung-0009-MEMEKA-ARM-dma-mapping-increase-DMA-coherent-pool-si.patch rename to board/batocera/samsung/exynos5422/linux_patches/samsung-0009-MEMEKA-ARM-dma-mapping-increase-DMA-coherent-pool-si.patch diff --git a/board/samsung/exynos5422/linux_patches/samsung-0010-MEMEKA-drm-exynos-mixer-never-blend-the-base-layer.patch b/board/batocera/samsung/exynos5422/linux_patches/samsung-0010-MEMEKA-drm-exynos-mixer-never-blend-the-base-layer.patch similarity index 100% rename from board/samsung/exynos5422/linux_patches/samsung-0010-MEMEKA-drm-exynos-mixer-never-blend-the-base-layer.patch rename to board/batocera/samsung/exynos5422/linux_patches/samsung-0010-MEMEKA-drm-exynos-mixer-never-blend-the-base-layer.patch diff --git a/board/samsung/exynos5422/linux_patches/samsung-0011-MEMEKA-media-exynos-gsc-fix-v4l2-SELECTION-api.patch b/board/batocera/samsung/exynos5422/linux_patches/samsung-0011-MEMEKA-media-exynos-gsc-fix-v4l2-SELECTION-api.patch similarity index 100% rename from board/samsung/exynos5422/linux_patches/samsung-0011-MEMEKA-media-exynos-gsc-fix-v4l2-SELECTION-api.patch rename to board/batocera/samsung/exynos5422/linux_patches/samsung-0011-MEMEKA-media-exynos-gsc-fix-v4l2-SELECTION-api.patch diff --git a/board/samsung/exynos5422/linux_patches/samsung-0012-MEMEKA-media-s5p-mfc-copy-timestamp-and-timecode-in-.patch b/board/batocera/samsung/exynos5422/linux_patches/samsung-0012-MEMEKA-media-s5p-mfc-copy-timestamp-and-timecode-in-.patch similarity index 100% rename from board/samsung/exynos5422/linux_patches/samsung-0012-MEMEKA-media-s5p-mfc-copy-timestamp-and-timecode-in-.patch rename to board/batocera/samsung/exynos5422/linux_patches/samsung-0012-MEMEKA-media-s5p-mfc-copy-timestamp-and-timecode-in-.patch diff --git a/board/samsung/exynos5422/linux_patches/samsung-0013-MEMEKA-media-s5p-mfc-stop-streaming-before-releasing.patch b/board/batocera/samsung/exynos5422/linux_patches/samsung-0013-MEMEKA-media-s5p-mfc-stop-streaming-before-releasing.patch similarity index 100% rename from board/samsung/exynos5422/linux_patches/samsung-0013-MEMEKA-media-s5p-mfc-stop-streaming-before-releasing.patch rename to board/batocera/samsung/exynos5422/linux_patches/samsung-0013-MEMEKA-media-s5p-mfc-stop-streaming-before-releasing.patch diff --git a/board/samsung/exynos5422/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch b/board/batocera/samsung/exynos5422/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch similarity index 100% rename from board/samsung/exynos5422/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch rename to board/batocera/samsung/exynos5422/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch diff --git a/board/samsung/exynos5422/odroidxu4/boot/extlinux.conf b/board/batocera/samsung/exynos5422/odroidxu4/boot/extlinux.conf similarity index 100% rename from board/samsung/exynos5422/odroidxu4/boot/extlinux.conf rename to board/batocera/samsung/exynos5422/odroidxu4/boot/extlinux.conf diff --git a/board/samsung/exynos5422/odroidxu4/create-boot-script.sh b/board/batocera/samsung/exynos5422/odroidxu4/create-boot-script.sh similarity index 100% rename from board/samsung/exynos5422/odroidxu4/create-boot-script.sh rename to board/batocera/samsung/exynos5422/odroidxu4/create-boot-script.sh diff --git a/board/samsung/exynos5422/odroidxu4/fsoverlay/etc/asound.conf b/board/batocera/samsung/exynos5422/odroidxu4/fsoverlay/etc/asound.conf similarity index 100% rename from board/samsung/exynos5422/odroidxu4/fsoverlay/etc/asound.conf rename to board/batocera/samsung/exynos5422/odroidxu4/fsoverlay/etc/asound.conf diff --git a/board/samsung/exynos5422/odroidxu4/fsoverlay/etc/init.d/S02fan b/board/batocera/samsung/exynos5422/odroidxu4/fsoverlay/etc/init.d/S02fan similarity index 100% rename from board/samsung/exynos5422/odroidxu4/fsoverlay/etc/init.d/S02fan rename to board/batocera/samsung/exynos5422/odroidxu4/fsoverlay/etc/init.d/S02fan diff --git a/board/samsung/exynos5422/odroidxu4/genimage.cfg b/board/batocera/samsung/exynos5422/odroidxu4/genimage.cfg similarity index 100% rename from board/samsung/exynos5422/odroidxu4/genimage.cfg rename to board/batocera/samsung/exynos5422/odroidxu4/genimage.cfg diff --git a/board/samsung/exynos5422/odroidxu4/patches/ffmpeg/ffmpeg-001-v4l2-drmprime.patch b/board/batocera/samsung/exynos5422/odroidxu4/patches/ffmpeg/ffmpeg-001-v4l2-drmprime.patch similarity index 100% rename from board/samsung/exynos5422/odroidxu4/patches/ffmpeg/ffmpeg-001-v4l2-drmprime.patch rename to board/batocera/samsung/exynos5422/odroidxu4/patches/ffmpeg/ffmpeg-001-v4l2-drmprime.patch diff --git a/board/samsung/exynos5422/odroidxu4/patches/ffmpeg/ffmpeg-001-v4l2-request.patch b/board/batocera/samsung/exynos5422/odroidxu4/patches/ffmpeg/ffmpeg-001-v4l2-request.patch similarity index 100% rename from board/samsung/exynos5422/odroidxu4/patches/ffmpeg/ffmpeg-001-v4l2-request.patch rename to board/batocera/samsung/exynos5422/odroidxu4/patches/ffmpeg/ffmpeg-001-v4l2-request.patch diff --git a/board/samsung/exynos5422/odroidxu4/patches/new-lg4ff/force-define-config_logiwheels_ff.patch b/board/batocera/samsung/exynos5422/odroidxu4/patches/new-lg4ff/force-define-config_logiwheels_ff.patch similarity index 100% rename from board/samsung/exynos5422/odroidxu4/patches/new-lg4ff/force-define-config_logiwheels_ff.patch rename to board/batocera/samsung/exynos5422/odroidxu4/patches/new-lg4ff/force-define-config_logiwheels_ff.patch diff --git a/board/samsung/exynos5422/odroidxu4/patches/sugarbox/001-gles.patch b/board/batocera/samsung/exynos5422/odroidxu4/patches/sugarbox/001-gles.patch similarity index 100% rename from board/samsung/exynos5422/odroidxu4/patches/sugarbox/001-gles.patch rename to board/batocera/samsung/exynos5422/odroidxu4/patches/sugarbox/001-gles.patch diff --git a/board/samsung/exynos5422/odroidxu4/patches/switchres/001-relax-kmsdrm.patch b/board/batocera/samsung/exynos5422/odroidxu4/patches/switchres/001-relax-kmsdrm.patch similarity index 100% rename from board/samsung/exynos5422/odroidxu4/patches/switchres/001-relax-kmsdrm.patch rename to board/batocera/samsung/exynos5422/odroidxu4/patches/switchres/001-relax-kmsdrm.patch diff --git a/board/saphira/boot/EFI/BOOT/BOOTAA64.EFI b/board/batocera/saphira/boot/EFI/BOOT/BOOTAA64.EFI similarity index 100% rename from board/saphira/boot/EFI/BOOT/BOOTAA64.EFI rename to board/batocera/saphira/boot/EFI/BOOT/BOOTAA64.EFI diff --git a/board/saphira/boot/EFI/BOOT/fbaa64.efi b/board/batocera/saphira/boot/EFI/BOOT/fbaa64.efi similarity index 100% rename from board/saphira/boot/EFI/BOOT/fbaa64.efi rename to board/batocera/saphira/boot/EFI/BOOT/fbaa64.efi diff --git a/board/saphira/boot/EFI/batocera/BOOTAA64.CSV b/board/batocera/saphira/boot/EFI/batocera/BOOTAA64.CSV similarity index 100% rename from board/saphira/boot/EFI/batocera/BOOTAA64.CSV rename to board/batocera/saphira/boot/EFI/batocera/BOOTAA64.CSV diff --git a/board/saphira/boot/EFI/batocera/grub.cfg b/board/batocera/saphira/boot/EFI/batocera/grub.cfg similarity index 100% rename from board/saphira/boot/EFI/batocera/grub.cfg rename to board/batocera/saphira/boot/EFI/batocera/grub.cfg diff --git a/board/saphira/boot/EFI/batocera/grubaa64.efi b/board/batocera/saphira/boot/EFI/batocera/grubaa64.efi similarity index 100% rename from board/saphira/boot/EFI/batocera/grubaa64.efi rename to board/batocera/saphira/boot/EFI/batocera/grubaa64.efi diff --git a/board/saphira/boot/EFI/batocera/mmaa64.efi b/board/batocera/saphira/boot/EFI/batocera/mmaa64.efi similarity index 100% rename from board/saphira/boot/EFI/batocera/mmaa64.efi rename to board/batocera/saphira/boot/EFI/batocera/mmaa64.efi diff --git a/board/saphira/boot/EFI/batocera/shim.efi b/board/batocera/saphira/boot/EFI/batocera/shim.efi similarity index 100% rename from board/saphira/boot/EFI/batocera/shim.efi rename to board/batocera/saphira/boot/EFI/batocera/shim.efi diff --git a/board/saphira/boot/EFI/batocera/shimaa64.efi b/board/batocera/saphira/boot/EFI/batocera/shimaa64.efi similarity index 100% rename from board/saphira/boot/EFI/batocera/shimaa64.efi rename to board/batocera/saphira/boot/EFI/batocera/shimaa64.efi diff --git a/board/saphira/create-boot-script.sh b/board/batocera/saphira/create-boot-script.sh similarity index 100% rename from board/saphira/create-boot-script.sh rename to board/batocera/saphira/create-boot-script.sh diff --git a/board/saphira/genimage-efi.disabled b/board/batocera/saphira/genimage-efi.disabled similarity index 100% rename from board/saphira/genimage-efi.disabled rename to board/batocera/saphira/genimage-efi.disabled diff --git a/board/saphira/genimage.cfg b/board/batocera/saphira/genimage.cfg similarity index 100% rename from board/saphira/genimage.cfg rename to board/batocera/saphira/genimage.cfg diff --git a/board/saphira/linux-defconfig-fragment.config b/board/batocera/saphira/linux-defconfig-fragment.config similarity index 100% rename from board/saphira/linux-defconfig-fragment.config rename to board/batocera/saphira/linux-defconfig-fragment.config diff --git a/board/saphira/linux-defconfig.config b/board/batocera/saphira/linux-defconfig.config similarity index 100% rename from board/saphira/linux-defconfig.config rename to board/batocera/saphira/linux-defconfig.config diff --git a/board/saphira/patches/mame/switchres-no-xrandr.patch b/board/batocera/saphira/patches/mame/switchres-no-xrandr.patch similarity index 100% rename from board/saphira/patches/mame/switchres-no-xrandr.patch rename to board/batocera/saphira/patches/mame/switchres-no-xrandr.patch diff --git a/board/scripts/doWineWow64-32package.sh b/board/batocera/scripts/doWineWow64-32package.sh similarity index 97% rename from board/scripts/doWineWow64-32package.sh rename to board/batocera/scripts/doWineWow64-32package.sh index 2751ea0e713..57834e402d3 100755 --- a/board/scripts/doWineWow64-32package.sh +++ b/board/batocera/scripts/doWineWow64-32package.sh @@ -192,30 +192,30 @@ cp -prv "${G_TARGETDIR}/usr/lib/alsa-lib/libasound_module_"*".so" "${TMPOUT}/lib # pipewire # if you modify 0.2 and 0.3, these values are hardcoded for SPA_PLUGIN_DIR and PIPEWIRE_MODULE_DIR -echo +echo echo "pipewire..." -echo +echo cp -prv "${G_TARGETDIR}/usr/lib/spa-0.2" "${TMPOUT}/lib32/" || exit 1 cp -prv "${G_TARGETDIR}/usr/lib/pipewire-0.3" "${TMPOUT}/lib32/" || exit 1 # installation -echo +echo echo "wine installation..." -echo +echo mkdir -p "${TMPOUT}/usr/wine/ge-custom" || exit 1 cp -pr "${G_TARGETDIR}/usr/wine/ge-custom" "${TMPOUT}/usr/wine/" || exit 1 # helper bins -echo +echo echo " wine helper binaries" -echo +echo mkdir -p "${TMPOUT}/usr/bin32" || exit 1 #cp -p "${G_TARGETDIR}/usr/bin/cabextract" "${TMPOUT}/usr/bin32/" || exit 1 cp -p "${G_TARGETDIR}/usr/bin/gst"* "${TMPOUT}/usr/bin32/" || exit 1 # dri -echo +echo echo "dri..." -echo +echo for i in "${G_TARGETDIR}/usr/lib/dri/"*.so do echo " "$(basename "${i}") @@ -260,7 +260,7 @@ else XTARGET_IMAGE="${PWD}/${TARGET_IMAGE}" fi -XTARGET_VERSION=$(grep -E "^BATOCERA_SYSTEM_VERSION[ ]*=" "${BR2_EXTERNAL_BATOCERA_PATH}/package/core/batocera-system/batocera-system.mk" | sed -e s+"^BATOCERA_SYSTEM_VERSION[ ]*=[ ]*\(.*\)[ ]*$"+'\1'+) +XTARGET_VERSION=$(grep -E "^BATOCERA_SYSTEM_VERSION[ ]*=" "${BR2_EXTERNAL_BATOCERA_PATH}/package/batocera/core/batocera-system/batocera-system.mk" | sed -e s+"^BATOCERA_SYSTEM_VERSION[ ]*=[ ]*\(.*\)[ ]*$"+'\1'+) XTARGET_ARCH="x86" XTARGET_FILE="wine-${XTARGET_ARCH}-${XTARGET_VERSION}.tar.lzma" diff --git a/board/scripts/doWinepackage.sh b/board/batocera/scripts/doWinepackage.sh similarity index 97% rename from board/scripts/doWinepackage.sh rename to board/batocera/scripts/doWinepackage.sh index 65792f96edf..4dc0b802752 100755 --- a/board/scripts/doWinepackage.sh +++ b/board/batocera/scripts/doWinepackage.sh @@ -1,6 +1,6 @@ #!/bin/bash -# run manually: board/scripts/doWinepackage.sh "output/target" "output/wine" "output/images/reglinux" +# run manually: board/batocera/scripts/doWinepackage.sh "output/target" "output/wine" "output/images/reglinux" basicLdd() { LANG=C readelf -d "${1}" | grep -E "Shared library: " | sed -e s+"^.*Shared library: \[\([^]]*\)\]$"+"\1"+ diff --git a/board/scripts/package-firmware.sh b/board/batocera/scripts/package-firmware.sh similarity index 100% rename from board/scripts/package-firmware.sh rename to board/batocera/scripts/package-firmware.sh diff --git a/board/scripts/package-kernel-modules.sh b/board/batocera/scripts/package-kernel-modules.sh similarity index 100% rename from board/scripts/package-kernel-modules.sh rename to board/batocera/scripts/package-kernel-modules.sh diff --git a/board/scripts/post-build-script.sh b/board/batocera/scripts/post-build-script.sh similarity index 94% rename from board/scripts/post-build-script.sh rename to board/batocera/scripts/post-build-script.sh index 72f01be9a28..e69fd067f14 100755 --- a/board/scripts/post-build-script.sh +++ b/board/batocera/scripts/post-build-script.sh @@ -8,10 +8,10 @@ # TARGET_DIR = target dir # Package modules -source "${BR2_EXTERNAL_BATOCERA_PATH}/board/scripts/package-kernel-modules.sh" +source "${BR2_EXTERNAL_BATOCERA_PATH}/board/batocera/scripts/package-kernel-modules.sh" # Package firmware -source "${BR2_EXTERNAL_BATOCERA_PATH}/board/scripts/package-firmware.sh" +source "${BR2_EXTERNAL_BATOCERA_PATH}/board/batocera/scripts/package-firmware.sh" BATOCERA_TARGET=$(grep -E "^BR2_PACKAGE_BATOCERA_TARGET_[A-Z_0-9]*=y$" "${BR2_CONFIG}" | sed -e s+'^BR2_PACKAGE_BATOCERA_TARGET_\([A-Z_0-9]*\)=y$'+'\1'+) @@ -139,7 +139,7 @@ sed -i -e s+'defaults.pcm.ipc_gid .*$'+'defaults.pcm.ipc_gid '"${AUDIOGROUP}"+ " # bios file mkdir -p "${TARGET_DIR}/usr/share/reglinux/datainit/bios" || exit 1 -python "${BR2_EXTERNAL_BATOCERA_PATH}/package/core/batocera-scripts/scripts/batocera-systems" --createReadme > "${TARGET_DIR}/usr/share/reglinux/datainit/bios/readme.txt" || exit 1 +python "${BR2_EXTERNAL_BATOCERA_PATH}/package/batocera/core/batocera-scripts/scripts/batocera-systems" --createReadme > "${TARGET_DIR}/usr/share/reglinux/datainit/bios/readme.txt" || exit 1 # enable serial console SYSTEM_GETTY_PORT=$(grep "BR2_TARGET_GENERIC_GETTY_PORT" "${BR2_CONFIG}" | sed 's/.*\"\(.*\)\"/\1/') diff --git a/board/scripts/post-image-script.sh b/board/batocera/scripts/post-image-script.sh similarity index 95% rename from board/scripts/post-image-script.sh rename to board/batocera/scripts/post-image-script.sh index 0ba5269bbef..3831870e7c3 100755 --- a/board/scripts/post-image-script.sh +++ b/board/batocera/scripts/post-image-script.sh @@ -53,8 +53,8 @@ do #### prepare the boot dir ###### BOOTNAMEDDIR="${REGLINUX_BINARIES_DIR}/boot_${BATOCERA_SUBTARGET}" rm -rf "${BOOTNAMEDDIR}" || exit 1 # remove in case or rerun - BATOCERA_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_BATOCERA_PATH}/board/${BATOCERA_PATHSUBTARGET}/create-boot-script.sh" - bash "${BATOCERA_POST_IMAGE_SCRIPT}" "${HOST_DIR}" "${BR2_EXTERNAL_BATOCERA_PATH}/board/${BATOCERA_PATHSUBTARGET}" "${BUILD_DIR}" "${BINARIES_DIR}" "${TARGET_DIR}" "${REGLINUX_BINARIES_DIR}" || exit 1 + BATOCERA_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_BATOCERA_PATH}/board/batocera/${BATOCERA_PATHSUBTARGET}/create-boot-script.sh" + bash "${BATOCERA_POST_IMAGE_SCRIPT}" "${HOST_DIR}" "${BR2_EXTERNAL_BATOCERA_PATH}/board/batocera/${BATOCERA_PATHSUBTARGET}" "${BUILD_DIR}" "${BINARIES_DIR}" "${TARGET_DIR}" "${REGLINUX_BINARIES_DIR}" || exit 1 # add some common files #nope cp -pr "${BINARIES_DIR}/tools" "${REGLINUX_BINARIES_DIR}/boot/" || exit 1 cp "${BINARIES_DIR}/system-boot.conf" "${REGLINUX_BINARIES_DIR}/boot/" || exit 1 @@ -73,7 +73,7 @@ do fi echo "creating images/${BATOCERA_SUBTARGET}/"$(basename "${BATOCERAIMG}")"..." >&2 rm -rf "${GENIMAGE_TMP}" || exit 1 - GENIMAGEDIR="${BR2_EXTERNAL_BATOCERA_PATH}/board/${BATOCERA_PATHSUBTARGET}" + GENIMAGEDIR="${BR2_EXTERNAL_BATOCERA_PATH}/board/batocera/${BATOCERA_PATHSUBTARGET}" GENIMAGEFILE="${GENIMAGEDIR}/genimage.cfg" FILES=$(find "${REGLINUX_BINARIES_DIR}/boot" -type f | sed -e s+"^${REGLINUX_BINARIES_DIR}/boot/\(.*\)$"+"file \1 \{ image = '\1' }"+ | tr '\n' '@') cat "${GENIMAGEFILE}" | sed -e s+'@files'+"${FILES}"+ | tr '@' '\n' > "${REGLINUX_BINARIES_DIR}/genimage.cfg" || exit 1 diff --git a/board/spacemit/bananapi-f3/boot/env_k1-x.txt b/board/batocera/spacemit/bananapi-f3/boot/env_k1-x.txt similarity index 100% rename from board/spacemit/bananapi-f3/boot/env_k1-x.txt rename to board/batocera/spacemit/bananapi-f3/boot/env_k1-x.txt diff --git a/board/spacemit/bananapi-f3/boot/extlinux.conf b/board/batocera/spacemit/bananapi-f3/boot/extlinux.conf similarity index 100% rename from board/spacemit/bananapi-f3/boot/extlinux.conf rename to board/batocera/spacemit/bananapi-f3/boot/extlinux.conf diff --git a/board/spacemit/bananapi-f3/boot/overlay/bianbu.bmp b/board/batocera/spacemit/bananapi-f3/boot/overlay/bianbu.bmp similarity index 100% rename from board/spacemit/bananapi-f3/boot/overlay/bianbu.bmp rename to board/batocera/spacemit/bananapi-f3/boot/overlay/bianbu.bmp diff --git a/board/spacemit/bananapi-f3/boot/overlay/env_k1-x.txt b/board/batocera/spacemit/bananapi-f3/boot/overlay/env_k1-x.txt similarity index 100% rename from board/spacemit/bananapi-f3/boot/overlay/env_k1-x.txt rename to board/batocera/spacemit/bananapi-f3/boot/overlay/env_k1-x.txt diff --git a/board/spacemit/bananapi-f3/boot/overlay/k1-x_MUSE-N1.dtb b/board/batocera/spacemit/bananapi-f3/boot/overlay/k1-x_MUSE-N1.dtb similarity index 100% rename from board/spacemit/bananapi-f3/boot/overlay/k1-x_MUSE-N1.dtb rename to board/batocera/spacemit/bananapi-f3/boot/overlay/k1-x_MUSE-N1.dtb diff --git a/board/spacemit/bananapi-f3/boot/overlay/k1-x_MUSE-Pi.dtb b/board/batocera/spacemit/bananapi-f3/boot/overlay/k1-x_MUSE-Pi.dtb similarity index 100% rename from board/spacemit/bananapi-f3/boot/overlay/k1-x_MUSE-Pi.dtb rename to board/batocera/spacemit/bananapi-f3/boot/overlay/k1-x_MUSE-Pi.dtb diff --git a/board/spacemit/bananapi-f3/boot/overlay/k1-x_deb1.dtb b/board/batocera/spacemit/bananapi-f3/boot/overlay/k1-x_deb1.dtb similarity index 100% rename from board/spacemit/bananapi-f3/boot/overlay/k1-x_deb1.dtb rename to board/batocera/spacemit/bananapi-f3/boot/overlay/k1-x_deb1.dtb diff --git a/board/spacemit/bananapi-f3/boot/overlay/k1-x_deb2.dtb b/board/batocera/spacemit/bananapi-f3/boot/overlay/k1-x_deb2.dtb similarity index 100% rename from board/spacemit/bananapi-f3/boot/overlay/k1-x_deb2.dtb rename to board/batocera/spacemit/bananapi-f3/boot/overlay/k1-x_deb2.dtb diff --git a/board/spacemit/bananapi-f3/boot/overlay/k1-x_evb.dtb b/board/batocera/spacemit/bananapi-f3/boot/overlay/k1-x_evb.dtb similarity index 100% rename from board/spacemit/bananapi-f3/boot/overlay/k1-x_evb.dtb rename to board/batocera/spacemit/bananapi-f3/boot/overlay/k1-x_evb.dtb diff --git a/board/spacemit/bananapi-f3/boot/overlay/k1-x_hs450.dtb b/board/batocera/spacemit/bananapi-f3/boot/overlay/k1-x_hs450.dtb similarity index 100% rename from board/spacemit/bananapi-f3/boot/overlay/k1-x_hs450.dtb rename to board/batocera/spacemit/bananapi-f3/boot/overlay/k1-x_hs450.dtb diff --git a/board/spacemit/bananapi-f3/boot/overlay/k1-x_kx312.dtb b/board/batocera/spacemit/bananapi-f3/boot/overlay/k1-x_kx312.dtb similarity index 100% rename from board/spacemit/bananapi-f3/boot/overlay/k1-x_kx312.dtb rename to board/batocera/spacemit/bananapi-f3/boot/overlay/k1-x_kx312.dtb diff --git a/board/spacemit/bananapi-f3/boot/overlay/k1-x_mingo.dtb b/board/batocera/spacemit/bananapi-f3/boot/overlay/k1-x_mingo.dtb similarity index 100% rename from board/spacemit/bananapi-f3/boot/overlay/k1-x_mingo.dtb rename to board/batocera/spacemit/bananapi-f3/boot/overlay/k1-x_mingo.dtb diff --git a/board/spacemit/bananapi-f3/boot/splash.bmp b/board/batocera/spacemit/bananapi-f3/boot/splash.bmp similarity index 100% rename from board/spacemit/bananapi-f3/boot/splash.bmp rename to board/batocera/spacemit/bananapi-f3/boot/splash.bmp diff --git a/board/spacemit/bananapi-f3/create-boot-script.sh b/board/batocera/spacemit/bananapi-f3/create-boot-script.sh similarity index 100% rename from board/spacemit/bananapi-f3/create-boot-script.sh rename to board/batocera/spacemit/bananapi-f3/create-boot-script.sh diff --git a/board/spacemit/bananapi-f3/fsoverlay/.gitkeep b/board/batocera/spacemit/bananapi-f3/fsoverlay/.gitkeep similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/.gitkeep rename to board/batocera/spacemit/bananapi-f3/fsoverlay/.gitkeep diff --git a/board/spacemit/bananapi-f3/fsoverlay/etc/profile.d/50-pvr.sh b/board/batocera/spacemit/bananapi-f3/fsoverlay/etc/profile.d/50-pvr.sh similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/etc/profile.d/50-pvr.sh rename to board/batocera/spacemit/bananapi-f3/fsoverlay/etc/profile.d/50-pvr.sh diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/chagall.bin b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/chagall.bin similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/chagall.bin rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/chagall.bin diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/esos.elf b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/esos.elf similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/esos.elf rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/esos.elf diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8723fs_config b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8723fs_config similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8723fs_config rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8723fs_config diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8723fs_fw b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8723fs_fw similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8723fs_fw rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8723fs_fw diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8821ds_config b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8821ds_config similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8821ds_config rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8821ds_config diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8821ds_fw b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8821ds_fw similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8821ds_fw rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8821ds_fw diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8851asa_config b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8851asa_config similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8851asa_config rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8851asa_config diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8851asa_fw b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8851asa_fw similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8851asa_fw rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8851asa_fw diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8852bsa_config b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8852bsa_config similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8852bsa_config rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8852bsa_config diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8852bsa_fw b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8852bsa_fw similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8852bsa_fw rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtl_bt/rtl8852bsa_fw diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8723b_config b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8723b_config similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8723b_config rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8723b_config diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8723b_fw b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8723b_fw similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8723b_fw rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8723b_fw diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8723d_config b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8723d_config similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8723d_config rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8723d_config diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8723d_fw b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8723d_fw similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8723d_fw rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8723d_fw diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8725as_config b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8725as_config similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8725as_config rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8725as_config diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8725as_fw b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8725as_fw similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8725as_fw rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8725as_fw diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8733bs_config b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8733bs_config similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8733bs_config rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8733bs_config diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8733bs_fw b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8733bs_fw similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8733bs_fw rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8733bs_fw diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761a_config b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761a_config similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761a_config rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761a_config diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761a_fw b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761a_fw similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761a_fw rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761a_fw diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761at8192ee_fw b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761at8192ee_fw similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761at8192ee_fw rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761at8192ee_fw diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761b_config b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761b_config similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761b_config rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761b_config diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761b_fw b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761b_fw similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761b_fw rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761b_fw diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761c_mx_config b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761c_mx_config similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761c_mx_config rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761c_mx_config diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761c_mx_fw b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761c_mx_fw similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761c_mx_fw rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8761c_mx_fw diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8821a_config b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8821a_config similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8821a_config rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8821a_config diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8821a_fw b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8821a_fw similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8821a_fw rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8821a_fw diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8821c_config b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8821c_config similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8821c_config rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8821c_config diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8821c_fw b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8821c_fw similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8821c_fw rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8821c_fw diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8822b_config b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8822b_config similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8822b_config rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8822b_config diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8822b_fw b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8822b_fw similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8822b_fw rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8822b_fw diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8822cs_config b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8822cs_config similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8822cs_config rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8822cs_config diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8822cs_fw b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8822cs_fw similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8822cs_fw rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8822cs_fw diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8822es_config b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8822es_config similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8822es_config rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8822es_config diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8822es_fw b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8822es_fw similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8822es_fw rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8822es_fw diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8851bs_config b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8851bs_config similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8851bs_config rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8851bs_config diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8851bs_fw b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8851bs_fw similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8851bs_fw rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8851bs_fw diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852as_config b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852as_config similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852as_config rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852as_config diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852as_fw b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852as_fw similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852as_fw rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852as_fw diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852bps_config b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852bps_config similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852bps_config rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852bps_config diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852bps_fw b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852bps_fw similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852bps_fw rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852bps_fw diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852bs_config b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852bs_config similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852bs_config rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852bs_config diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852bs_fw b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852bs_fw similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852bs_fw rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852bs_fw diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852cs_config b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852cs_config similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852cs_config rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852cs_config diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852cs_fw b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852cs_fw similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852cs_fw rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852cs_fw diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852ds_config b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852ds_config similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852ds_config rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852ds_config diff --git a/board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852ds_fw b/board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852ds_fw similarity index 100% rename from board/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852ds_fw rename to board/batocera/spacemit/bananapi-f3/fsoverlay/lib/firmware/rtlbt/rtl8852ds_fw diff --git a/board/spacemit/bananapi-f3/genimage.cfg b/board/batocera/spacemit/bananapi-f3/genimage.cfg similarity index 100% rename from board/spacemit/bananapi-f3/genimage.cfg rename to board/batocera/spacemit/bananapi-f3/genimage.cfg diff --git a/board/spacemit/bananapi-f3/linux-defconfig-fragment.config b/board/batocera/spacemit/bananapi-f3/linux-defconfig-fragment.config similarity index 100% rename from board/spacemit/bananapi-f3/linux-defconfig-fragment.config rename to board/batocera/spacemit/bananapi-f3/linux-defconfig-fragment.config diff --git a/board/spacemit/bananapi-f3/linux-defconfig.config b/board/batocera/spacemit/bananapi-f3/linux-defconfig.config similarity index 100% rename from board/spacemit/bananapi-f3/linux-defconfig.config rename to board/batocera/spacemit/bananapi-f3/linux-defconfig.config diff --git a/board/starfive/jh7110/boot/extlinux.conf b/board/batocera/starfive/jh7110/boot/extlinux.conf similarity index 100% rename from board/starfive/jh7110/boot/extlinux.conf rename to board/batocera/starfive/jh7110/boot/extlinux.conf diff --git a/board/starfive/jh7110/create-boot-script.sh b/board/batocera/starfive/jh7110/create-boot-script.sh similarity index 100% rename from board/starfive/jh7110/create-boot-script.sh rename to board/batocera/starfive/jh7110/create-boot-script.sh diff --git a/board/starfive/jh7110/dts/jh7110-milkv-mars.dts b/board/batocera/starfive/jh7110/dts/jh7110-milkv-mars.dts similarity index 100% rename from board/starfive/jh7110/dts/jh7110-milkv-mars.dts rename to board/batocera/starfive/jh7110/dts/jh7110-milkv-mars.dts diff --git a/board/starfive/jh7110/dts/jh7110-milkv-mars.dts.KO b/board/batocera/starfive/jh7110/dts/jh7110-milkv-mars.dts.KO similarity index 100% rename from board/starfive/jh7110/dts/jh7110-milkv-mars.dts.KO rename to board/batocera/starfive/jh7110/dts/jh7110-milkv-mars.dts.KO diff --git a/board/starfive/jh7110/fsoverlay/.gitkeep b/board/batocera/starfive/jh7110/fsoverlay/.gitkeep similarity index 100% rename from board/starfive/jh7110/fsoverlay/.gitkeep rename to board/batocera/starfive/jh7110/fsoverlay/.gitkeep diff --git a/board/starfive/jh7110/fsoverlay/lib/firmware/wave511_dec_fw.bin b/board/batocera/starfive/jh7110/fsoverlay/lib/firmware/wave511_dec_fw.bin similarity index 100% rename from board/starfive/jh7110/fsoverlay/lib/firmware/wave511_dec_fw.bin rename to board/batocera/starfive/jh7110/fsoverlay/lib/firmware/wave511_dec_fw.bin diff --git a/board/starfive/jh7110/genimage.cfg b/board/batocera/starfive/jh7110/genimage.cfg similarity index 100% rename from board/starfive/jh7110/genimage.cfg rename to board/batocera/starfive/jh7110/genimage.cfg diff --git a/board/starfive/jh7110/initrd/lib/firmware/esos.elf b/board/batocera/starfive/jh7110/initrd/lib/firmware/esos.elf similarity index 100% rename from board/starfive/jh7110/initrd/lib/firmware/esos.elf rename to board/batocera/starfive/jh7110/initrd/lib/firmware/esos.elf diff --git a/board/starfive/jh7110/initrd/lib/firmware/rgx.fw.36.50.54.182 b/board/batocera/starfive/jh7110/initrd/lib/firmware/rgx.fw.36.50.54.182 similarity index 100% rename from board/starfive/jh7110/initrd/lib/firmware/rgx.fw.36.50.54.182 rename to board/batocera/starfive/jh7110/initrd/lib/firmware/rgx.fw.36.50.54.182 diff --git a/board/starfive/jh7110/initrd/lib/firmware/rgx.sh.36.50.54.182 b/board/batocera/starfive/jh7110/initrd/lib/firmware/rgx.sh.36.50.54.182 similarity index 100% rename from board/starfive/jh7110/initrd/lib/firmware/rgx.sh.36.50.54.182 rename to board/batocera/starfive/jh7110/initrd/lib/firmware/rgx.sh.36.50.54.182 diff --git a/board/starfive/jh7110/initrd/lib/firmware/wave511_dec_fw.bin b/board/batocera/starfive/jh7110/initrd/lib/firmware/wave511_dec_fw.bin similarity index 100% rename from board/starfive/jh7110/initrd/lib/firmware/wave511_dec_fw.bin rename to board/batocera/starfive/jh7110/initrd/lib/firmware/wave511_dec_fw.bin diff --git a/board/starfive/jh7110/initrd/usr/lib/firmware/rgx.fw.36.50.54.182 b/board/batocera/starfive/jh7110/initrd/usr/lib/firmware/rgx.fw.36.50.54.182 similarity index 100% rename from board/starfive/jh7110/initrd/usr/lib/firmware/rgx.fw.36.50.54.182 rename to board/batocera/starfive/jh7110/initrd/usr/lib/firmware/rgx.fw.36.50.54.182 diff --git a/board/starfive/jh7110/initrd/usr/lib/firmware/rgx.sh.36.50.54.182 b/board/batocera/starfive/jh7110/initrd/usr/lib/firmware/rgx.sh.36.50.54.182 similarity index 100% rename from board/starfive/jh7110/initrd/usr/lib/firmware/rgx.sh.36.50.54.182 rename to board/batocera/starfive/jh7110/initrd/usr/lib/firmware/rgx.sh.36.50.54.182 diff --git a/board/starfive/jh7110/initrd/usr/lib/firmware/wave511_dec_fw.bin b/board/batocera/starfive/jh7110/initrd/usr/lib/firmware/wave511_dec_fw.bin similarity index 100% rename from board/starfive/jh7110/initrd/usr/lib/firmware/wave511_dec_fw.bin rename to board/batocera/starfive/jh7110/initrd/usr/lib/firmware/wave511_dec_fw.bin diff --git a/board/starfive/jh7110/linux-defconfig-fragment.config b/board/batocera/starfive/jh7110/linux-defconfig-fragment.config similarity index 100% rename from board/starfive/jh7110/linux-defconfig-fragment.config rename to board/batocera/starfive/jh7110/linux-defconfig-fragment.config diff --git a/board/starfive/jh7110/linux-defconfig.config b/board/batocera/starfive/jh7110/linux-defconfig.config similarity index 100% rename from board/starfive/jh7110/linux-defconfig.config rename to board/batocera/starfive/jh7110/linux-defconfig.config diff --git a/board/users.txt b/board/batocera/users.txt similarity index 100% rename from board/users.txt rename to board/batocera/users.txt diff --git a/board/x86-64-v3 b/board/batocera/x86-64-v3 similarity index 100% rename from board/x86-64-v3 rename to board/batocera/x86-64-v3 diff --git a/board/x86/boot/bootia32.csv b/board/batocera/x86/boot/bootia32.csv similarity index 100% rename from board/x86/boot/bootia32.csv rename to board/batocera/x86/boot/bootia32.csv diff --git a/board/x86/boot/bootx64.csv b/board/batocera/x86/boot/bootx64.csv similarity index 100% rename from board/x86/boot/bootx64.csv rename to board/batocera/x86/boot/bootx64.csv diff --git a/board/x86/boot/grub.cfg b/board/batocera/x86/boot/grub.cfg similarity index 100% rename from board/x86/boot/grub.cfg rename to board/batocera/x86/boot/grub.cfg diff --git a/board/x86/boot/syslinux.cfg b/board/batocera/x86/boot/syslinux.cfg similarity index 100% rename from board/x86/boot/syslinux.cfg rename to board/batocera/x86/boot/syslinux.cfg diff --git a/board/x86/create-boot-script.sh b/board/batocera/x86/create-boot-script.sh similarity index 100% rename from board/x86/create-boot-script.sh rename to board/batocera/x86/create-boot-script.sh diff --git a/board/x86/fsoverlay/etc/X11/xorg.conf.d/20-amdgpu.conf b/board/batocera/x86/fsoverlay/etc/X11/xorg.conf.d/20-amdgpu.conf similarity index 100% rename from board/x86/fsoverlay/etc/X11/xorg.conf.d/20-amdgpu.conf rename to board/batocera/x86/fsoverlay/etc/X11/xorg.conf.d/20-amdgpu.conf diff --git a/board/x86/fsoverlay/etc/X11/xorg.conf.d/20-radeon.conf b/board/batocera/x86/fsoverlay/etc/X11/xorg.conf.d/20-radeon.conf similarity index 100% rename from board/x86/fsoverlay/etc/X11/xorg.conf.d/20-radeon.conf rename to board/batocera/x86/fsoverlay/etc/X11/xorg.conf.d/20-radeon.conf diff --git a/board/x86/fsoverlay/etc/X11/xorg.conf.d/80-nvidia-egpu.conf b/board/batocera/x86/fsoverlay/etc/X11/xorg.conf.d/80-nvidia-egpu.conf similarity index 100% rename from board/x86/fsoverlay/etc/X11/xorg.conf.d/80-nvidia-egpu.conf rename to board/batocera/x86/fsoverlay/etc/X11/xorg.conf.d/80-nvidia-egpu.conf diff --git a/board/x86/fsoverlay/etc/X11/xorg.conf.d/99-avoid-joysticks.conf b/board/batocera/x86/fsoverlay/etc/X11/xorg.conf.d/99-avoid-joysticks.conf similarity index 100% rename from board/x86/fsoverlay/etc/X11/xorg.conf.d/99-avoid-joysticks.conf rename to board/batocera/x86/fsoverlay/etc/X11/xorg.conf.d/99-avoid-joysticks.conf diff --git a/board/x86/fsoverlay/etc/drirc b/board/batocera/x86/fsoverlay/etc/drirc similarity index 100% rename from board/x86/fsoverlay/etc/drirc rename to board/batocera/x86/fsoverlay/etc/drirc diff --git a/board/x86/fsoverlay/etc/gtk-2.0/gtkrc b/board/batocera/x86/fsoverlay/etc/gtk-2.0/gtkrc similarity index 100% rename from board/x86/fsoverlay/etc/gtk-2.0/gtkrc rename to board/batocera/x86/fsoverlay/etc/gtk-2.0/gtkrc diff --git a/board/x86/fsoverlay/etc/init.d/S001nvidia b/board/batocera/x86/fsoverlay/etc/init.d/S001nvidia similarity index 100% rename from board/x86/fsoverlay/etc/init.d/S001nvidia rename to board/batocera/x86/fsoverlay/etc/init.d/S001nvidia diff --git a/board/batocera/x86/fsoverlay/etc/init.d/S05nvidia b/board/batocera/x86/fsoverlay/etc/init.d/S05nvidia new file mode 100644 index 00000000000..e7a951dfaa2 --- /dev/null +++ b/board/batocera/x86/fsoverlay/etc/init.d/S05nvidia @@ -0,0 +1,38 @@ +#!/bin/sh + +if test "$1" != "start"; then + exit 0 +fi + +mkdir -p "/var/log" +log="/var/log/nvidia.log" + +echo > $log +echo "OS version: $(system-version)" >> $log +echo >> $log + +# detect the appropriate Nvidia driver +if grep -qE "^[ ]*nvidia-driver[ ]*=[ ]*true[ ]*$" /boot/system-boot.conf +then + echo "Manual setting to latest production driver" >> $log + batocera-nvidia production +elif grep -qE "^[ ]*nvidia-driver[ ]*=[ ]*legacy[ ]*$" /boot/system-boot.conf +then + echo "Manual setting to legacy 470 driver" >> $log + batocera-nvidia legacy +elif grep -qE "^[ ]*nvidia-driver[ ]*=[ ]*legacy390[ ]*$" /boot/system-boot.conf +then + echo "Manual setting to legacy 390 driver" >> $log + batocera-nvidia legacy390 +elif grep -qE "^[ ]*nvidia-driver[ ]*=[ ]*legacy340[ ]*$" /boot/system-boot.conf +then + echo "Manual setting to legacy 340 driver, however it's broken, using nouveau" >> $log + batocera-nvidia nouveau +elif grep -qE "^[ ]*nvidia-driver[ ]*=[ ]*false[ ]*$" /boot/system-boot.conf +then + echo "Manual setting to nouveau driver" >> $log + batocera-nvidia nouveau +else + echo "Using automatic Nvidia driver detection" >> $log + batocera-nvidia auto +fi diff --git a/board/x86/fsoverlay/etc/init.d/S10efivarfs b/board/batocera/x86/fsoverlay/etc/init.d/S10efivarfs similarity index 100% rename from board/x86/fsoverlay/etc/init.d/S10efivarfs rename to board/batocera/x86/fsoverlay/etc/init.d/S10efivarfs diff --git a/board/x86/fsoverlay/etc/init.d/S30checkprime b/board/batocera/x86/fsoverlay/etc/init.d/S30checkprime similarity index 100% rename from board/x86/fsoverlay/etc/init.d/S30checkprime rename to board/batocera/x86/fsoverlay/etc/init.d/S30checkprime diff --git a/board/x86/fsoverlay/etc/init.d/S70fans b/board/batocera/x86/fsoverlay/etc/init.d/S70fans similarity index 100% rename from board/x86/fsoverlay/etc/init.d/S70fans rename to board/batocera/x86/fsoverlay/etc/init.d/S70fans diff --git a/board/x86/fsoverlay/etc/init.d/S80leds b/board/batocera/x86/fsoverlay/etc/init.d/S80leds similarity index 100% rename from board/x86/fsoverlay/etc/init.d/S80leds rename to board/batocera/x86/fsoverlay/etc/init.d/S80leds diff --git a/board/x86/fsoverlay/etc/init.d/S92nvdownload b/board/batocera/x86/fsoverlay/etc/init.d/S92nvdownload similarity index 100% rename from board/x86/fsoverlay/etc/init.d/S92nvdownload rename to board/batocera/x86/fsoverlay/etc/init.d/S92nvdownload diff --git a/board/x86/fsoverlay/etc/init.d/S93amdtdp b/board/batocera/x86/fsoverlay/etc/init.d/S93amdtdp similarity index 100% rename from board/x86/fsoverlay/etc/init.d/S93amdtdp rename to board/batocera/x86/fsoverlay/etc/init.d/S93amdtdp diff --git a/board/x86/fsoverlay/etc/modprobe.d/8188eu.conf b/board/batocera/x86/fsoverlay/etc/modprobe.d/8188eu.conf similarity index 100% rename from board/x86/fsoverlay/etc/modprobe.d/8188eu.conf rename to board/batocera/x86/fsoverlay/etc/modprobe.d/8188eu.conf diff --git a/board/x86/fsoverlay/etc/modprobe.d/blacklist-ath_pci.conf b/board/batocera/x86/fsoverlay/etc/modprobe.d/blacklist-ath_pci.conf similarity index 100% rename from board/x86/fsoverlay/etc/modprobe.d/blacklist-ath_pci.conf rename to board/batocera/x86/fsoverlay/etc/modprobe.d/blacklist-ath_pci.conf diff --git a/board/x86/fsoverlay/etc/modprobe.d/blacklist-firewire.conf b/board/batocera/x86/fsoverlay/etc/modprobe.d/blacklist-firewire.conf similarity index 100% rename from board/x86/fsoverlay/etc/modprobe.d/blacklist-firewire.conf rename to board/batocera/x86/fsoverlay/etc/modprobe.d/blacklist-firewire.conf diff --git a/board/x86/fsoverlay/etc/modprobe.d/blacklist-framebuffer.conf b/board/batocera/x86/fsoverlay/etc/modprobe.d/blacklist-framebuffer.conf similarity index 100% rename from board/x86/fsoverlay/etc/modprobe.d/blacklist-framebuffer.conf rename to board/batocera/x86/fsoverlay/etc/modprobe.d/blacklist-framebuffer.conf diff --git a/board/x86/fsoverlay/etc/modprobe.d/blacklist-modem.conf b/board/batocera/x86/fsoverlay/etc/modprobe.d/blacklist-modem.conf similarity index 100% rename from board/x86/fsoverlay/etc/modprobe.d/blacklist-modem.conf rename to board/batocera/x86/fsoverlay/etc/modprobe.d/blacklist-modem.conf diff --git a/board/x86/fsoverlay/etc/modprobe.d/blacklist-oss.conf b/board/batocera/x86/fsoverlay/etc/modprobe.d/blacklist-oss.conf similarity index 100% rename from board/x86/fsoverlay/etc/modprobe.d/blacklist-oss.conf rename to board/batocera/x86/fsoverlay/etc/modprobe.d/blacklist-oss.conf diff --git a/board/x86/fsoverlay/etc/modprobe.d/blacklist-rare-network.conf b/board/batocera/x86/fsoverlay/etc/modprobe.d/blacklist-rare-network.conf similarity index 100% rename from board/x86/fsoverlay/etc/modprobe.d/blacklist-rare-network.conf rename to board/batocera/x86/fsoverlay/etc/modprobe.d/blacklist-rare-network.conf diff --git a/board/x86/fsoverlay/etc/modprobe.d/blacklist-watchdog.conf b/board/batocera/x86/fsoverlay/etc/modprobe.d/blacklist-watchdog.conf similarity index 100% rename from board/x86/fsoverlay/etc/modprobe.d/blacklist-watchdog.conf rename to board/batocera/x86/fsoverlay/etc/modprobe.d/blacklist-watchdog.conf diff --git a/board/x86/fsoverlay/etc/modprobe.d/blacklist.conf b/board/batocera/x86/fsoverlay/etc/modprobe.d/blacklist.conf similarity index 100% rename from board/x86/fsoverlay/etc/modprobe.d/blacklist.conf rename to board/batocera/x86/fsoverlay/etc/modprobe.d/blacklist.conf diff --git a/board/x86/fsoverlay/etc/modprobe.d/i915.conf b/board/batocera/x86/fsoverlay/etc/modprobe.d/i915.conf similarity index 100% rename from board/x86/fsoverlay/etc/modprobe.d/i915.conf rename to board/batocera/x86/fsoverlay/etc/modprobe.d/i915.conf diff --git a/board/x86/fsoverlay/etc/modprobe.d/iwlmvm.conf b/board/batocera/x86/fsoverlay/etc/modprobe.d/iwlmvm.conf similarity index 100% rename from board/x86/fsoverlay/etc/modprobe.d/iwlmvm.conf rename to board/batocera/x86/fsoverlay/etc/modprobe.d/iwlmvm.conf diff --git a/board/x86/fsoverlay/etc/pm/sleep.d/99resume_tdp b/board/batocera/x86/fsoverlay/etc/pm/sleep.d/99resume_tdp similarity index 100% rename from board/x86/fsoverlay/etc/pm/sleep.d/99resume_tdp rename to board/batocera/x86/fsoverlay/etc/pm/sleep.d/99resume_tdp diff --git a/board/x86/fsoverlay/etc/pm/sleep.d/99resume_touchscreen b/board/batocera/x86/fsoverlay/etc/pm/sleep.d/99resume_touchscreen similarity index 100% rename from board/x86/fsoverlay/etc/pm/sleep.d/99resume_touchscreen rename to board/batocera/x86/fsoverlay/etc/pm/sleep.d/99resume_touchscreen diff --git a/board/x86/fsoverlay/etc/pm/sleep.d/99resume_wifi b/board/batocera/x86/fsoverlay/etc/pm/sleep.d/99resume_wifi similarity index 100% rename from board/x86/fsoverlay/etc/pm/sleep.d/99resume_wifi rename to board/batocera/x86/fsoverlay/etc/pm/sleep.d/99resume_wifi diff --git a/board/x86/fsoverlay/etc/pm/sleep.d/99tweak_controller b/board/batocera/x86/fsoverlay/etc/pm/sleep.d/99tweak_controller similarity index 100% rename from board/x86/fsoverlay/etc/pm/sleep.d/99tweak_controller rename to board/batocera/x86/fsoverlay/etc/pm/sleep.d/99tweak_controller diff --git a/board/x86/fsoverlay/etc/sysctl.conf b/board/batocera/x86/fsoverlay/etc/sysctl.conf similarity index 100% rename from board/x86/fsoverlay/etc/sysctl.conf rename to board/batocera/x86/fsoverlay/etc/sysctl.conf diff --git a/board/x86/fsoverlay/etc/udev/rules.d/99-asrock-LED-controller.rules b/board/batocera/x86/fsoverlay/etc/udev/rules.d/99-asrock-LED-controller.rules similarity index 100% rename from board/x86/fsoverlay/etc/udev/rules.d/99-asrock-LED-controller.rules rename to board/batocera/x86/fsoverlay/etc/udev/rules.d/99-asrock-LED-controller.rules diff --git a/board/x86/fsoverlay/etc/udev/rules.d/99-thunderbolt.rules b/board/batocera/x86/fsoverlay/etc/udev/rules.d/99-thunderbolt.rules similarity index 100% rename from board/x86/fsoverlay/etc/udev/rules.d/99-thunderbolt.rules rename to board/batocera/x86/fsoverlay/etc/udev/rules.d/99-thunderbolt.rules diff --git a/board/x86/fsoverlay/usr/modprobe.d/alsa-base.conf b/board/batocera/x86/fsoverlay/usr/modprobe.d/alsa-base.conf similarity index 100% rename from board/x86/fsoverlay/usr/modprobe.d/alsa-base.conf rename to board/batocera/x86/fsoverlay/usr/modprobe.d/alsa-base.conf diff --git a/board/x86/fsoverlay/usr/share/applications/defaults.list b/board/batocera/x86/fsoverlay/usr/share/applications/defaults.list similarity index 100% rename from board/x86/fsoverlay/usr/share/applications/defaults.list rename to board/batocera/x86/fsoverlay/usr/share/applications/defaults.list diff --git a/board/x86/genimage-boot.cfg b/board/batocera/x86/genimage-boot.cfg similarity index 100% rename from board/x86/genimage-boot.cfg rename to board/batocera/x86/genimage-boot.cfg diff --git a/board/x86/genimage.cfg b/board/batocera/x86/genimage.cfg similarity index 100% rename from board/x86/genimage.cfg rename to board/batocera/x86/genimage.cfg diff --git a/board/x86/linux_patches/01_linux_15khz.patch b/board/batocera/x86/linux_patches/01_linux_15khz.patch similarity index 100% rename from board/x86/linux_patches/01_linux_15khz.patch rename to board/batocera/x86/linux_patches/01_linux_15khz.patch diff --git a/board/x86/linux_patches/02_linux_15khz_interlaced_mode_fix.patch b/board/batocera/x86/linux_patches/02_linux_15khz_interlaced_mode_fix.patch similarity index 100% rename from board/x86/linux_patches/02_linux_15khz_interlaced_mode_fix.patch rename to board/batocera/x86/linux_patches/02_linux_15khz_interlaced_mode_fix.patch diff --git a/board/x86/linux_patches/03_linux_15khz_dcn1_dcn2_interlaced_mode_fix.patch b/board/batocera/x86/linux_patches/03_linux_15khz_dcn1_dcn2_interlaced_mode_fix.patch similarity index 100% rename from board/x86/linux_patches/03_linux_15khz_dcn1_dcn2_interlaced_mode_fix.patch rename to board/batocera/x86/linux_patches/03_linux_15khz_dcn1_dcn2_interlaced_mode_fix.patch diff --git a/board/x86/linux_patches/04_linux_15khz_dce_interlaced_mode_fix.patch b/board/batocera/x86/linux_patches/04_linux_15khz_dce_interlaced_mode_fix.patch similarity index 100% rename from board/x86/linux_patches/04_linux_15khz_dce_interlaced_mode_fix.patch rename to board/batocera/x86/linux_patches/04_linux_15khz_dce_interlaced_mode_fix.patch diff --git a/board/x86/linux_patches/05_linux_15khz_amdgpu_pll_fix.patch b/board/batocera/x86/linux_patches/05_linux_15khz_amdgpu_pll_fix.patch similarity index 100% rename from board/x86/linux_patches/05_linux_15khz_amdgpu_pll_fix.patch rename to board/batocera/x86/linux_patches/05_linux_15khz_amdgpu_pll_fix.patch diff --git a/board/x86/linux_patches/06_linux_switchres_kms_drm_modesetting.patch b/board/batocera/x86/linux_patches/06_linux_switchres_kms_drm_modesetting.patch similarity index 100% rename from board/x86/linux_patches/06_linux_switchres_kms_drm_modesetting.patch rename to board/batocera/x86/linux_patches/06_linux_switchres_kms_drm_modesetting.patch diff --git a/board/x86/linux_patches/07-linux-battery-quircks.patch b/board/batocera/x86/linux_patches/07-linux-battery-quircks.patch similarity index 100% rename from board/x86/linux_patches/07-linux-battery-quircks.patch rename to board/batocera/x86/linux_patches/07-linux-battery-quircks.patch diff --git a/board/x86/linux_patches/07_linux_15khz_fix_ddc.patch b/board/batocera/x86/linux_patches/07_linux_15khz_fix_ddc.patch similarity index 100% rename from board/x86/linux_patches/07_linux_15khz_fix_ddc.patch rename to board/batocera/x86/linux_patches/07_linux_15khz_fix_ddc.patch diff --git a/board/x86/linux_patches/08-linux-hda-Avoid-outputting-HDMI-audio-before-prepare.patch b/board/batocera/x86/linux_patches/08-linux-hda-Avoid-outputting-HDMI-audio-before-prepare.patch similarity index 100% rename from board/x86/linux_patches/08-linux-hda-Avoid-outputting-HDMI-audio-before-prepare.patch rename to board/batocera/x86/linux_patches/08-linux-hda-Avoid-outputting-HDMI-audio-before-prepare.patch diff --git a/board/x86/linux_patches/09-linux-usbhid-quircks.patch b/board/batocera/x86/linux_patches/09-linux-usbhid-quircks.patch similarity index 100% rename from board/x86/linux_patches/09-linux-usbhid-quircks.patch rename to board/batocera/x86/linux_patches/09-linux-usbhid-quircks.patch diff --git a/board/x86/linux_patches/10-linux-wiimote-abs-not-hat.patch b/board/batocera/x86/linux_patches/10-linux-wiimote-abs-not-hat.patch similarity index 100% rename from board/x86/linux_patches/10-linux-wiimote-abs-not-hat.patch rename to board/batocera/x86/linux_patches/10-linux-wiimote-abs-not-hat.patch diff --git a/board/x86/linux_patches/11-bluetooth-Align-minimum-encryption-key-size.patch b/board/batocera/x86/linux_patches/11-bluetooth-Align-minimum-encryption-key-size.patch similarity index 100% rename from board/x86/linux_patches/11-bluetooth-Align-minimum-encryption-key-size.patch rename to board/batocera/x86/linux_patches/11-bluetooth-Align-minimum-encryption-key-size.patch diff --git a/board/x86/linux_patches/12-fsync1_via_futex_waitv.patch b/board/batocera/x86/linux_patches/12-fsync1_via_futex_waitv.patch similarity index 100% rename from board/x86/linux_patches/12-fsync1_via_futex_waitv.patch rename to board/batocera/x86/linux_patches/12-fsync1_via_futex_waitv.patch diff --git a/board/x86/linux_patches/13-winesync.patch b/board/batocera/x86/linux_patches/13-winesync.patch similarity index 100% rename from board/x86/linux_patches/13-winesync.patch rename to board/batocera/x86/linux_patches/13-winesync.patch diff --git a/board/x86/linux_patches/14-fix-amd.patch b/board/batocera/x86/linux_patches/14-fix-amd.patch similarity index 100% rename from board/x86/linux_patches/14-fix-amd.patch rename to board/batocera/x86/linux_patches/14-fix-amd.patch diff --git a/board/x86/linux_patches/15-iwlwifi-ax101.patch.disabled b/board/batocera/x86/linux_patches/15-iwlwifi-ax101.patch.disabled similarity index 100% rename from board/x86/linux_patches/15-iwlwifi-ax101.patch.disabled rename to board/batocera/x86/linux_patches/15-iwlwifi-ax101.patch.disabled diff --git a/board/x86/linux_patches/16-steam-deck-l2-r2.patch b/board/batocera/x86/linux_patches/16-steam-deck-l2-r2.patch similarity index 100% rename from board/x86/linux_patches/16-steam-deck-l2-r2.patch rename to board/batocera/x86/linux_patches/16-steam-deck-l2-r2.patch diff --git a/board/x86/linux_patches/17-add-ROG-Ally-BT.patch b/board/batocera/x86/linux_patches/17-add-ROG-Ally-BT.patch similarity index 100% rename from board/x86/linux_patches/17-add-ROG-Ally-BT.patch rename to board/batocera/x86/linux_patches/17-add-ROG-Ally-BT.patch diff --git a/board/x86/linux_patches/19-usb-Add-hid_id-and-keys-for-ASUS-ROG-ALLY-handheld.patch.6.5 b/board/batocera/x86/linux_patches/19-usb-Add-hid_id-and-keys-for-ASUS-ROG-ALLY-handheld.patch.6.5 similarity index 100% rename from board/x86/linux_patches/19-usb-Add-hid_id-and-keys-for-ASUS-ROG-ALLY-handheld.patch.6.5 rename to board/batocera/x86/linux_patches/19-usb-Add-hid_id-and-keys-for-ASUS-ROG-ALLY-handheld.patch.6.5 diff --git a/board/batocera/x86/linux_patches/20-ayn-loki-zero-orientation.patch b/board/batocera/x86/linux_patches/20-ayn-loki-zero-orientation.patch new file mode 100644 index 00000000000..32544f49e11 --- /dev/null +++ b/board/batocera/x86/linux_patches/20-ayn-loki-zero-orientation.patch @@ -0,0 +1,15 @@ +--- a/drivers/gpu/drm/drm_panel_orientation_quirks.c 2024-07-25 14:30:32.424290849 +0200 ++++ b/drivers/gpu/drm/drm_panel_orientation_quirks.c 2024-07-25 14:31:45.389928268 +0200 +@@ -208,6 +208,12 @@ + DMI_MATCH(DMI_BOARD_NAME, "KUN"), + }, + .driver_data = (void *)&lcd1600x2560_rightside_up, ++ }, { /* AYN LOKI ZERO */ ++ .matches = { ++ DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "ayn"), ++ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Loki Zero"), ++ }, ++ .driver_data = (void *)&lcd1080x1920_leftside_up, + }, { /* Chuwi HiBook (CWI514) */ + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "Hampoo"), diff --git a/board/x86/linux_patches/21-ayn-loki-zero-headset-fix.patch b/board/batocera/x86/linux_patches/21-ayn-loki-zero-headset-fix.patch similarity index 100% rename from board/x86/linux_patches/21-ayn-loki-zero-headset-fix.patch rename to board/batocera/x86/linux_patches/21-ayn-loki-zero-headset-fix.patch diff --git a/board/x86/linux_patches/22-steam-deck-oled-bt-codec.patch b/board/batocera/x86/linux_patches/22-steam-deck-oled-bt-codec.patch similarity index 100% rename from board/x86/linux_patches/22-steam-deck-oled-bt-codec.patch rename to board/batocera/x86/linux_patches/22-steam-deck-oled-bt-codec.patch diff --git a/board/x86/linux_patches/23-ThrustMaster_Ferrari_458_Spider.patch b/board/batocera/x86/linux_patches/23-ThrustMaster_Ferrari_458_Spider.patch similarity index 100% rename from board/x86/linux_patches/23-ThrustMaster_Ferrari_458_Spider.patch rename to board/batocera/x86/linux_patches/23-ThrustMaster_Ferrari_458_Spider.patch diff --git a/board/x86/linux_patches/23-steam-deck-oled-orientation.patch b/board/batocera/x86/linux_patches/23-steam-deck-oled-orientation.patch similarity index 100% rename from board/x86/linux_patches/23-steam-deck-oled-orientation.patch rename to board/batocera/x86/linux_patches/23-steam-deck-oled-orientation.patch diff --git a/board/x86/linux_patches/24-steam-deck-dock-fix.patch b/board/batocera/x86/linux_patches/24-steam-deck-dock-fix.patch similarity index 100% rename from board/x86/linux_patches/24-steam-deck-dock-fix.patch rename to board/batocera/x86/linux_patches/24-steam-deck-dock-fix.patch diff --git a/board/x86/linux_patches/25-steam-deck-start-as-gamepad.patch b/board/batocera/x86/linux_patches/25-steam-deck-start-as-gamepad.patch similarity index 100% rename from board/x86/linux_patches/25-steam-deck-start-as-gamepad.patch rename to board/batocera/x86/linux_patches/25-steam-deck-start-as-gamepad.patch diff --git a/board/x86/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch b/board/batocera/x86/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch similarity index 100% rename from board/x86/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch rename to board/batocera/x86/linux_patches/uvc-bandwidth_cap_param-for-sinden.patch diff --git a/board/x86/linux_x86-defconfig.config b/board/batocera/x86/linux_x86-defconfig.config similarity index 100% rename from board/x86/linux_x86-defconfig.config rename to board/batocera/x86/linux_x86-defconfig.config diff --git a/board/x86/linux_x86_64-defconfig.config b/board/batocera/x86/linux_x86_64-defconfig.config similarity index 100% rename from board/x86/linux_x86_64-defconfig.config rename to board/batocera/x86/linux_x86_64-defconfig.config diff --git a/board/x86/patches/.keep b/board/batocera/x86/patches/.keep similarity index 100% rename from board/x86/patches/.keep rename to board/batocera/x86/patches/.keep diff --git a/board/x86/patches/batocera-nvidia-driver/001-no-retpoline.patch b/board/batocera/x86/patches/batocera-nvidia-driver/001-no-retpoline.patch similarity index 100% rename from board/x86/patches/batocera-nvidia-driver/001-no-retpoline.patch rename to board/batocera/x86/patches/batocera-nvidia-driver/001-no-retpoline.patch diff --git a/board/x86/patches/mupen64plus-gliden64/mupen64plus-gliden64-001-compilation.patch b/board/batocera/x86/patches/mupen64plus-gliden64/mupen64plus-gliden64-001-compilation.patch similarity index 100% rename from board/x86/patches/mupen64plus-gliden64/mupen64plus-gliden64-001-compilation.patch rename to board/batocera/x86/patches/mupen64plus-gliden64/mupen64plus-gliden64-001-compilation.patch diff --git a/board/x86/patches/ppsspp/001-x86-vulkan-x11-no-wayland.patch b/board/batocera/x86/patches/ppsspp/001-x86-vulkan-x11-no-wayland.patch similarity index 100% rename from board/x86/patches/ppsspp/001-x86-vulkan-x11-no-wayland.patch rename to board/batocera/x86/patches/ppsspp/001-x86-vulkan-x11-no-wayland.patch diff --git a/board/x86/patches/vita3k/003-drop-xdg-desktop-portals.patch b/board/batocera/x86/patches/vita3k/003-drop-xdg-desktop-portals.patch similarity index 100% rename from board/x86/patches/vita3k/003-drop-xdg-desktop-portals.patch rename to board/batocera/x86/patches/vita3k/003-drop-xdg-desktop-portals.patch diff --git a/board/x86_64 b/board/batocera/x86_64 similarity index 100% rename from board/x86_64 rename to board/batocera/x86_64 diff --git a/board/x86_64-v3/patches/vita3k/001-xxhash-allow-avx.patch b/board/batocera/x86_64-v3/patches/vita3k/001-xxhash-allow-avx.patch similarity index 100% rename from board/x86_64-v3/patches/vita3k/001-xxhash-allow-avx.patch rename to board/batocera/x86_64-v3/patches/vita3k/001-xxhash-allow-avx.patch diff --git a/board/x86_64_v3/boot b/board/batocera/x86_64_v3/boot similarity index 100% rename from board/x86_64_v3/boot rename to board/batocera/x86_64_v3/boot diff --git a/board/x86_64_v3/create-boot-script.sh b/board/batocera/x86_64_v3/create-boot-script.sh similarity index 100% rename from board/x86_64_v3/create-boot-script.sh rename to board/batocera/x86_64_v3/create-boot-script.sh diff --git a/board/x86_64_v3/fsoverlay b/board/batocera/x86_64_v3/fsoverlay similarity index 100% rename from board/x86_64_v3/fsoverlay rename to board/batocera/x86_64_v3/fsoverlay diff --git a/board/x86_64_v3/genimage-boot.cfg b/board/batocera/x86_64_v3/genimage-boot.cfg similarity index 100% rename from board/x86_64_v3/genimage-boot.cfg rename to board/batocera/x86_64_v3/genimage-boot.cfg diff --git a/board/x86_64_v3/genimage.cfg b/board/batocera/x86_64_v3/genimage.cfg similarity index 100% rename from board/x86_64_v3/genimage.cfg rename to board/batocera/x86_64_v3/genimage.cfg diff --git a/board/x86_64_v3/linux_patches b/board/batocera/x86_64_v3/linux_patches similarity index 100% rename from board/x86_64_v3/linux_patches rename to board/batocera/x86_64_v3/linux_patches diff --git a/board/x86_64_v3/linux_x86_64-defconfig.config b/board/batocera/x86_64_v3/linux_x86_64-defconfig.config similarity index 100% rename from board/x86_64_v3/linux_x86_64-defconfig.config rename to board/batocera/x86_64_v3/linux_x86_64-defconfig.config diff --git a/board/x86_64_v3/patches b/board/batocera/x86_64_v3/patches similarity index 100% rename from board/x86_64_v3/patches rename to board/batocera/x86_64_v3/patches diff --git a/configs/reglinux-a3gen2.board b/configs/reglinux-a3gen2.board index 12a88a575aa..d570a19d8a1 100644 --- a/configs/reglinux-a3gen2.board +++ b/configs/reglinux-a3gen2.board @@ -9,8 +9,8 @@ BR2_PACKAGE_BATOCERA_TARGET_A3GEN2=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char -mcpu=cortex-a73.cortex-a53 -mtune=cortex-a73.cortex-a53" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_KEEP=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/a3gen2/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/a3gen2/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/a3gen2/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/a3gen2/fsoverlay" # Linux headers same as kernel, a 5.4 series BR2_KERNEL_HEADERS_AS_KERNEL=y @@ -20,10 +20,10 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/khadas/linux/archive/refs/tags/khadas-vims-linux-5.4-v1.5.2-release.tar.gz" -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/a3gen2/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/khadas-5.4" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/a3gen2/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/khadas-5.4" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/a3gen2/linux-kvim4-5.4.180.config" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/a3gen2/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/a3gen2/linux-kvim4-5.4.180.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/a3gen2/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Build the DTB from the kernel sources diff --git a/configs/reglinux-bcm2711.board b/configs/reglinux-bcm2711.board index ca43a3e0dac..7ab24f32b05 100644 --- a/configs/reglinux-bcm2711.board +++ b/configs/reglinux-bcm2711.board @@ -9,8 +9,8 @@ BR2_PACKAGE_BATOCERA_TARGET_BCM2711=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char -mcpu=cortex-a72 -mtune=cortex-a72" #BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/broadcom/bcm2711/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/broadcom/bcm2711/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/broadcom/bcm2711/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/broadcom/bcm2711/fsoverlay" BR2_TARGET_ROOTFS_SQUASHFS4_ZSTD=y # Linux headers same as kernel, a 6.6 series @@ -22,10 +22,10 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,8c9ca647449ba9df7e3b300c480242f9b5bdd867)/linux-8c9ca647449ba9df7e3b300c480242f9b5bdd867.tar.gz" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/broadcom/bcm2711/linux-broadcom64-current.config" -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/broadcom/linux_patches" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/broadcom/bcm2711/linux-broadcom64-current.config" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/broadcom/linux_patches" # Temp disable limit 1080p patch $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/broadcom/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/broadcom/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Build the DTB from the kernel sources diff --git a/configs/reglinux-bcm2712.board b/configs/reglinux-bcm2712.board index a85c1705c66..c53326195bf 100644 --- a/configs/reglinux-bcm2712.board +++ b/configs/reglinux-bcm2712.board @@ -9,8 +9,8 @@ BR2_PACKAGE_BATOCERA_TARGET_BCM2712=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char -mcpu=cortex-a76 -mtune=cortex-a76" #BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/broadcom/bcm2712/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/broadcom/bcm2712/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/broadcom/bcm2712/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/broadcom/bcm2712/fsoverlay" BR2_TARGET_ROOTFS_SQUASHFS4_ZSTD=y # Linux headers same as kernel, a 6.6 series @@ -22,10 +22,10 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,8c9ca647449ba9df7e3b300c480242f9b5bdd867)/linux-8c9ca647449ba9df7e3b300c480242f9b5bdd867.tar.gz" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/broadcom/bcm2712/linux-broadcom64-current.config" -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/broadcom/linux_patches" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/broadcom/bcm2712/linux-broadcom64-current.config" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/broadcom/linux_patches" # Temp disable limit 1080p patch $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/broadcom/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/broadcom/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Build the DTB from the kernel sources diff --git a/configs/reglinux-bcm2835.board b/configs/reglinux-bcm2835.board index 1a30c55261e..7ff602b65f3 100644 --- a/configs/reglinux-bcm2835.board +++ b/configs/reglinux-bcm2835.board @@ -9,8 +9,8 @@ BR2_PACKAGE_BATOCERA_TARGET_BCM2835=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char" #BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/broadcom/bcm2835/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/broadcom/bcm2835/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/broadcom/bcm2835/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/broadcom/bcm2835/fsoverlay" # Use LZ4 for this target. Do not change ! BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y @@ -23,10 +23,10 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,8c9ca647449ba9df7e3b300c480242f9b5bdd867)/linux-8c9ca647449ba9df7e3b300c480242f9b5bdd867.tar.gz" -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/broadcom/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/arm" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/broadcom/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/arm" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/broadcom/bcm2835/linux-broadcom32-current.config" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/broadcom/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/broadcom/bcm2835/linux-broadcom32-current.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/broadcom/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Build the DTB from the kernel sources diff --git a/configs/reglinux-bcm2836.board b/configs/reglinux-bcm2836.board index 20150698b73..53479916a52 100644 --- a/configs/reglinux-bcm2836.board +++ b/configs/reglinux-bcm2836.board @@ -10,8 +10,8 @@ BR2_PACKAGE_BATOCERA_TARGET_BCM2836=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char" #BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/broadcom/bcm2836/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/broadcom/bcm2836/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/broadcom/bcm2836/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/broadcom/bcm2836/fsoverlay" # Use LZ4 for this target. Do not change ! BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y @@ -24,10 +24,10 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,8c9ca647449ba9df7e3b300c480242f9b5bdd867)/linux-8c9ca647449ba9df7e3b300c480242f9b5bdd867.tar.gz" -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/broadcom/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/arm" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/broadcom/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/arm" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/broadcom/bcm2836/linux-broadcom32-current.config" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/broadcom/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/broadcom/bcm2836/linux-broadcom32-current.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/broadcom/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Build the DTB from the kernel sources diff --git a/configs/reglinux-bcm2837.board b/configs/reglinux-bcm2837.board index 28d35e405da..615435080cc 100644 --- a/configs/reglinux-bcm2837.board +++ b/configs/reglinux-bcm2837.board @@ -9,8 +9,8 @@ BR2_PACKAGE_BATOCERA_TARGET_BCM2837=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char -mcpu=cortex-a53 -mtune=cortex-a53" #BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/broadcom/bcm2837/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/broadcom/bcm2837/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/broadcom/bcm2837/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/broadcom/bcm2837/fsoverlay" BR2_TARGET_ROOTFS_SQUASHFS4_ZSTD=y # Linux headers same as kernel, a 6.6 series @@ -21,10 +21,10 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,8c9ca647449ba9df7e3b300c480242f9b5bdd867)/linux-8c9ca647449ba9df7e3b300c480242f9b5bdd867.tar.gz" -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/broadcom/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/broadcom/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/broadcom/bcm2837/linux-broadcom64-current.config" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/broadcom/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/broadcom/bcm2837/linux-broadcom64-current.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/broadcom/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Build the DTB from the kernel sources diff --git a/configs/reglinux-board.common b/configs/reglinux-board.common index 5689a4ae449..8054e6c1f01 100644 --- a/configs/reglinux-board.common +++ b/configs/reglinux-board.common @@ -1,5 +1,5 @@ # users -BR2_ROOTFS_USERS_TABLES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/users.txt" +BR2_ROOTFS_USERS_TABLES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/users.txt" BR2_STRIP_EXCLUDE_DIRS="usr/ryujinx usr/bin/vpinball usr/share/ecwolf usr/bin/vita3k usr/bin/dmdserver" @@ -86,14 +86,14 @@ BR2_PACKAGE_BATOCERA_TOOLS=y BR2_PACKAGE_BATOCERA_ALL_SYSTEMS=y BR2_PACKAGE_BATOCERA_LINUX_FIRMWARES=y BR2_SYSTEM_BIN_SH_DASH=y # /bin/sh implementation; set here because a `choice` cannot be `select`ed, e.g. from batocera-system/Config.in -BR2_PACKAGE_DROPBEAR_LOCALOPTIONS_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/dropbear_localoptions.h" +BR2_PACKAGE_DROPBEAR_LOCALOPTIONS_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/dropbear_localoptions.h" # Disable generating rootfs tar (speedup) BR2_TARGET_ROOTFS_TAR=n # post-build/post-image scripts -BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_BATOCERA_PATH)/board/scripts/post-build-script.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_BATOCERA_PATH)/board/scripts/post-image-script.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/scripts/post-build-script.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/scripts/post-image-script.sh" # squashfs images BR2_PACKAGE_HOST_SQUASHFS=y diff --git a/configs/reglinux-cha.board b/configs/reglinux-cha.board index a533ab26d38..09a2d6553e0 100644 --- a/configs/reglinux-cha.board +++ b/configs/reglinux-cha.board @@ -10,8 +10,8 @@ BR2_PACKAGE_BATOCERA_TARGET_CHA=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char" #BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/h3/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/h3/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h3/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h3/fsoverlay" # Use ZSTD for this target. Do not change ! BR2_TARGET_ROOTFS_SQUASHFS4_ZSTD=y @@ -22,10 +22,10 @@ BR2_PACKAGE_UBOOT_MULTIBOARD=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_LATEST_VERSION=y -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/arm" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/arm" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/linux-sunxi32-current.config" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/linux-sunxi32-current.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Build the DTB from the kernel sources diff --git a/configs/reglinux-h3.board b/configs/reglinux-h3.board index 6f16eef668b..82cafddf8d9 100644 --- a/configs/reglinux-h3.board +++ b/configs/reglinux-h3.board @@ -10,8 +10,8 @@ BR2_PACKAGE_BATOCERA_TARGET_H3=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char" #BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/h3/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/h3/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h3/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h3/fsoverlay" # Use LZ4 for this target. Do not change ! BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y @@ -22,10 +22,10 @@ BR2_PACKAGE_UBOOT_MULTIBOARD=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_LATEST_VERSION=y -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/arm" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/arm" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/linux-sunxi32-current.config" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/linux-sunxi32-current.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Build the DTB from the kernel sources diff --git a/configs/reglinux-h5.board b/configs/reglinux-h5.board index 7c8854067d3..a6bdbbc4da9 100644 --- a/configs/reglinux-h5.board +++ b/configs/reglinux-h5.board @@ -9,17 +9,17 @@ BR2_PACKAGE_BATOCERA_TARGET_H5=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char" #BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/h5/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/h5/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h5/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h5/fsoverlay" BR2_TARGET_ROOTFS_SQUASHFS4_ZSTD=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_LATEST_VERSION=y -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/linux-sunxi64-current.config" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/linux-sunxi64-current.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Build the DTB from the kernel sources diff --git a/configs/reglinux-h6.board b/configs/reglinux-h6.board index 848b83621f8..1abdaf9c3ab 100644 --- a/configs/reglinux-h6.board +++ b/configs/reglinux-h6.board @@ -9,17 +9,17 @@ BR2_PACKAGE_BATOCERA_TARGET_H6=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char" #BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/h6/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/h6/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h6/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h6/fsoverlay" BR2_TARGET_ROOTFS_SQUASHFS4_ZSTD=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_LATEST_VERSION=y -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/linux-sunxi64-current.config" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/linux-sunxi64-current.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Build the DTB from the kernel sources diff --git a/configs/reglinux-h616.board b/configs/reglinux-h616.board index e8d0002f80e..493c35a648b 100644 --- a/configs/reglinux-h616.board +++ b/configs/reglinux-h616.board @@ -9,23 +9,23 @@ BR2_PACKAGE_BATOCERA_TARGET_H616=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char -mcpu=cortex-a53 -mtune=cortex-a53" #BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/h616/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/h616/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h616/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h616/fsoverlay" BR2_TARGET_ROOTFS_SQUASHFS4_ZSTD=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_LATEST_VERSION=y -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/h616/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h616/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/h616/linux-sunxi64-current.config" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/h616/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h616/linux-sunxi64-current.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h616/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h616-x96-mate allwinner/sun50i-h616-orangepi-zero2 allwinner/sun50i-h618-orangepi-zero3" -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/h616/dts/sun50i-h616-mangopi-mqquad.dts $(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/h616/dts/sun50i-h618-bananapi-m4berry.dts $(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/h616/dts/sun50i-h618-orangepi-zero2w.dts $(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/h616/dts/sun50i-h618-bananapi-m4zero.dts $(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/h616/dts/sun50i-h700-anbernic-rg35xx-2024.dts $(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/h616/dts/sun50i-h700-anbernic-rg35xx-h.dts $(BR2_EXTERNAL_BATOCERA_PATH)/board/allwinner/h616/dts/sun50i-h700-anbernic-rg35xx-plus.dts" +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h616/dts/sun50i-h616-mangopi-mqquad.dts $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h616/dts/sun50i-h618-bananapi-m4berry.dts $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h616/dts/sun50i-h618-orangepi-zero2w.dts $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h616/dts/sun50i-h618-bananapi-m4zero.dts $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h616/dts/sun50i-h700-anbernic-rg35xx-2024.dts $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h616/dts/sun50i-h700-anbernic-rg35xx-h.dts $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h616/dts/sun50i-h700-anbernic-rg35xx-plus.dts" # GPU BR2_PACKAGE_BATOCERA_PANFROST_MESA3D=y diff --git a/configs/reglinux-jh7110.board b/configs/reglinux-jh7110.board index 27556534af8..ce9f38de647 100644 --- a/configs/reglinux-jh7110.board +++ b/configs/reglinux-jh7110.board @@ -11,8 +11,8 @@ BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char -mabi=lp64d -mcpu=sifive-u74" BR2_BINUTILS_VERSION_2_41_X=y #BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/riscv64" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/starfive/jh7110/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/riscv64" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/starfive/jh7110/fsoverlay" BR2_TARGET_ROOTFS_SQUASHFS4_ZSTD=y # Linux headers same as kernel, a 6.6 series @@ -24,15 +24,15 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,linux,22919f9dcd75788d1a38d0884e060bc6f4389937)/linux-22919f9dcd75788d1a38d0884e060bc6f4389937.tar.gz" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/starfive/jh7110/linux-defconfig.config" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/starfive/jh7110/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/starfive/jh7110/linux-defconfig.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/starfive/jh7110/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7110-starfive-visionfive-2-v1.2a starfive/jh7110-starfive-visionfive-2-v1.3b" -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/starfive/jh7110/dts/jh7110-milkv-mars.dts" +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/starfive/jh7110/dts/jh7110-milkv-mars.dts" # use blob + patched mesa BR2_PACKAGE_IMG_GPU_POWERVR=y diff --git a/configs/reglinux-jz4770.board b/configs/reglinux-jz4770.board index 9f170aa3473..56acce6c88d 100644 --- a/configs/reglinux-jz4770.board +++ b/configs/reglinux-jz4770.board @@ -9,8 +9,8 @@ BR2_PACKAGE_BATOCERA_TARGET_JZ4770=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char" #BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/ingenic/jz4770/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/ingenic/jz4770/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/ingenic/jz4770/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/ingenic/jz4770/fsoverlay" BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y # Musl needs separate libexecinfo @@ -28,10 +28,10 @@ BR2_PACKAGE_MININIT=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_LATEST_VERSION=y -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/ingenic/jz4770/linux_patches" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/ingenic/jz4770/linux_patches" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/ingenic/jz4770/linux-jz4770.config" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/ingenic/jz4770/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/ingenic/jz4770/linux-jz4770.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/ingenic/jz4770/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="uzImage.bin" diff --git a/configs/reglinux-k1.board b/configs/reglinux-k1.board index efceda9a65f..2262e91eda8 100644 --- a/configs/reglinux-k1.board +++ b/configs/reglinux-k1.board @@ -11,8 +11,8 @@ BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char -mabi=lp64d -march=rv64imafdv" BR2_BINUTILS_VERSION_2_41_X=y #BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/riscv64" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/spacemit/bananapi-f3/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/riscv64" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/spacemit/bananapi-f3/fsoverlay" BR2_TARGET_ROOTFS_SQUASHFS4_ZSTD=y # Linux headers same as kernel, a 6.1 series @@ -25,8 +25,8 @@ BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/BPI-SINOVOIP/pi-linux.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux-6.1.15-k1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/spacemit/bananapi-f3/linux-defconfig.config" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/spacemit/bananapi-f3/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/spacemit/bananapi-f3/linux-defconfig.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/spacemit/bananapi-f3/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Vendor-specific FIT kernel image format (until mainline) diff --git a/configs/reglinux-mt8395.board b/configs/reglinux-mt8395.board index 45fa5ef36f8..0d2f8fcc542 100644 --- a/configs/reglinux-mt8395.board +++ b/configs/reglinux-mt8395.board @@ -10,19 +10,19 @@ BR2_TARGET_OPTIMIZATION="-pipe" # GCC 13 does not support -mcpu=cortex-a78.cortex-a55 -mtune=cortex-a78.cortex-a55 BR2_TARGET_GENERIC_GETTY_PORT="/dev/ttyFIQ0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_921600=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/mediatek/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/mediatek/mt8395/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/mediatek/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/mediatek/mt8395/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/mediatek/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/mediatek/mt8395/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/mediatek/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/mediatek/mt8395/fsoverlay" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.9.10" BR2_KERNEL_HEADERS_AS_KERNEL=y -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/mediatek/mt8395/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/mediatek/mt8395/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" #BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/mediatek/mt8395/linux-defconfig.config" -#BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/mediatek/mt8395/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/mediatek/mt8395/linux-defconfig.config" +#BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/mediatek/mt8395/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Build the DTB from the kernel sources diff --git a/configs/reglinux-odin.board b/configs/reglinux-odin.board index abbd0c2a8d1..4ad0945015c 100644 --- a/configs/reglinux-odin.board +++ b/configs/reglinux-odin.board @@ -9,8 +9,8 @@ BR2_PACKAGE_BATOCERA_TARGET_ODIN=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char" BR2_TARGET_GENERIC_GETTY_PORT="ttyMSM0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/qualcomm/sd845/odin/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/qualcomm/sd845/odin/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/qualcomm/sd845/odin/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/qualcomm/sd845/odin/fsoverlay" # Linux headers same as kernel, a 5.18 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_18=y @@ -20,9 +20,9 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://gitlab.com/tjstyle/linux.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="sdm845/5.18-release" -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/qualcomm/sd845/odin/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/qualcomm/sd845/odin/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/qualcomm/sd845/odin/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/qualcomm/sd845/odin/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="qcom/sdm845-ayn-odin" diff --git a/configs/reglinux-odroidxu4.board b/configs/reglinux-odroidxu4.board index c76346066ff..eee06edc8d2 100644 --- a/configs/reglinux-odroidxu4.board +++ b/configs/reglinux-odroidxu4.board @@ -9,17 +9,17 @@ BR2_PACKAGE_BATOCERA_TARGET_XU4=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char" #BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/samsung/exynos5422/odroidxu4/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/samsung/exynos5422/odroidxu4/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/samsung/exynos5422/odroidxu4/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/samsung/exynos5422/odroidxu4/fsoverlay" BR2_TARGET_ROOTFS_SQUASHFS4_ZSTD=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_LATEST_VERSION=y -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/samsung/exynos5422/linux_patches" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/samsung/exynos5422/linux_patches" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/samsung/exynos5422/linux-defconfig.config" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/samsung/exynos5422/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/samsung/exynos5422/linux-defconfig.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/samsung/exynos5422/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Build the DTB from the kernel sources diff --git a/configs/reglinux-rk3128.board b/configs/reglinux-rk3128.board index 280c9ab6612..e86aec3b5a1 100644 --- a/configs/reglinux-rk3128.board +++ b/configs/reglinux-rk3128.board @@ -9,8 +9,8 @@ BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_BATOCERA_TARGET_RK3128=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3128/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3128/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3128/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3128/fsoverlay" # Linux headers same as kernel, a 4.4 series BR2_KERNEL_HEADERS_AS_KERNEL=y @@ -26,14 +26,14 @@ BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/RK3128-CFW/rockchip-linux.g BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="powkiddy-a13" #BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Fruit-Pi/kernel.git" #BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="develop-4.4" -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3128/linux_patches" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3128/linux_patches" #BR2_LINUX_KERNEL_DEFCONFIG="wx8" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3128/linux-defconfig.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3128/linux-defconfig.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3128-ps5000 rk3128-ps7000 rk3128-powkiddy-a13-rev-ab rk3128-powkiddy-a12-rev-c rk3128-powkiddy-a12-rev-d" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3128/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3128/linux-defconfig-fragment.config" # gpu BR2_PACKAGE_MALI_MP400_GBM=y diff --git a/configs/reglinux-rk3288.board b/configs/reglinux-rk3288.board index 5b95bb79b41..4399836bd5e 100644 --- a/configs/reglinux-rk3288.board +++ b/configs/reglinux-rk3288.board @@ -10,16 +10,16 @@ BR2_PACKAGE_BATOCERA_TARGET_RK3288=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char" #BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3288/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3288/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3288/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3288/fsoverlay" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_LATEST_VERSION=y -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3288/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/arm" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3288/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/arm" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3288/linux-defconfig.config" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3288/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3288/linux-defconfig.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3288/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Build the DTB from the kernel sources diff --git a/configs/reglinux-rk3326.board b/configs/reglinux-rk3326.board index 16739b3fe1f..df094e4574a 100644 --- a/configs/reglinux-rk3326.board +++ b/configs/reglinux-rk3326.board @@ -8,22 +8,22 @@ BR2_ARM_FPU_NEON_FP_ARMV8=y BR2_PACKAGE_BATOCERA_TARGET_RK3326=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char -mcpu=cortex-a35+crypto -mtune=cortex-a35" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3326/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3326/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3326/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3326/fsoverlay" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_LATEST_VERSION=y -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3326/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3326/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3326/linux-defconfig.config" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3326/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3326/linux-defconfig.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3326/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3326-odroid-go2 rockchip/rk3326-odroid-go2-v11 rockchip/rk3326-odroid-go3 rockchip/rk3326-anbernic-rg351m rockchip/rk3326-anbernic-rg351v" -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3326/dts/rk3326-gameforce-chi.dts" +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3326/dts/rk3326-gameforce-chi.dts" # gpu BR2_PACKAGE_BATOCERA_PANFROST_MESA3D=y diff --git a/configs/reglinux-rk3328.board b/configs/reglinux-rk3328.board index 483a9ee1d0a..66f749402e0 100644 --- a/configs/reglinux-rk3328.board +++ b/configs/reglinux-rk3328.board @@ -9,16 +9,16 @@ BR2_PACKAGE_BATOCERA_TARGET_RK3328=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char" #BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3328/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3328/fsoverlay" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_LATEST_VERSION=y -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3328/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3328/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3328/linux-defconfig.config" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3328/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3328/linux-defconfig.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3328/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Build the DTB from the kernel sources diff --git a/configs/reglinux-rk3399.board b/configs/reglinux-rk3399.board index df4063fa879..4ace5abfe41 100644 --- a/configs/reglinux-rk3399.board +++ b/configs/reglinux-rk3399.board @@ -9,22 +9,22 @@ BR2_PACKAGE_BATOCERA_TARGET_RK3399=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char -mcpu=cortex-a72.cortex-a53+crypto -mtune=cortex-a72.cortex-a53" #BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3399/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3399/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3399/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3399/fsoverlay" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_LATEST_VERSION=y -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3399/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3399/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3399/linux-defconfig.config" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3399/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3399/linux-defconfig.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3399/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-rockpro64 rockchip/rk3399-rock960 rockchip/rk3399-rock-pi-4b rockchip/rk3399-hugsun-x99" -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3399/dts/rk3399-anbernic-rg552.dts $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3399/dts/rk3399-orangepi-4-lts.dts $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3399/dts/rk3399-orangepi-800.dts $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3399/dts/rk3399-tinker-2.dts $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3399/dts/rk3399-nanopi-m4v2.dts" +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3399/dts/rk3399-anbernic-rg552.dts $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3399/dts/rk3399-orangepi-4-lts.dts $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3399/dts/rk3399-orangepi-800.dts $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3399/dts/rk3399-tinker-2.dts $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3399/dts/rk3399-nanopi-m4v2.dts" # Bootloader BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" diff --git a/configs/reglinux-rk3568.board b/configs/reglinux-rk3568.board index 5ed0336a324..5e7cf04f302 100644 --- a/configs/reglinux-rk3568.board +++ b/configs/reglinux-rk3568.board @@ -9,22 +9,22 @@ BR2_PACKAGE_BATOCERA_TARGET_RK3568=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char -mcpu=cortex-a55 -mtune=cortex-a55" #BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3568/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3568/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3568/anbernic-rgxx3/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3568/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3568/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3568/anbernic-rgxx3/fsoverlay" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_LATEST_VERSION=y -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3568/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3568/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3568/linux-defconfig.config" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3568/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3568/linux-defconfig.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3568/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3566-odroid-m1s rockchip/rk3568-rock-3a rockchip/rk3568-odroid-m1 rockchip/rk3566-roc-pc rockchip/rk3566-anbernic-rg353p rockchip/rk3566-anbernic-rg353ps rockchip/rk3566-anbernic-rg353v rockchip/rk3566-anbernic-rg353vs rockchip/rk3566-anbernic-rg503" -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3568/dts/rk3566-rock-3c.dts $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3568/dts/rk3568-firefly-roc-pc.dts $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3568/dts/rk3566-anbernic-rg353v-v2.dts" +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3568/dts/rk3566-rock-3c.dts $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3568/dts/rk3568-firefly-roc-pc.dts $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3568/dts/rk3566-anbernic-rg353v-v2.dts" # Bootloader BR2_PACKAGE_UBOOT_ROCK_3A=y diff --git a/configs/reglinux-rk3588.board b/configs/reglinux-rk3588.board index 6a32a931527..804882c6de9 100644 --- a/configs/reglinux-rk3588.board +++ b/configs/reglinux-rk3588.board @@ -10,8 +10,8 @@ BR2_PACKAGE_BATOCERA_TARGET_RK3588=y BR2_TARGET_OPTIMIZATION="-pipe -mcpu=cortex-a76.cortex-a55 -mtune=cortex-a76.cortex-a55" BR2_TARGET_GENERIC_GETTY_PORT="/dev/ttyFIQ0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3588/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3588/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3588/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3588/fsoverlay" # Linux headers same as kernel, a 6.1 series BR2_KERNEL_HEADERS_AS_KERNEL=y @@ -22,16 +22,16 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/armbian/linux-rockchip.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="9d47b29834fabc4edaa12c69c6770d78735928d3" -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3588/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3588/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3588/linux-defconfig.config" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3588/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3588/linux-defconfig.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3588/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3588s-rock-5c rockchip/rk3588-rock-5b rockchip/rk3588s-rock-5a rockchip/rk3588-evb1-lp4-v10-linux rockchip/rk3588s-orangepi-5 rockchip/rk3588s-orangepi-5b rockchip/rk3588-orangepi-5-plus rockchip/rk3588-bananapi-m7 rockchip/rk3588s-9tripod-linux rockchip/rk3588-blueberry-edge-v12-linux rockchip/rk3588s-khadas-edge2 rockchip/rk3588s-roc-pc" -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/rockchip/rk3588/dts/rk3588s-gameforce-ace.dts" +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/rockchip/rk3588/dts/rk3588s-gameforce-ace.dts" # Use 'extreme' ZSTD compression for a smaller image, but a bit more CPU to decompress BR2_TARGET_ROOTFS_SQUASHFS4_ZSTD=y diff --git a/configs/reglinux-s812.board b/configs/reglinux-s812.board index b6d52813bff..b2f693e627a 100644 --- a/configs/reglinux-s812.board +++ b/configs/reglinux-s812.board @@ -12,8 +12,8 @@ BR2_PACKAGE_BATOCERA_TARGET_S812=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char" #BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/s812/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/s812/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/s812/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/s812/fsoverlay" BR2_TARGET_ROOTFS_SQUASHFS4_ZSTD=y # Linux headers same as kernel, a 6.8 series @@ -25,10 +25,10 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/xdarklight/linux" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="meson-mx-integration-6.8-20240310" -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/s812/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/arm" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/s812/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/arm" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/s812/linux-defconfig.config" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/s812/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/s812/linux-defconfig.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/s812/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Build the DTB from the kernel sources diff --git a/configs/reglinux-s905.board b/configs/reglinux-s905.board index ab47b72d973..8d390160a0c 100644 --- a/configs/reglinux-s905.board +++ b/configs/reglinux-s905.board @@ -10,16 +10,16 @@ BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char" #BR2_TARGET_GENERIC_GETTY_PORT="ttyAML1" #BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/s905/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/s905/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/s905/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/s905/fsoverlay" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_LATEST_VERSION=y -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/linux-meson64-current.config" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/s905/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/linux-meson64-current.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/s905/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Build the DTB from the kernel sources diff --git a/configs/reglinux-s905gen2.board b/configs/reglinux-s905gen2.board index 2b11b250a37..0d2c0176c78 100644 --- a/configs/reglinux-s905gen2.board +++ b/configs/reglinux-s905gen2.board @@ -9,16 +9,16 @@ BR2_PACKAGE_BATOCERA_TARGET_S905GEN2=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char" #BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/s905gen2/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/s905gen2/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/s905gen2/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/s905gen2/fsoverlay" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_LATEST_VERSION=y -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/linux-meson64-current.config" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/s905gen2/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/linux-meson64-current.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/s905gen2/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="amlogic/meson-g12a-radxa-zero amlogic/meson-gxm-khadas-vim2 amlogic/meson-gxm-nexbox-a1 amlogic/meson-gxm-q200 amlogic/meson-gxm-q201 amlogic/meson-gxm-s912-libretech-pc amlogic/meson-gxm-vega-s96" diff --git a/configs/reglinux-s905gen3.board b/configs/reglinux-s905gen3.board index f2ff0a9aa08..5beed9bdf79 100644 --- a/configs/reglinux-s905gen3.board +++ b/configs/reglinux-s905gen3.board @@ -9,16 +9,16 @@ BR2_PACKAGE_BATOCERA_TARGET_S905GEN3=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char" #BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/s905gen3/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/s905gen3/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/s905gen3/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/s905gen3/fsoverlay" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_LATEST_VERSION=y -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/s905gen3/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/s905gen3/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/linux-meson64-current.config" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/s905gen3/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/linux-meson64-current.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/s905gen3/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Build the DTB from the kernel sources diff --git a/configs/reglinux-s922x.board b/configs/reglinux-s922x.board index c6b437e11f9..10b6bdacb5e 100644 --- a/configs/reglinux-s922x.board +++ b/configs/reglinux-s922x.board @@ -9,16 +9,16 @@ BR2_PACKAGE_BATOCERA_TARGET_S922X=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char" BR2_TARGET_GENERIC_GETTY_PORT="ttyAML0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/s922x/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/s922x/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/s922x/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/s922x/fsoverlay" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_LATEST_VERSION=y -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/s922x/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/s922x/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/aarch64" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/s922x/linux-defconfig.config" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/s922x/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/s922x/linux-defconfig.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/s922x/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Build the DTB from the kernel sources diff --git a/configs/reglinux-s9gen4.board b/configs/reglinux-s9gen4.board index 4299d57c381..c605e51c986 100644 --- a/configs/reglinux-s9gen4.board +++ b/configs/reglinux-s9gen4.board @@ -9,8 +9,8 @@ BR2_PACKAGE_BATOCERA_TARGET_S9GEN4=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char -mcpu=cortex-a35+crypto -mtune=cortex-a35" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/s9gen4/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/s9gen4/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/patches/gles $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/s9gen4/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/s9gen4/fsoverlay" # Linux headers same as kernel, a 5.4 series BR2_KERNEL_HEADERS_AS_KERNEL=y @@ -20,10 +20,10 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/khadas/linux/archive/refs/tags/khadas-vims-linux-5.4-v1.5.2-release.tar.gz" -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/s9gen4/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/khadas-5.4" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/s9gen4/linux_patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/reglinux/linux_patches/khadas-5.4" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/s9gen4/linux-vim1s-5.4.180.config" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/amlogic/s9gen4/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/s9gen4/linux-vim1s-5.4.180.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/amlogic/s9gen4/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Build the DTB from the kernel sources diff --git a/configs/reglinux-saphira.board b/configs/reglinux-saphira.board index 8b057c3b8a9..dc21a54d4b4 100644 --- a/configs/reglinux-saphira.board +++ b/configs/reglinux-saphira.board @@ -10,8 +10,8 @@ BR2_PACKAGE_BATOCERA_TARGET_SAPHIRA=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char" # following breaks libclc needed by mesa3d: -mcpu=cortex-a78 -mtune=cortex-a78" # need to find some -march supported by both GCC and Clang to address the issue -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/saphira/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/saphira/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay" # Rust, required by asahi kernel BR2_PACKAGE_HOST_RUSTC=y @@ -27,8 +27,8 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/AsahiLinux/linux/archive/refs/tags/asahi-6.10.6-1.tar.gz" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/saphira/linux-defconfig.config" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/saphira/linux-defconfig-fragment.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/saphira/linux-defconfig.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/saphira/linux-defconfig-fragment.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Build the DTB from the kernel sources diff --git a/configs/reglinux-x86_64.board b/configs/reglinux-x86_64.board index b599d4fc118..4160edd412d 100644 --- a/configs/reglinux-x86_64.board +++ b/configs/reglinux-x86_64.board @@ -7,17 +7,17 @@ BR2_PACKAGE_BATOCERA_TARGET_X86_64=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char" #BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/x86/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/x86/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/x86/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/x86/fsoverlay" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10.12" BR2_KERNEL_HEADERS_AS_KERNEL=y -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/x86/linux_patches" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/x86/linux_patches" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/x86/linux_x86_64-defconfig.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/x86/linux_x86_64-defconfig.config" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y # GPU diff --git a/configs/reglinux-x86_64_v3.board b/configs/reglinux-x86_64_v3.board index e2ece93bf8f..5247b21ba62 100644 --- a/configs/reglinux-x86_64_v3.board +++ b/configs/reglinux-x86_64_v3.board @@ -8,17 +8,17 @@ BR2_PACKAGE_BATOCERA_TARGET_X86_64_V3=y BR2_TARGET_OPTIMIZATION="-pipe -fsigned-char" #BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/x86/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/x86_64-v3/patches" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/x86/fsoverlay" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/x86/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/x86_64-v3/patches" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/fsoverlay $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/x86/fsoverlay" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10.12" BR2_KERNEL_HEADERS_AS_KERNEL=y -BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/x86/linux_patches" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/x86/linux_patches" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/x86/linux_x86_64-defconfig.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/x86/linux_x86_64-defconfig.config" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y # GPU diff --git a/configs/reglinux-x86_wow64.board b/configs/reglinux-x86_wow64.board index 93a7e102151..19b07153b91 100644 --- a/configs/reglinux-x86_wow64.board +++ b/configs/reglinux-x86_wow64.board @@ -16,14 +16,14 @@ BR2_PACKAGE_UTIL_LINUX_LIBMOUNT=y BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS=y BR2_ENABLE_LOCALE_WHITELIST="C ar ca cs_CZ cy cy_GB cy de en el es es_MX eu eu_ES fr fr_FR fi_FI he hu it ja ja_JP ja ko nb nb_NO nl nn nn_NO oc oc_FR pl pt pt_PT pt_BR ru ru_RU uk uk_UA sv sv_SE tr zh zh_CN zh_TW" BR2_GENERATE_LOCALE="en_US.UTF-8 ar_YE.UTF-8 ca_ES.UTF-8 cs_CZ.UTF-8 cy_GB.UTF-8 de_DE.UTF-8 el_GR.UTF-8 en_GB.UTF-8 es_ES.UTF-8 es_MX.UTF-8 eu_ES.UTF-8 fr_FR.UTF-8 fi_FI.UTF-8 he_IL.UTF-8 hu_HU.UTF-8 it_IT.UTF-8 ja_JP.UTF-8 ko_KR.UTF-8 nb_NO.UTF-8 nl_NL.UTF-8 nn_NO.UTF-8 oc_FR.UTF-8 pl_PL.UTF-8 pt_BR.UTF-8 pt_PT.UTF-8 ru_RU.UTF-8 uk_UA.UTF-8 sv_SE.UTF-8 tr_TR.UTF-8 zh_CN.UTF-8 zh_TW.UTF-8" -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/x86/patches" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/patches $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/x86/patches" # kernel selected just to be able to select the correct version BR2_LINUX_KERNEL=n BR2_KERNEL_HEADERS_6_9=y # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_BATOCERA_PATH)/board/scripts/doWineWow64-32package.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/scripts/doWineWow64-32package.sh" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y # (Fake) system as we only build 32-bit Wine subsystem diff --git a/external.mk b/external.mk index 8837bcb5d4d..e86dbb030f9 100644 --- a/external.mk +++ b/external.mk @@ -1 +1 @@ -include $(sort $(wildcard $(BR2_EXTERNAL_BATOCERA_PATH)/package/reglinux/*/*/*/*.mk $(BR2_EXTERNAL_BATOCERA_PATH)/package/reglinux/*/*/*.mk $(BR2_EXTERNAL_BATOCERA_PATH)/package/reglinux/*/*.mk $(BR2_EXTERNAL_BATOCERA_PATH)/package/*/*.mk $(BR2_EXTERNAL_BATOCERA_PATH)/package/*/*/*.mk $(BR2_EXTERNAL_BATOCERA_PATH)/package/*/*/*/*.mk $(BR2_EXTERNAL_BATOCERA_PATH)/package/*/*/*/*/*.mk)) +include $(sort $(wildcard $(BR2_EXTERNAL_BATOCERA_PATH)/package/reglinux/*/*/*/*.mk $(BR2_EXTERNAL_BATOCERA_PATH)/package/reglinux/*/*/*.mk $(BR2_EXTERNAL_BATOCERA_PATH)/package/reglinux/*/*.mk $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/*/*.mk $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/*/*/*.mk $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/*/*/*/*.mk $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/*/*/*/*/*.mk)) diff --git a/getPoFromWebsite.sh b/getPoFromWebsite.sh index cf09773e6a2..0b123ffd315 100755 --- a/getPoFromWebsite.sh +++ b/getPoFromWebsite.sh @@ -5,13 +5,13 @@ if ! wget -q "http://translations.batocera.org/?q=updatable&type=options" -O - | do echo -n "updating ${L}..." >&2 - if ! test -d "package/emulationstation/batocera-es-system/locales/${L}" + if ! test -d "package/batocera/emulationstation/batocera-es-system/locales/${L}" then - echo "directory package/emulationstation/batocera-es-system/locales/${L} doesn't exist" >&2 + echo "directory package/batocera/emulationstation/batocera-es-system/locales/${L} doesn't exist" >&2 exit 1 fi - TARGET="package/emulationstation/batocera-es-system/locales/${L}/batocera-es-system.po" + TARGET="package/batocera/emulationstation/batocera-es-system/locales/${L}/batocera-es-system.po" if ! wget -q "http://translations.batocera.org/po/options_${L}.po" -O "${TARGET}" then echo "unable to find file on translations.batocera.org" >&2 diff --git a/package/README.md b/package/batocera/README.md similarity index 100% rename from package/README.md rename to package/batocera/README.md diff --git a/package/audio/alsa-topology-conf/Config.in b/package/batocera/audio/alsa-topology-conf/Config.in similarity index 100% rename from package/audio/alsa-topology-conf/Config.in rename to package/batocera/audio/alsa-topology-conf/Config.in diff --git a/package/audio/alsa-topology-conf/alsa-topology.mk b/package/batocera/audio/alsa-topology-conf/alsa-topology.mk similarity index 100% rename from package/audio/alsa-topology-conf/alsa-topology.mk rename to package/batocera/audio/alsa-topology-conf/alsa-topology.mk diff --git a/package/audio/alsa-ucm-conf/Config.in b/package/batocera/audio/alsa-ucm-conf/Config.in similarity index 100% rename from package/audio/alsa-ucm-conf/Config.in rename to package/batocera/audio/alsa-ucm-conf/Config.in diff --git a/package/audio/alsa-ucm-conf/alsa-ucm-conf.mk b/package/batocera/audio/alsa-ucm-conf/alsa-ucm-conf.mk similarity index 100% rename from package/audio/alsa-ucm-conf/alsa-ucm-conf.mk rename to package/batocera/audio/alsa-ucm-conf/alsa-ucm-conf.mk diff --git a/package/audio/chromebook-linux-audio/Config.in b/package/batocera/audio/chromebook-linux-audio/Config.in similarity index 100% rename from package/audio/chromebook-linux-audio/Config.in rename to package/batocera/audio/chromebook-linux-audio/Config.in diff --git a/package/audio/chromebook-linux-audio/chromebook-linux-audio.mk b/package/batocera/audio/chromebook-linux-audio/chromebook-linux-audio.mk similarity index 100% rename from package/audio/chromebook-linux-audio/chromebook-linux-audio.mk rename to package/batocera/audio/chromebook-linux-audio/chromebook-linux-audio.mk diff --git a/package/audio/chromebook-ucm-conf/Config.in b/package/batocera/audio/chromebook-ucm-conf/Config.in similarity index 100% rename from package/audio/chromebook-ucm-conf/Config.in rename to package/batocera/audio/chromebook-ucm-conf/Config.in diff --git a/package/audio/chromebook-ucm-conf/chromebook-ucm-conf.mk b/package/batocera/audio/chromebook-ucm-conf/chromebook-ucm-conf.mk similarity index 100% rename from package/audio/chromebook-ucm-conf/chromebook-ucm-conf.mk rename to package/batocera/audio/chromebook-ucm-conf/chromebook-ucm-conf.mk diff --git a/package/audio/rtmidi/Config.in b/package/batocera/audio/rtmidi/Config.in similarity index 100% rename from package/audio/rtmidi/Config.in rename to package/batocera/audio/rtmidi/Config.in diff --git a/package/audio/rtmidi/rtmidi.mk b/package/batocera/audio/rtmidi/rtmidi.mk similarity index 100% rename from package/audio/rtmidi/rtmidi.mk rename to package/batocera/audio/rtmidi/rtmidi.mk diff --git a/package/audio/zmusic/Config.in b/package/batocera/audio/zmusic/Config.in similarity index 100% rename from package/audio/zmusic/Config.in rename to package/batocera/audio/zmusic/Config.in diff --git a/package/audio/zmusic/zmusic.mk b/package/batocera/audio/zmusic/zmusic.mk similarity index 100% rename from package/audio/zmusic/zmusic.mk rename to package/batocera/audio/zmusic/zmusic.mk diff --git a/package/boot/batocera-shim-signed-efi-helpers-ia32/Config.in b/package/batocera/boot/batocera-shim-signed-efi-helpers-ia32/Config.in similarity index 100% rename from package/boot/batocera-shim-signed-efi-helpers-ia32/Config.in rename to package/batocera/boot/batocera-shim-signed-efi-helpers-ia32/Config.in diff --git a/package/boot/batocera-shim-signed-efi-helpers-ia32/batocera-shim-signed-efi-helpers-ia32.hash b/package/batocera/boot/batocera-shim-signed-efi-helpers-ia32/batocera-shim-signed-efi-helpers-ia32.hash similarity index 100% rename from package/boot/batocera-shim-signed-efi-helpers-ia32/batocera-shim-signed-efi-helpers-ia32.hash rename to package/batocera/boot/batocera-shim-signed-efi-helpers-ia32/batocera-shim-signed-efi-helpers-ia32.hash diff --git a/package/boot/batocera-shim-signed-efi-helpers-ia32/batocera-shim-signed-efi-helpers-ia32.mk b/package/batocera/boot/batocera-shim-signed-efi-helpers-ia32/batocera-shim-signed-efi-helpers-ia32.mk similarity index 100% rename from package/boot/batocera-shim-signed-efi-helpers-ia32/batocera-shim-signed-efi-helpers-ia32.mk rename to package/batocera/boot/batocera-shim-signed-efi-helpers-ia32/batocera-shim-signed-efi-helpers-ia32.mk diff --git a/package/boot/batocera-shim-signed-efi-helpers-ia32/copyright b/package/batocera/boot/batocera-shim-signed-efi-helpers-ia32/copyright similarity index 100% rename from package/boot/batocera-shim-signed-efi-helpers-ia32/copyright rename to package/batocera/boot/batocera-shim-signed-efi-helpers-ia32/copyright diff --git a/package/boot/batocera-shim-signed-efi-ia32/Config.in b/package/batocera/boot/batocera-shim-signed-efi-ia32/Config.in similarity index 100% rename from package/boot/batocera-shim-signed-efi-ia32/Config.in rename to package/batocera/boot/batocera-shim-signed-efi-ia32/Config.in diff --git a/package/boot/batocera-shim-signed-efi-ia32/batocera-shim-signed-efi-ia32.hash b/package/batocera/boot/batocera-shim-signed-efi-ia32/batocera-shim-signed-efi-ia32.hash similarity index 100% rename from package/boot/batocera-shim-signed-efi-ia32/batocera-shim-signed-efi-ia32.hash rename to package/batocera/boot/batocera-shim-signed-efi-ia32/batocera-shim-signed-efi-ia32.hash diff --git a/package/boot/batocera-shim-signed-efi-ia32/batocera-shim-signed-efi-ia32.mk b/package/batocera/boot/batocera-shim-signed-efi-ia32/batocera-shim-signed-efi-ia32.mk similarity index 100% rename from package/boot/batocera-shim-signed-efi-ia32/batocera-shim-signed-efi-ia32.mk rename to package/batocera/boot/batocera-shim-signed-efi-ia32/batocera-shim-signed-efi-ia32.mk diff --git a/package/boot/batocera-shim-signed-efi-ia32/copyright b/package/batocera/boot/batocera-shim-signed-efi-ia32/copyright similarity index 100% rename from package/boot/batocera-shim-signed-efi-ia32/copyright rename to package/batocera/boot/batocera-shim-signed-efi-ia32/copyright diff --git a/package/boot/batocera-shim-signed-efi-x64/COPYRIGHT b/package/batocera/boot/batocera-shim-signed-efi-x64/COPYRIGHT similarity index 100% rename from package/boot/batocera-shim-signed-efi-x64/COPYRIGHT rename to package/batocera/boot/batocera-shim-signed-efi-x64/COPYRIGHT diff --git a/package/boot/batocera-shim-signed-efi-x64/Config.in b/package/batocera/boot/batocera-shim-signed-efi-x64/Config.in similarity index 100% rename from package/boot/batocera-shim-signed-efi-x64/Config.in rename to package/batocera/boot/batocera-shim-signed-efi-x64/Config.in diff --git a/package/boot/batocera-shim-signed-efi-x64/batocera-shim-signed-efi-x64.hash b/package/batocera/boot/batocera-shim-signed-efi-x64/batocera-shim-signed-efi-x64.hash similarity index 100% rename from package/boot/batocera-shim-signed-efi-x64/batocera-shim-signed-efi-x64.hash rename to package/batocera/boot/batocera-shim-signed-efi-x64/batocera-shim-signed-efi-x64.hash diff --git a/package/boot/batocera-shim-signed-efi-x64/batocera-shim-signed-efi-x64.mk b/package/batocera/boot/batocera-shim-signed-efi-x64/batocera-shim-signed-efi-x64.mk similarity index 100% rename from package/boot/batocera-shim-signed-efi-x64/batocera-shim-signed-efi-x64.mk rename to package/batocera/boot/batocera-shim-signed-efi-x64/batocera-shim-signed-efi-x64.mk diff --git a/package/boot/batocera-shim/Config.in b/package/batocera/boot/batocera-shim/Config.in similarity index 100% rename from package/boot/batocera-shim/Config.in rename to package/batocera/boot/batocera-shim/Config.in diff --git a/package/boot/batocera-shim/batocera-shim.hash b/package/batocera/boot/batocera-shim/batocera-shim.hash similarity index 100% rename from package/boot/batocera-shim/batocera-shim.hash rename to package/batocera/boot/batocera-shim/batocera-shim.hash diff --git a/package/boot/batocera-shim/batocera-shim.mk b/package/batocera/boot/batocera-shim/batocera-shim.mk similarity index 100% rename from package/boot/batocera-shim/batocera-shim.mk rename to package/batocera/boot/batocera-shim/batocera-shim.mk diff --git a/package/boot/batocera-syslinux-efi/Config.in b/package/batocera/boot/batocera-syslinux-efi/Config.in similarity index 100% rename from package/boot/batocera-syslinux-efi/Config.in rename to package/batocera/boot/batocera-syslinux-efi/Config.in diff --git a/package/boot/batocera-syslinux-efi/batocera-syslinux-efi.mk b/package/batocera/boot/batocera-syslinux-efi/batocera-syslinux-efi.mk similarity index 91% rename from package/boot/batocera-syslinux-efi/batocera-syslinux-efi.mk rename to package/batocera/boot/batocera-syslinux-efi/batocera-syslinux-efi.mk index 0fe985870b8..0e8ceb74222 100644 --- a/package/boot/batocera-syslinux-efi/batocera-syslinux-efi.mk +++ b/package/batocera/boot/batocera-syslinux-efi/batocera-syslinux-efi.mk @@ -9,7 +9,7 @@ BATOCERA_SYSLINUX_EFI_SOURCE = BATOCERA_SYSLINUX_EFI_SITE = binaries define BATOCERA_SYSLINUX_EFI_EXTRACT_CMDS - cp -R $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/batocera-syslinux-efi/binaries/* $(@D) + cp -R $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/batocera-syslinux-efi/binaries/* $(@D) endef define BATOCERA_SYSLINUX_EFI_INSTALL_TARGET_CMDS diff --git a/package/boot/batocera-syslinux-efi/binaries/batocera-mok.cer b/package/batocera/boot/batocera-syslinux-efi/binaries/batocera-mok.cer similarity index 100% rename from package/boot/batocera-syslinux-efi/binaries/batocera-mok.cer rename to package/batocera/boot/batocera-syslinux-efi/binaries/batocera-mok.cer diff --git a/package/boot/batocera-syslinux-efi/binaries/batocera-mok.crt b/package/batocera/boot/batocera-syslinux-efi/binaries/batocera-mok.crt similarity index 100% rename from package/boot/batocera-syslinux-efi/binaries/batocera-mok.crt rename to package/batocera/boot/batocera-syslinux-efi/binaries/batocera-mok.crt diff --git a/package/boot/batocera-syslinux-efi/binaries/batocera.csv b/package/batocera/boot/batocera-syslinux-efi/binaries/batocera.csv similarity index 100% rename from package/boot/batocera-syslinux-efi/binaries/batocera.csv rename to package/batocera/boot/batocera-syslinux-efi/binaries/batocera.csv diff --git a/package/boot/batocera-syslinux-efi/binaries/bootx64.efi b/package/batocera/boot/batocera-syslinux-efi/binaries/bootx64.efi similarity index 100% rename from package/boot/batocera-syslinux-efi/binaries/bootx64.efi rename to package/batocera/boot/batocera-syslinux-efi/binaries/bootx64.efi diff --git a/package/boot/batocera-syslinux-efi/binaries/bootx64.selfsigned.efi b/package/batocera/boot/batocera-syslinux-efi/binaries/bootx64.selfsigned.efi similarity index 100% rename from package/boot/batocera-syslinux-efi/binaries/bootx64.selfsigned.efi rename to package/batocera/boot/batocera-syslinux-efi/binaries/bootx64.selfsigned.efi diff --git a/package/boot/batocera-syslinux-efi/binaries/fbx64.efi b/package/batocera/boot/batocera-syslinux-efi/binaries/fbx64.efi similarity index 100% rename from package/boot/batocera-syslinux-efi/binaries/fbx64.efi rename to package/batocera/boot/batocera-syslinux-efi/binaries/fbx64.efi diff --git a/package/boot/batocera-syslinux-efi/binaries/fbx64.selfsigned.efi b/package/batocera/boot/batocera-syslinux-efi/binaries/fbx64.selfsigned.efi similarity index 100% rename from package/boot/batocera-syslinux-efi/binaries/fbx64.selfsigned.efi rename to package/batocera/boot/batocera-syslinux-efi/binaries/fbx64.selfsigned.efi diff --git a/package/boot/batocera-syslinux-efi/binaries/grubia32.efi b/package/batocera/boot/batocera-syslinux-efi/binaries/grubia32.efi similarity index 100% rename from package/boot/batocera-syslinux-efi/binaries/grubia32.efi rename to package/batocera/boot/batocera-syslinux-efi/binaries/grubia32.efi diff --git a/package/boot/batocera-syslinux-efi/binaries/grubia32.selfsigned.efi b/package/batocera/boot/batocera-syslinux-efi/binaries/grubia32.selfsigned.efi similarity index 100% rename from package/boot/batocera-syslinux-efi/binaries/grubia32.selfsigned.efi rename to package/batocera/boot/batocera-syslinux-efi/binaries/grubia32.selfsigned.efi diff --git a/package/boot/batocera-syslinux-efi/binaries/ldlinux.e32 b/package/batocera/boot/batocera-syslinux-efi/binaries/ldlinux.e32 similarity index 100% rename from package/boot/batocera-syslinux-efi/binaries/ldlinux.e32 rename to package/batocera/boot/batocera-syslinux-efi/binaries/ldlinux.e32 diff --git a/package/boot/batocera-syslinux-efi/binaries/ldlinux.e64 b/package/batocera/boot/batocera-syslinux-efi/binaries/ldlinux.e64 similarity index 100% rename from package/boot/batocera-syslinux-efi/binaries/ldlinux.e64 rename to package/batocera/boot/batocera-syslinux-efi/binaries/ldlinux.e64 diff --git a/package/boot/batocera-syslinux-efi/binaries/libutil.c32 b/package/batocera/boot/batocera-syslinux-efi/binaries/libutil.c32 similarity index 100% rename from package/boot/batocera-syslinux-efi/binaries/libutil.c32 rename to package/batocera/boot/batocera-syslinux-efi/binaries/libutil.c32 diff --git a/package/boot/batocera-syslinux-efi/binaries/menu.c32 b/package/batocera/boot/batocera-syslinux-efi/binaries/menu.c32 similarity index 100% rename from package/boot/batocera-syslinux-efi/binaries/menu.c32 rename to package/batocera/boot/batocera-syslinux-efi/binaries/menu.c32 diff --git a/package/boot/batocera-syslinux-efi/binaries/selfsign.sh b/package/batocera/boot/batocera-syslinux-efi/binaries/selfsign.sh similarity index 100% rename from package/boot/batocera-syslinux-efi/binaries/selfsign.sh rename to package/batocera/boot/batocera-syslinux-efi/binaries/selfsign.sh diff --git a/package/boot/rk3128-blobs/Config.in b/package/batocera/boot/rk3128-blobs/Config.in similarity index 100% rename from package/boot/rk3128-blobs/Config.in rename to package/batocera/boot/rk3128-blobs/Config.in diff --git a/package/boot/rk3128-blobs/rk3128-blobs.mk b/package/batocera/boot/rk3128-blobs/rk3128-blobs.mk similarity index 100% rename from package/boot/rk3128-blobs/rk3128-blobs.mk rename to package/batocera/boot/rk3128-blobs/rk3128-blobs.mk diff --git a/package/boot/rockpro64-blobs/Config.in b/package/batocera/boot/rockpro64-blobs/Config.in similarity index 100% rename from package/boot/rockpro64-blobs/Config.in rename to package/batocera/boot/rockpro64-blobs/Config.in diff --git a/package/boot/rockpro64-blobs/rockpro64-blobs.mk b/package/batocera/boot/rockpro64-blobs/rockpro64-blobs.mk similarity index 100% rename from package/boot/rockpro64-blobs/rockpro64-blobs.mk rename to package/batocera/boot/rockpro64-blobs/rockpro64-blobs.mk diff --git a/package/boot/uboot-anbernic-rgxx3/Config.in b/package/batocera/boot/uboot-anbernic-rgxx3/Config.in similarity index 100% rename from package/boot/uboot-anbernic-rgxx3/Config.in rename to package/batocera/boot/uboot-anbernic-rgxx3/Config.in diff --git a/package/boot/uboot-anbernic-rgxx3/idbloader.img b/package/batocera/boot/uboot-anbernic-rgxx3/idbloader.img similarity index 100% rename from package/boot/uboot-anbernic-rgxx3/idbloader.img rename to package/batocera/boot/uboot-anbernic-rgxx3/idbloader.img diff --git a/package/boot/uboot-anbernic-rgxx3/resource.img b/package/batocera/boot/uboot-anbernic-rgxx3/resource.img similarity index 100% rename from package/boot/uboot-anbernic-rgxx3/resource.img rename to package/batocera/boot/uboot-anbernic-rgxx3/resource.img diff --git a/package/boot/uboot-anbernic-rgxx3/uboot-anbernic-rgxx3.mk b/package/batocera/boot/uboot-anbernic-rgxx3/uboot-anbernic-rgxx3.mk similarity index 51% rename from package/boot/uboot-anbernic-rgxx3/uboot-anbernic-rgxx3.mk rename to package/batocera/boot/uboot-anbernic-rgxx3/uboot-anbernic-rgxx3.mk index f0cfc8acda3..6163bc2fd90 100644 --- a/package/boot/uboot-anbernic-rgxx3/uboot-anbernic-rgxx3.mk +++ b/package/batocera/boot/uboot-anbernic-rgxx3/uboot-anbernic-rgxx3.mk @@ -12,9 +12,9 @@ endef define UBOOT_ANBERNIC_RGXX3_INSTALL_TARGET_CMDS mkdir -p $(BINARIES_DIR)/uboot-anbernic-rgxx3 - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-anbernic-rgxx3/idbloader.img $(BINARIES_DIR)/uboot-anbernic-rgxx3/idbloader.img - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-anbernic-rgxx3/uboot.img $(BINARIES_DIR)/uboot-anbernic-rgxx3/uboot.img - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-anbernic-rgxx3/resource.img $(BINARIES_DIR)/uboot-anbernic-rgxx3/resource.img + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-anbernic-rgxx3/idbloader.img $(BINARIES_DIR)/uboot-anbernic-rgxx3/idbloader.img + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-anbernic-rgxx3/uboot.img $(BINARIES_DIR)/uboot-anbernic-rgxx3/uboot.img + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-anbernic-rgxx3/resource.img $(BINARIES_DIR)/uboot-anbernic-rgxx3/resource.img endef $(eval $(generic-package)) diff --git a/package/boot/uboot-anbernic-rgxx3/uboot.img b/package/batocera/boot/uboot-anbernic-rgxx3/uboot.img similarity index 100% rename from package/boot/uboot-anbernic-rgxx3/uboot.img rename to package/batocera/boot/uboot-anbernic-rgxx3/uboot.img diff --git a/package/boot/uboot-bananapi-m7/Config.in b/package/batocera/boot/uboot-bananapi-m7/Config.in similarity index 100% rename from package/boot/uboot-bananapi-m7/Config.in rename to package/batocera/boot/uboot-bananapi-m7/Config.in diff --git a/package/boot/uboot-bananapi-m7/idbloader.img b/package/batocera/boot/uboot-bananapi-m7/idbloader.img similarity index 100% rename from package/boot/uboot-bananapi-m7/idbloader.img rename to package/batocera/boot/uboot-bananapi-m7/idbloader.img diff --git a/package/boot/uboot-bananapi-m7/u-boot.itb b/package/batocera/boot/uboot-bananapi-m7/u-boot.itb similarity index 100% rename from package/boot/uboot-bananapi-m7/u-boot.itb rename to package/batocera/boot/uboot-bananapi-m7/u-boot.itb diff --git a/package/boot/uboot-bananapi-m7/uboot-bananapi-m7.mk b/package/batocera/boot/uboot-bananapi-m7/uboot-bananapi-m7.mk similarity index 75% rename from package/boot/uboot-bananapi-m7/uboot-bananapi-m7.mk rename to package/batocera/boot/uboot-bananapi-m7/uboot-bananapi-m7.mk index f043ab4e53a..f4fa3599be6 100644 --- a/package/boot/uboot-bananapi-m7/uboot-bananapi-m7.mk +++ b/package/batocera/boot/uboot-bananapi-m7/uboot-bananapi-m7.mk @@ -13,9 +13,9 @@ endef define UBOOT_BANANAPI_M7_INSTALL_TARGET_CMDS mkdir -p $(BINARIES_DIR)/bananapi-m7 - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-bananapi-m7/idbloader.img \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-bananapi-m7/idbloader.img \ $(BINARIES_DIR)/bananapi-m7/idbloader.img - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-bananapi-m7/u-boot.itb \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-bananapi-m7/u-boot.itb \ $(BINARIES_DIR)/bananapi-m7/u-boot.itb endef diff --git a/package/boot/uboot-evb-rk3399/Config.in b/package/batocera/boot/uboot-evb-rk3399/Config.in similarity index 100% rename from package/boot/uboot-evb-rk3399/Config.in rename to package/batocera/boot/uboot-evb-rk3399/Config.in diff --git a/package/boot/uboot-evb-rk3399/idbloader.img b/package/batocera/boot/uboot-evb-rk3399/idbloader.img similarity index 100% rename from package/boot/uboot-evb-rk3399/idbloader.img rename to package/batocera/boot/uboot-evb-rk3399/idbloader.img diff --git a/package/boot/uboot-evb-rk3399/trust.img b/package/batocera/boot/uboot-evb-rk3399/trust.img similarity index 100% rename from package/boot/uboot-evb-rk3399/trust.img rename to package/batocera/boot/uboot-evb-rk3399/trust.img diff --git a/package/boot/uboot-evb-rk3399/uboot-evb-rk3399.mk b/package/batocera/boot/uboot-evb-rk3399/uboot-evb-rk3399.mk similarity index 53% rename from package/boot/uboot-evb-rk3399/uboot-evb-rk3399.mk rename to package/batocera/boot/uboot-evb-rk3399/uboot-evb-rk3399.mk index aa2c893227b..5213aae9d9e 100644 --- a/package/boot/uboot-evb-rk3399/uboot-evb-rk3399.mk +++ b/package/batocera/boot/uboot-evb-rk3399/uboot-evb-rk3399.mk @@ -12,9 +12,9 @@ endef define UBOOT_EVB_RK3399_INSTALL_TARGET_CMDS mkdir -p $(BINARIES_DIR)/uboot-evb-rk3399 - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-evb-rk3399/idbloader.img $(BINARIES_DIR)/uboot-evb-rk3399/idbloader.img - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-evb-rk3399/uboot.img $(BINARIES_DIR)/uboot-evb-rk3399/uboot.img - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-evb-rk3399/trust.img $(BINARIES_DIR)/uboot-evb-rk3399/trust.img + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-evb-rk3399/idbloader.img $(BINARIES_DIR)/uboot-evb-rk3399/idbloader.img + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-evb-rk3399/uboot.img $(BINARIES_DIR)/uboot-evb-rk3399/uboot.img + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-evb-rk3399/trust.img $(BINARIES_DIR)/uboot-evb-rk3399/trust.img endef $(eval $(generic-package)) diff --git a/package/boot/uboot-evb-rk3399/uboot.img b/package/batocera/boot/uboot-evb-rk3399/uboot.img similarity index 100% rename from package/boot/uboot-evb-rk3399/uboot.img rename to package/batocera/boot/uboot-evb-rk3399/uboot.img diff --git a/package/boot/uboot-firefly-station-m2/Config.in b/package/batocera/boot/uboot-firefly-station-m2/Config.in similarity index 100% rename from package/boot/uboot-firefly-station-m2/Config.in rename to package/batocera/boot/uboot-firefly-station-m2/Config.in diff --git a/package/boot/uboot-firefly-station-m2/idbloader.img b/package/batocera/boot/uboot-firefly-station-m2/idbloader.img similarity index 100% rename from package/boot/uboot-firefly-station-m2/idbloader.img rename to package/batocera/boot/uboot-firefly-station-m2/idbloader.img diff --git a/package/boot/uboot-firefly-station-m2/uboot-firefly-station-m2.mk b/package/batocera/boot/uboot-firefly-station-m2/uboot-firefly-station-m2.mk similarity index 61% rename from package/boot/uboot-firefly-station-m2/uboot-firefly-station-m2.mk rename to package/batocera/boot/uboot-firefly-station-m2/uboot-firefly-station-m2.mk index a28213d66c5..09a0e501eea 100644 --- a/package/boot/uboot-firefly-station-m2/uboot-firefly-station-m2.mk +++ b/package/batocera/boot/uboot-firefly-station-m2/uboot-firefly-station-m2.mk @@ -12,8 +12,8 @@ endef define UBOOT_FIREFLY_STATION_M2_INSTALL_TARGET_CMDS mkdir -p $(BINARIES_DIR)/uboot-firefly-station-m2 - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-firefly-station-m2/idbloader.img $(BINARIES_DIR)/uboot-firefly-station-m2/idbloader.img - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-firefly-station-m2/uboot.img $(BINARIES_DIR)/uboot-firefly-station-m2/uboot.img + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-firefly-station-m2/idbloader.img $(BINARIES_DIR)/uboot-firefly-station-m2/idbloader.img + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-firefly-station-m2/uboot.img $(BINARIES_DIR)/uboot-firefly-station-m2/uboot.img endef $(eval $(generic-package)) diff --git a/package/boot/uboot-firefly-station-m2/uboot.img b/package/batocera/boot/uboot-firefly-station-m2/uboot.img similarity index 100% rename from package/boot/uboot-firefly-station-m2/uboot.img rename to package/batocera/boot/uboot-firefly-station-m2/uboot.img diff --git a/package/boot/uboot-firefly-station-p2/Config.in b/package/batocera/boot/uboot-firefly-station-p2/Config.in similarity index 100% rename from package/boot/uboot-firefly-station-p2/Config.in rename to package/batocera/boot/uboot-firefly-station-p2/Config.in diff --git a/package/boot/uboot-firefly-station-p2/idbloader.img b/package/batocera/boot/uboot-firefly-station-p2/idbloader.img similarity index 100% rename from package/boot/uboot-firefly-station-p2/idbloader.img rename to package/batocera/boot/uboot-firefly-station-p2/idbloader.img diff --git a/package/boot/uboot-firefly-station-p2/uboot-firefly-station-p2.mk b/package/batocera/boot/uboot-firefly-station-p2/uboot-firefly-station-p2.mk similarity index 61% rename from package/boot/uboot-firefly-station-p2/uboot-firefly-station-p2.mk rename to package/batocera/boot/uboot-firefly-station-p2/uboot-firefly-station-p2.mk index 9311ceec733..433e5340bf2 100644 --- a/package/boot/uboot-firefly-station-p2/uboot-firefly-station-p2.mk +++ b/package/batocera/boot/uboot-firefly-station-p2/uboot-firefly-station-p2.mk @@ -12,8 +12,8 @@ endef define UBOOT_FIREFLY_STATION_P2_INSTALL_TARGET_CMDS mkdir -p $(BINARIES_DIR)/uboot-firefly-station-p2 - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-firefly-station-p2/idbloader.img $(BINARIES_DIR)/uboot-firefly-station-p2/idbloader.img - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-firefly-station-p2/uboot.img $(BINARIES_DIR)/uboot-firefly-station-p2/uboot.img + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-firefly-station-p2/idbloader.img $(BINARIES_DIR)/uboot-firefly-station-p2/idbloader.img + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-firefly-station-p2/uboot.img $(BINARIES_DIR)/uboot-firefly-station-p2/uboot.img endef $(eval $(generic-package)) diff --git a/package/boot/uboot-firefly-station-p2/uboot.img b/package/batocera/boot/uboot-firefly-station-p2/uboot.img similarity index 100% rename from package/boot/uboot-firefly-station-p2/uboot.img rename to package/batocera/boot/uboot-firefly-station-p2/uboot.img diff --git a/package/boot/uboot-hugsun-x99/Config.in b/package/batocera/boot/uboot-hugsun-x99/Config.in similarity index 100% rename from package/boot/uboot-hugsun-x99/Config.in rename to package/batocera/boot/uboot-hugsun-x99/Config.in diff --git a/package/boot/uboot-hugsun-x99/idbloader.bin b/package/batocera/boot/uboot-hugsun-x99/idbloader.bin similarity index 100% rename from package/boot/uboot-hugsun-x99/idbloader.bin rename to package/batocera/boot/uboot-hugsun-x99/idbloader.bin diff --git a/package/boot/uboot-hugsun-x99/trust.bin b/package/batocera/boot/uboot-hugsun-x99/trust.bin similarity index 100% rename from package/boot/uboot-hugsun-x99/trust.bin rename to package/batocera/boot/uboot-hugsun-x99/trust.bin diff --git a/package/boot/uboot-hugsun-x99/uboot-hugsun-x99.mk b/package/batocera/boot/uboot-hugsun-x99/uboot-hugsun-x99.mk similarity index 52% rename from package/boot/uboot-hugsun-x99/uboot-hugsun-x99.mk rename to package/batocera/boot/uboot-hugsun-x99/uboot-hugsun-x99.mk index 7780162389d..263beba9937 100644 --- a/package/boot/uboot-hugsun-x99/uboot-hugsun-x99.mk +++ b/package/batocera/boot/uboot-hugsun-x99/uboot-hugsun-x99.mk @@ -12,9 +12,9 @@ endef define UBOOT_HUGSUN_X99_INSTALL_TARGET_CMDS mkdir -p $(BINARIES_DIR)/uboot-hugsun-x99 - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-hugsun-x99/idbloader.bin $(BINARIES_DIR)/uboot-hugsun-x99/idbloader.bin - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-hugsun-x99/uboot.img $(BINARIES_DIR)/uboot-hugsun-x99/uboot.img - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-hugsun-x99/trust.bin $(BINARIES_DIR)/uboot-hugsun-x99/trust.bin + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-hugsun-x99/idbloader.bin $(BINARIES_DIR)/uboot-hugsun-x99/idbloader.bin + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-hugsun-x99/uboot.img $(BINARIES_DIR)/uboot-hugsun-x99/uboot.img + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-hugsun-x99/trust.bin $(BINARIES_DIR)/uboot-hugsun-x99/trust.bin endef $(eval $(generic-package)) diff --git a/package/boot/uboot-hugsun-x99/uboot.img b/package/batocera/boot/uboot-hugsun-x99/uboot.img similarity index 100% rename from package/boot/uboot-hugsun-x99/uboot.img rename to package/batocera/boot/uboot-hugsun-x99/uboot.img diff --git a/package/boot/uboot-khadas-edge-2/Config.in b/package/batocera/boot/uboot-khadas-edge-2/Config.in similarity index 100% rename from package/boot/uboot-khadas-edge-2/Config.in rename to package/batocera/boot/uboot-khadas-edge-2/Config.in diff --git a/package/boot/uboot-khadas-edge-2/idbloader.img b/package/batocera/boot/uboot-khadas-edge-2/idbloader.img similarity index 100% rename from package/boot/uboot-khadas-edge-2/idbloader.img rename to package/batocera/boot/uboot-khadas-edge-2/idbloader.img diff --git a/package/boot/uboot-khadas-edge-2/u-boot.itb b/package/batocera/boot/uboot-khadas-edge-2/u-boot.itb similarity index 100% rename from package/boot/uboot-khadas-edge-2/u-boot.itb rename to package/batocera/boot/uboot-khadas-edge-2/u-boot.itb diff --git a/package/boot/uboot-khadas-edge-2/uboot-khadas-edge-2.mk b/package/batocera/boot/uboot-khadas-edge-2/uboot-khadas-edge-2.mk similarity index 61% rename from package/boot/uboot-khadas-edge-2/uboot-khadas-edge-2.mk rename to package/batocera/boot/uboot-khadas-edge-2/uboot-khadas-edge-2.mk index 46287a30828..77dcbb14028 100644 --- a/package/boot/uboot-khadas-edge-2/uboot-khadas-edge-2.mk +++ b/package/batocera/boot/uboot-khadas-edge-2/uboot-khadas-edge-2.mk @@ -12,8 +12,8 @@ endef define UBOOT_KHADAS_EDGE_2_INSTALL_TARGET_CMDS mkdir -p $(BINARIES_DIR)/uboot-khadas-edge-2 - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-khadas-edge-2/idbloader.img $(BINARIES_DIR)/uboot-khadas-edge-2/idbloader.img - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-khadas-edge-2/u-boot.itb $(BINARIES_DIR)/uboot-khadas-edge-2/u-boot.itb + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-khadas-edge-2/idbloader.img $(BINARIES_DIR)/uboot-khadas-edge-2/idbloader.img + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-khadas-edge-2/u-boot.itb $(BINARIES_DIR)/uboot-khadas-edge-2/u-boot.itb endef $(eval $(generic-package)) diff --git a/package/boot/uboot-multiboard/Config.in b/package/batocera/boot/uboot-multiboard/Config.in similarity index 100% rename from package/boot/uboot-multiboard/Config.in rename to package/batocera/boot/uboot-multiboard/Config.in diff --git a/package/boot/uboot-multiboard/common-h3/0001-Silence-uboot-serial-logs.patch b/package/batocera/boot/uboot-multiboard/common-h3/0001-Silence-uboot-serial-logs.patch similarity index 100% rename from package/boot/uboot-multiboard/common-h3/0001-Silence-uboot-serial-logs.patch rename to package/batocera/boot/uboot-multiboard/common-h3/0001-Silence-uboot-serial-logs.patch diff --git a/package/boot/uboot-multiboard/common-h3/0002-limit-resolution-to-max-1080p-uboot.patch b/package/batocera/boot/uboot-multiboard/common-h3/0002-limit-resolution-to-max-1080p-uboot.patch similarity index 100% rename from package/boot/uboot-multiboard/common-h3/0002-limit-resolution-to-max-1080p-uboot.patch rename to package/batocera/boot/uboot-multiboard/common-h3/0002-limit-resolution-to-max-1080p-uboot.patch diff --git a/package/boot/uboot-multiboard/common-h3/0003-Add-cha-support.patch b/package/batocera/boot/uboot-multiboard/common-h3/0003-Add-cha-support.patch similarity index 100% rename from package/boot/uboot-multiboard/common-h3/0003-Add-cha-support.patch rename to package/batocera/boot/uboot-multiboard/common-h3/0003-Add-cha-support.patch diff --git a/package/boot/uboot-multiboard/common-h3/0004-Enable-orangepi-pc-emmc-boot.patch b/package/batocera/boot/uboot-multiboard/common-h3/0004-Enable-orangepi-pc-emmc-boot.patch similarity index 100% rename from package/boot/uboot-multiboard/common-h3/0004-Enable-orangepi-pc-emmc-boot.patch rename to package/batocera/boot/uboot-multiboard/common-h3/0004-Enable-orangepi-pc-emmc-boot.patch diff --git a/package/boot/uboot-multiboard/common-h3/uboot.config.fragment b/package/batocera/boot/uboot-multiboard/common-h3/uboot.config.fragment similarity index 100% rename from package/boot/uboot-multiboard/common-h3/uboot.config.fragment rename to package/batocera/boot/uboot-multiboard/common-h3/uboot.config.fragment diff --git a/package/boot/uboot-multiboard/common-h5/0001-Libretech-H5-set-ddr3-to-744Mhz.patch b/package/batocera/boot/uboot-multiboard/common-h5/0001-Libretech-H5-set-ddr3-to-744Mhz.patch similarity index 100% rename from package/boot/uboot-multiboard/common-h5/0001-Libretech-H5-set-ddr3-to-744Mhz.patch rename to package/batocera/boot/uboot-multiboard/common-h5/0001-Libretech-H5-set-ddr3-to-744Mhz.patch diff --git a/package/boot/uboot-multiboard/common-h5/0002-Silence-uboot-serial-logs.patch b/package/batocera/boot/uboot-multiboard/common-h5/0002-Silence-uboot-serial-logs.patch similarity index 100% rename from package/boot/uboot-multiboard/common-h5/0002-Silence-uboot-serial-logs.patch rename to package/batocera/boot/uboot-multiboard/common-h5/0002-Silence-uboot-serial-logs.patch diff --git a/package/boot/uboot-multiboard/common-h5/uboot.config.fragment b/package/batocera/boot/uboot-multiboard/common-h5/uboot.config.fragment similarity index 100% rename from package/boot/uboot-multiboard/common-h5/uboot.config.fragment rename to package/batocera/boot/uboot-multiboard/common-h5/uboot.config.fragment diff --git a/package/boot/uboot-multiboard/common-h6/0001-OrangePi-3-LTS-support.patch b/package/batocera/boot/uboot-multiboard/common-h6/0001-OrangePi-3-LTS-support.patch similarity index 100% rename from package/boot/uboot-multiboard/common-h6/0001-OrangePi-3-LTS-support.patch rename to package/batocera/boot/uboot-multiboard/common-h6/0001-OrangePi-3-LTS-support.patch diff --git a/package/boot/uboot-multiboard/common-h6/0002-Silence-uboot-serial-logs.patch b/package/batocera/boot/uboot-multiboard/common-h6/0002-Silence-uboot-serial-logs.patch similarity index 100% rename from package/boot/uboot-multiboard/common-h6/0002-Silence-uboot-serial-logs.patch rename to package/batocera/boot/uboot-multiboard/common-h6/0002-Silence-uboot-serial-logs.patch diff --git a/package/boot/uboot-multiboard/common-h6/uboot.config.fragment b/package/batocera/boot/uboot-multiboard/common-h6/uboot.config.fragment similarity index 100% rename from package/boot/uboot-multiboard/common-h6/uboot.config.fragment rename to package/batocera/boot/uboot-multiboard/common-h6/uboot.config.fragment diff --git a/package/boot/uboot-multiboard/common-h616/000-Silence-uboot-serial-logs.patch b/package/batocera/boot/uboot-multiboard/common-h616/000-Silence-uboot-serial-logs.patch similarity index 100% rename from package/boot/uboot-multiboard/common-h616/000-Silence-uboot-serial-logs.patch rename to package/batocera/boot/uboot-multiboard/common-h616/000-Silence-uboot-serial-logs.patch diff --git a/package/boot/uboot-multiboard/common-h616/001-allwinner-common-enable-autoboot-keyed.patch b/package/batocera/boot/uboot-multiboard/common-h616/001-allwinner-common-enable-autoboot-keyed.patch similarity index 100% rename from package/boot/uboot-multiboard/common-h616/001-allwinner-common-enable-autoboot-keyed.patch rename to package/batocera/boot/uboot-multiboard/common-h616/001-allwinner-common-enable-autoboot-keyed.patch diff --git a/package/boot/uboot-multiboard/common-h616/002-allwinner-common-boot-splash.patch b/package/batocera/boot/uboot-multiboard/common-h616/002-allwinner-common-boot-splash.patch similarity index 100% rename from package/boot/uboot-multiboard/common-h616/002-allwinner-common-boot-splash.patch rename to package/batocera/boot/uboot-multiboard/common-h616/002-allwinner-common-boot-splash.patch diff --git a/package/boot/uboot-multiboard/common-h616/003-allwinner-common-h616-THS-workaround.patch b/package/batocera/boot/uboot-multiboard/common-h616/003-allwinner-common-h616-THS-workaround.patch similarity index 100% rename from package/boot/uboot-multiboard/common-h616/003-allwinner-common-h616-THS-workaround.patch rename to package/batocera/boot/uboot-multiboard/common-h616/003-allwinner-common-h616-THS-workaround.patch diff --git a/package/boot/uboot-multiboard/common-h616/004-allwinner-common-h616-GPU-enable-hack.patch b/package/batocera/boot/uboot-multiboard/common-h616/004-allwinner-common-h616-GPU-enable-hack.patch similarity index 100% rename from package/boot/uboot-multiboard/common-h616/004-allwinner-common-h616-GPU-enable-hack.patch rename to package/batocera/boot/uboot-multiboard/common-h616/004-allwinner-common-h616-GPU-enable-hack.patch diff --git a/package/boot/uboot-multiboard/common-h616/005-allwinner-common-pwrled-config-option.patch b/package/batocera/boot/uboot-multiboard/common-h616/005-allwinner-common-pwrled-config-option.patch similarity index 100% rename from package/boot/uboot-multiboard/common-h616/005-allwinner-common-pwrled-config-option.patch rename to package/batocera/boot/uboot-multiboard/common-h616/005-allwinner-common-pwrled-config-option.patch diff --git a/package/boot/uboot-multiboard/common-h616/006-allwinner-common-fdt-setprop-fix-unaligned-access.patch b/package/batocera/boot/uboot-multiboard/common-h616/006-allwinner-common-fdt-setprop-fix-unaligned-access.patch similarity index 100% rename from package/boot/uboot-multiboard/common-h616/006-allwinner-common-fdt-setprop-fix-unaligned-access.patch rename to package/batocera/boot/uboot-multiboard/common-h616/006-allwinner-common-fdt-setprop-fix-unaligned-access.patch diff --git a/package/boot/uboot-multiboard/common-h616/007-opizero3-1.5GB-trim-from-u-boot-v2024.01.patch b/package/batocera/boot/uboot-multiboard/common-h616/007-opizero3-1.5GB-trim-from-u-boot-v2024.01.patch similarity index 100% rename from package/boot/uboot-multiboard/common-h616/007-opizero3-1.5GB-trim-from-u-boot-v2024.01.patch rename to package/batocera/boot/uboot-multiboard/common-h616/007-opizero3-1.5GB-trim-from-u-boot-v2024.01.patch diff --git a/package/boot/uboot-multiboard/common-h616/008-add-board-bananapi-m4-berry.patch b/package/batocera/boot/uboot-multiboard/common-h616/008-add-board-bananapi-m4-berry.patch similarity index 100% rename from package/boot/uboot-multiboard/common-h616/008-add-board-bananapi-m4-berry.patch rename to package/batocera/boot/uboot-multiboard/common-h616/008-add-board-bananapi-m4-berry.patch diff --git a/package/boot/uboot-multiboard/common-h616/uboot.config.fragment b/package/batocera/boot/uboot-multiboard/common-h616/uboot.config.fragment similarity index 100% rename from package/boot/uboot-multiboard/common-h616/uboot.config.fragment rename to package/batocera/boot/uboot-multiboard/common-h616/uboot.config.fragment diff --git a/package/boot/uboot-multiboard/common-rk3288/uboot.config.fragment b/package/batocera/boot/uboot-multiboard/common-rk3288/uboot.config.fragment similarity index 100% rename from package/boot/uboot-multiboard/common-rk3288/uboot.config.fragment rename to package/batocera/boot/uboot-multiboard/common-rk3288/uboot.config.fragment diff --git a/package/boot/uboot-multiboard/common-rk3328/0004-rockchip-rk3328-Set-VOP-QoS-to-high-priority.patch b/package/batocera/boot/uboot-multiboard/common-rk3328/0004-rockchip-rk3328-Set-VOP-QoS-to-high-priority.patch similarity index 100% rename from package/boot/uboot-multiboard/common-rk3328/0004-rockchip-rk3328-Set-VOP-QoS-to-high-priority.patch rename to package/batocera/boot/uboot-multiboard/common-rk3328/0004-rockchip-rk3328-Set-VOP-QoS-to-high-priority.patch diff --git a/package/boot/uboot-multiboard/common-rk3328/0005-rockchip-rk3288-Pick-SD-card-as-first-boot-device.patch b/package/batocera/boot/uboot-multiboard/common-rk3328/0005-rockchip-rk3288-Pick-SD-card-as-first-boot-device.patch similarity index 100% rename from package/boot/uboot-multiboard/common-rk3328/0005-rockchip-rk3288-Pick-SD-card-as-first-boot-device.patch rename to package/batocera/boot/uboot-multiboard/common-rk3328/0005-rockchip-rk3288-Pick-SD-card-as-first-boot-device.patch diff --git a/package/boot/uboot-multiboard/common-rk3328/0006-Rockchip-rk3399-evb-Don-t-initalize-i2c-bus-in-SPL.patch b/package/batocera/boot/uboot-multiboard/common-rk3328/0006-Rockchip-rk3399-evb-Don-t-initalize-i2c-bus-in-SPL.patch similarity index 100% rename from package/boot/uboot-multiboard/common-rk3328/0006-Rockchip-rk3399-evb-Don-t-initalize-i2c-bus-in-SPL.patch rename to package/batocera/boot/uboot-multiboard/common-rk3328/0006-Rockchip-rk3399-evb-Don-t-initalize-i2c-bus-in-SPL.patch diff --git a/package/boot/uboot-multiboard/common-rk3328/0007-Add-efuse-config.patch b/package/batocera/boot/uboot-multiboard/common-rk3328/0007-Add-efuse-config.patch similarity index 100% rename from package/boot/uboot-multiboard/common-rk3328/0007-Add-efuse-config.patch rename to package/batocera/boot/uboot-multiboard/common-rk3328/0007-Add-efuse-config.patch diff --git a/package/boot/uboot-multiboard/common-rk3399/uboot.config.fragment b/package/batocera/boot/uboot-multiboard/common-rk3399/uboot.config.fragment similarity index 100% rename from package/boot/uboot-multiboard/common-rk3399/uboot.config.fragment rename to package/batocera/boot/uboot-multiboard/common-rk3399/uboot.config.fragment diff --git a/package/boot/uboot-multiboard/miqi-rk3288/0001-MiQi-uboot-fixes.patch b/package/batocera/boot/uboot-multiboard/miqi-rk3288/0001-MiQi-uboot-fixes.patch similarity index 100% rename from package/boot/uboot-multiboard/miqi-rk3288/0001-MiQi-uboot-fixes.patch rename to package/batocera/boot/uboot-multiboard/miqi-rk3288/0001-MiQi-uboot-fixes.patch diff --git a/package/boot/uboot-multiboard/miqi-rk3288/0002-rk3288-tinker-s-add-rockchip-rk3288-tinker-compatibl.patch b/package/batocera/boot/uboot-multiboard/miqi-rk3288/0002-rk3288-tinker-s-add-rockchip-rk3288-tinker-compatibl.patch similarity index 100% rename from package/boot/uboot-multiboard/miqi-rk3288/0002-rk3288-tinker-s-add-rockchip-rk3288-tinker-compatibl.patch rename to package/batocera/boot/uboot-multiboard/miqi-rk3288/0002-rk3288-tinker-s-add-rockchip-rk3288-tinker-compatibl.patch diff --git a/package/boot/uboot-multiboard/miqi-rk3288/0003-rk3288-miqi-update-defconfig-to-work-with-tpl.patch b/package/batocera/boot/uboot-multiboard/miqi-rk3288/0003-rk3288-miqi-update-defconfig-to-work-with-tpl.patch similarity index 100% rename from package/boot/uboot-multiboard/miqi-rk3288/0003-rk3288-miqi-update-defconfig-to-work-with-tpl.patch rename to package/batocera/boot/uboot-multiboard/miqi-rk3288/0003-rk3288-miqi-update-defconfig-to-work-with-tpl.patch diff --git a/package/boot/uboot-multiboard/uboot-multiboard.hash b/package/batocera/boot/uboot-multiboard/uboot-multiboard.hash similarity index 100% rename from package/boot/uboot-multiboard/uboot-multiboard.hash rename to package/batocera/boot/uboot-multiboard/uboot-multiboard.hash diff --git a/package/boot/uboot-multiboard/uboot-multiboard.mk b/package/batocera/boot/uboot-multiboard/uboot-multiboard.mk similarity index 100% rename from package/boot/uboot-multiboard/uboot-multiboard.mk rename to package/batocera/boot/uboot-multiboard/uboot-multiboard.mk diff --git a/package/boot/uboot-multiboard/uboot.config.fragment b/package/batocera/boot/uboot-multiboard/uboot.config.fragment similarity index 100% rename from package/boot/uboot-multiboard/uboot.config.fragment rename to package/batocera/boot/uboot-multiboard/uboot.config.fragment diff --git a/package/boot/uboot-odroid-goa/001-toolchain.patch b/package/batocera/boot/uboot-odroid-goa/001-toolchain.patch similarity index 100% rename from package/boot/uboot-odroid-goa/001-toolchain.patch rename to package/batocera/boot/uboot-odroid-goa/001-toolchain.patch diff --git a/package/boot/uboot-odroid-goa/002-title.patch b/package/batocera/boot/uboot-odroid-goa/002-title.patch similarity index 100% rename from package/boot/uboot-odroid-goa/002-title.patch rename to package/batocera/boot/uboot-odroid-goa/002-title.patch diff --git a/package/boot/uboot-odroid-goa/003-magic-config.patch b/package/batocera/boot/uboot-odroid-goa/003-magic-config.patch similarity index 100% rename from package/boot/uboot-odroid-goa/003-magic-config.patch rename to package/batocera/boot/uboot-odroid-goa/003-magic-config.patch diff --git a/package/boot/uboot-odroid-goa/004-Kbuild-fix-escaping-in-.cmd-files-for-future-Make.patch b/package/batocera/boot/uboot-odroid-goa/004-Kbuild-fix-escaping-in-.cmd-files-for-future-Make.patch similarity index 100% rename from package/boot/uboot-odroid-goa/004-Kbuild-fix-escaping-in-.cmd-files-for-future-Make.patch rename to package/batocera/boot/uboot-odroid-goa/004-Kbuild-fix-escaping-in-.cmd-files-for-future-Make.patch diff --git a/package/boot/uboot-odroid-goa/005-kbuild-fix-escaping-in-appending-U-Boot-own-DT.patch b/package/batocera/boot/uboot-odroid-goa/005-kbuild-fix-escaping-in-appending-U-Boot-own-DT.patch similarity index 100% rename from package/boot/uboot-odroid-goa/005-kbuild-fix-escaping-in-appending-U-Boot-own-DT.patch rename to package/batocera/boot/uboot-odroid-goa/005-kbuild-fix-escaping-in-appending-U-Boot-own-DT.patch diff --git a/package/boot/uboot-odroid-goa/006-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/package/batocera/boot/uboot-odroid-goa/006-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch similarity index 100% rename from package/boot/uboot-odroid-goa/006-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch rename to package/batocera/boot/uboot-odroid-goa/006-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch diff --git a/package/boot/uboot-odroid-goa/Config.in b/package/batocera/boot/uboot-odroid-goa/Config.in similarity index 100% rename from package/boot/uboot-odroid-goa/Config.in rename to package/batocera/boot/uboot-odroid-goa/Config.in diff --git a/package/boot/uboot-odroid-goa/uboot-odroid-goa.mk b/package/batocera/boot/uboot-odroid-goa/uboot-odroid-goa.mk similarity index 100% rename from package/boot/uboot-odroid-goa/uboot-odroid-goa.mk rename to package/batocera/boot/uboot-odroid-goa/uboot-odroid-goa.mk diff --git a/package/boot/uboot-odroid-m1/Config.in b/package/batocera/boot/uboot-odroid-m1/Config.in similarity index 100% rename from package/boot/uboot-odroid-m1/Config.in rename to package/batocera/boot/uboot-odroid-m1/Config.in diff --git a/package/boot/uboot-odroid-m1/idbloader.img b/package/batocera/boot/uboot-odroid-m1/idbloader.img similarity index 100% rename from package/boot/uboot-odroid-m1/idbloader.img rename to package/batocera/boot/uboot-odroid-m1/idbloader.img diff --git a/package/boot/uboot-odroid-m1/u-boot.itb b/package/batocera/boot/uboot-odroid-m1/u-boot.itb similarity index 100% rename from package/boot/uboot-odroid-m1/u-boot.itb rename to package/batocera/boot/uboot-odroid-m1/u-boot.itb diff --git a/package/boot/uboot-odroid-m1/uboot-odroid-m1.mk b/package/batocera/boot/uboot-odroid-m1/uboot-odroid-m1.mk similarity index 62% rename from package/boot/uboot-odroid-m1/uboot-odroid-m1.mk rename to package/batocera/boot/uboot-odroid-m1/uboot-odroid-m1.mk index 2eef2ede686..3e15bdb9046 100644 --- a/package/boot/uboot-odroid-m1/uboot-odroid-m1.mk +++ b/package/batocera/boot/uboot-odroid-m1/uboot-odroid-m1.mk @@ -12,8 +12,8 @@ endef define UBOOT_ODROID_M1_INSTALL_TARGET_CMDS mkdir -p $(BINARIES_DIR)/uboot-odroid-m1 - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-odroid-m1/idbloader.img $(BINARIES_DIR)/uboot-odroid-m1/idbloader.img - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-odroid-m1/u-boot.itb $(BINARIES_DIR)/uboot-odroid-m1/u-boot.itb + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-odroid-m1/idbloader.img $(BINARIES_DIR)/uboot-odroid-m1/idbloader.img + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-odroid-m1/u-boot.itb $(BINARIES_DIR)/uboot-odroid-m1/u-boot.itb endef $(eval $(generic-package)) diff --git a/package/boot/uboot-odroid-xu4/Config.in b/package/batocera/boot/uboot-odroid-xu4/Config.in similarity index 100% rename from package/boot/uboot-odroid-xu4/Config.in rename to package/batocera/boot/uboot-odroid-xu4/Config.in diff --git a/package/boot/uboot-odroid-xu4/uboot-odroid-xu4.mk b/package/batocera/boot/uboot-odroid-xu4/uboot-odroid-xu4.mk similarity index 100% rename from package/boot/uboot-odroid-xu4/uboot-odroid-xu4.mk rename to package/batocera/boot/uboot-odroid-xu4/uboot-odroid-xu4.mk diff --git a/package/boot/uboot-orangepi-4-lts/Config.in b/package/batocera/boot/uboot-orangepi-4-lts/Config.in similarity index 100% rename from package/boot/uboot-orangepi-4-lts/Config.in rename to package/batocera/boot/uboot-orangepi-4-lts/Config.in diff --git a/package/boot/uboot-orangepi-4-lts/idbloader.bin b/package/batocera/boot/uboot-orangepi-4-lts/idbloader.bin similarity index 100% rename from package/boot/uboot-orangepi-4-lts/idbloader.bin rename to package/batocera/boot/uboot-orangepi-4-lts/idbloader.bin diff --git a/package/boot/uboot-orangepi-4-lts/trust.bin b/package/batocera/boot/uboot-orangepi-4-lts/trust.bin similarity index 100% rename from package/boot/uboot-orangepi-4-lts/trust.bin rename to package/batocera/boot/uboot-orangepi-4-lts/trust.bin diff --git a/package/boot/uboot-orangepi-4-lts/uboot-orangepi-4-lts.mk b/package/batocera/boot/uboot-orangepi-4-lts/uboot-orangepi-4-lts.mk similarity index 52% rename from package/boot/uboot-orangepi-4-lts/uboot-orangepi-4-lts.mk rename to package/batocera/boot/uboot-orangepi-4-lts/uboot-orangepi-4-lts.mk index 274b187e247..d51fd773589 100644 --- a/package/boot/uboot-orangepi-4-lts/uboot-orangepi-4-lts.mk +++ b/package/batocera/boot/uboot-orangepi-4-lts/uboot-orangepi-4-lts.mk @@ -12,9 +12,9 @@ endef define UBOOT_ORANGEPI_4_LTS_INSTALL_TARGET_CMDS mkdir -p $(BINARIES_DIR)/uboot-orangepi-4-lts - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-orangepi-4-lts/idbloader.bin $(BINARIES_DIR)/uboot-orangepi-4-lts/idbloader.bin - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-orangepi-4-lts/trust.bin $(BINARIES_DIR)/uboot-orangepi-4-lts/trust.bin - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-orangepi-4-lts/uboot.img $(BINARIES_DIR)/uboot-orangepi-4-lts/u-boot.img + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-orangepi-4-lts/idbloader.bin $(BINARIES_DIR)/uboot-orangepi-4-lts/idbloader.bin + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-orangepi-4-lts/trust.bin $(BINARIES_DIR)/uboot-orangepi-4-lts/trust.bin + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-orangepi-4-lts/uboot.img $(BINARIES_DIR)/uboot-orangepi-4-lts/u-boot.img endef $(eval $(generic-package)) diff --git a/package/boot/uboot-orangepi-4-lts/uboot.img b/package/batocera/boot/uboot-orangepi-4-lts/uboot.img similarity index 100% rename from package/boot/uboot-orangepi-4-lts/uboot.img rename to package/batocera/boot/uboot-orangepi-4-lts/uboot.img diff --git a/package/boot/uboot-orangepi-5-plus/Config.in b/package/batocera/boot/uboot-orangepi-5-plus/Config.in similarity index 100% rename from package/boot/uboot-orangepi-5-plus/Config.in rename to package/batocera/boot/uboot-orangepi-5-plus/Config.in diff --git a/package/boot/uboot-orangepi-5-plus/idbloader.img b/package/batocera/boot/uboot-orangepi-5-plus/idbloader.img similarity index 100% rename from package/boot/uboot-orangepi-5-plus/idbloader.img rename to package/batocera/boot/uboot-orangepi-5-plus/idbloader.img diff --git a/package/boot/uboot-orangepi-5-plus/u-boot.itb b/package/batocera/boot/uboot-orangepi-5-plus/u-boot.itb similarity index 100% rename from package/boot/uboot-orangepi-5-plus/u-boot.itb rename to package/batocera/boot/uboot-orangepi-5-plus/u-boot.itb diff --git a/package/boot/uboot-orangepi-5-plus/uboot-orangepi-5-plus.mk b/package/batocera/boot/uboot-orangepi-5-plus/uboot-orangepi-5-plus.mk similarity index 61% rename from package/boot/uboot-orangepi-5-plus/uboot-orangepi-5-plus.mk rename to package/batocera/boot/uboot-orangepi-5-plus/uboot-orangepi-5-plus.mk index 22d44f4fae9..9fb299f4845 100644 --- a/package/boot/uboot-orangepi-5-plus/uboot-orangepi-5-plus.mk +++ b/package/batocera/boot/uboot-orangepi-5-plus/uboot-orangepi-5-plus.mk @@ -12,8 +12,8 @@ endef define UBOOT_ORANGEPI_5_PLUS_INSTALL_TARGET_CMDS mkdir -p $(BINARIES_DIR)/uboot-orangepi-5-plus - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-orangepi-5-plus/idbloader.img $(BINARIES_DIR)/uboot-orangepi-5-plus/idbloader.img - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-orangepi-5-plus/u-boot.itb $(BINARIES_DIR)/uboot-orangepi-5-plus/u-boot.itb + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-orangepi-5-plus/idbloader.img $(BINARIES_DIR)/uboot-orangepi-5-plus/idbloader.img + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-orangepi-5-plus/u-boot.itb $(BINARIES_DIR)/uboot-orangepi-5-plus/u-boot.itb endef $(eval $(generic-package)) diff --git a/package/boot/uboot-orangepi-800/Config.in b/package/batocera/boot/uboot-orangepi-800/Config.in similarity index 100% rename from package/boot/uboot-orangepi-800/Config.in rename to package/batocera/boot/uboot-orangepi-800/Config.in diff --git a/package/boot/uboot-orangepi-800/idbloader.img b/package/batocera/boot/uboot-orangepi-800/idbloader.img similarity index 100% rename from package/boot/uboot-orangepi-800/idbloader.img rename to package/batocera/boot/uboot-orangepi-800/idbloader.img diff --git a/package/boot/uboot-orangepi-800/u-boot.itb b/package/batocera/boot/uboot-orangepi-800/u-boot.itb similarity index 100% rename from package/boot/uboot-orangepi-800/u-boot.itb rename to package/batocera/boot/uboot-orangepi-800/u-boot.itb diff --git a/package/boot/uboot-orangepi-800/uboot-orangepi-800.mk b/package/batocera/boot/uboot-orangepi-800/uboot-orangepi-800.mk similarity index 61% rename from package/boot/uboot-orangepi-800/uboot-orangepi-800.mk rename to package/batocera/boot/uboot-orangepi-800/uboot-orangepi-800.mk index 4aa9476f52e..179bf5a8db7 100644 --- a/package/boot/uboot-orangepi-800/uboot-orangepi-800.mk +++ b/package/batocera/boot/uboot-orangepi-800/uboot-orangepi-800.mk @@ -12,8 +12,8 @@ endef define UBOOT_ORANGEPI_800_INSTALL_TARGET_CMDS mkdir -p $(BINARIES_DIR)/uboot-orangepi-800 - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-orangepi-800/idbloader.img $(BINARIES_DIR)/uboot-orangepi-800/idbloader.img - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-orangepi-800/u-boot.itb $(BINARIES_DIR)/uboot-orangepi-800/u-boot.itb + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-orangepi-800/idbloader.img $(BINARIES_DIR)/uboot-orangepi-800/idbloader.img + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-orangepi-800/u-boot.itb $(BINARIES_DIR)/uboot-orangepi-800/u-boot.itb endef $(eval $(generic-package)) diff --git a/package/boot/uboot-powkiddy-a13/Config.in b/package/batocera/boot/uboot-powkiddy-a13/Config.in similarity index 100% rename from package/boot/uboot-powkiddy-a13/Config.in rename to package/batocera/boot/uboot-powkiddy-a13/Config.in diff --git a/package/boot/uboot-powkiddy-a13/uboot-powkiddy-a13.mk b/package/batocera/boot/uboot-powkiddy-a13/uboot-powkiddy-a13.mk similarity index 100% rename from package/boot/uboot-powkiddy-a13/uboot-powkiddy-a13.mk rename to package/batocera/boot/uboot-powkiddy-a13/uboot-powkiddy-a13.mk diff --git a/package/boot/uboot-ps5000/Config.in b/package/batocera/boot/uboot-ps5000/Config.in similarity index 100% rename from package/boot/uboot-ps5000/Config.in rename to package/batocera/boot/uboot-ps5000/Config.in diff --git a/package/boot/uboot-ps5000/uboot-ps5000.mk b/package/batocera/boot/uboot-ps5000/uboot-ps5000.mk similarity index 100% rename from package/boot/uboot-ps5000/uboot-ps5000.mk rename to package/batocera/boot/uboot-ps5000/uboot-ps5000.mk diff --git a/package/boot/uboot-ps7000/Config.in b/package/batocera/boot/uboot-ps7000/Config.in similarity index 100% rename from package/boot/uboot-ps7000/Config.in rename to package/batocera/boot/uboot-ps7000/Config.in diff --git a/package/boot/uboot-ps7000/uboot-ps7000.mk b/package/batocera/boot/uboot-ps7000/uboot-ps7000.mk similarity index 100% rename from package/boot/uboot-ps7000/uboot-ps7000.mk rename to package/batocera/boot/uboot-ps7000/uboot-ps7000.mk diff --git a/package/boot/uboot-rk3588/Config.in b/package/batocera/boot/uboot-rk3588/Config.in similarity index 100% rename from package/boot/uboot-rk3588/Config.in rename to package/batocera/boot/uboot-rk3588/Config.in diff --git a/package/boot/uboot-rk3588/uboot-rk3588.mk b/package/batocera/boot/uboot-rk3588/uboot-rk3588.mk similarity index 100% rename from package/boot/uboot-rk3588/uboot-rk3588.mk rename to package/batocera/boot/uboot-rk3588/uboot-rk3588.mk diff --git a/package/boot/uboot-rock-3a/Config.in b/package/batocera/boot/uboot-rock-3a/Config.in similarity index 100% rename from package/boot/uboot-rock-3a/Config.in rename to package/batocera/boot/uboot-rock-3a/Config.in diff --git a/package/boot/uboot-rock-3a/idbloader.img b/package/batocera/boot/uboot-rock-3a/idbloader.img similarity index 100% rename from package/boot/uboot-rock-3a/idbloader.img rename to package/batocera/boot/uboot-rock-3a/idbloader.img diff --git a/package/boot/uboot-rock-3a/u-boot.itb b/package/batocera/boot/uboot-rock-3a/u-boot.itb similarity index 100% rename from package/boot/uboot-rock-3a/u-boot.itb rename to package/batocera/boot/uboot-rock-3a/u-boot.itb diff --git a/package/boot/uboot-rock-3a/uboot-rock-3a.mk b/package/batocera/boot/uboot-rock-3a/uboot-rock-3a.mk similarity index 61% rename from package/boot/uboot-rock-3a/uboot-rock-3a.mk rename to package/batocera/boot/uboot-rock-3a/uboot-rock-3a.mk index ec85b9f7186..a5b33e269f1 100644 --- a/package/boot/uboot-rock-3a/uboot-rock-3a.mk +++ b/package/batocera/boot/uboot-rock-3a/uboot-rock-3a.mk @@ -12,8 +12,8 @@ endef define UBOOT_ROCK_3A_INSTALL_TARGET_CMDS mkdir -p $(BINARIES_DIR)/uboot-rock-3a - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-rock-3a/idbloader.img $(BINARIES_DIR)/uboot-rock-3a/idbloader.img - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-rock-3a/u-boot.itb $(BINARIES_DIR)/uboot-rock-3a/u-boot.itb + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-rock-3a/idbloader.img $(BINARIES_DIR)/uboot-rock-3a/idbloader.img + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-rock-3a/u-boot.itb $(BINARIES_DIR)/uboot-rock-3a/u-boot.itb endef $(eval $(generic-package)) diff --git a/package/boot/uboot-rock-3c/Config.in b/package/batocera/boot/uboot-rock-3c/Config.in similarity index 100% rename from package/boot/uboot-rock-3c/Config.in rename to package/batocera/boot/uboot-rock-3c/Config.in diff --git a/package/boot/uboot-rock-3c/idbloader.img b/package/batocera/boot/uboot-rock-3c/idbloader.img similarity index 100% rename from package/boot/uboot-rock-3c/idbloader.img rename to package/batocera/boot/uboot-rock-3c/idbloader.img diff --git a/package/boot/uboot-rock-3c/u-boot.itb b/package/batocera/boot/uboot-rock-3c/u-boot.itb similarity index 100% rename from package/boot/uboot-rock-3c/u-boot.itb rename to package/batocera/boot/uboot-rock-3c/u-boot.itb diff --git a/package/boot/uboot-rock-3c/uboot-rock-3c.mk b/package/batocera/boot/uboot-rock-3c/uboot-rock-3c.mk similarity index 61% rename from package/boot/uboot-rock-3c/uboot-rock-3c.mk rename to package/batocera/boot/uboot-rock-3c/uboot-rock-3c.mk index 42e9fe86053..49699f1e761 100644 --- a/package/boot/uboot-rock-3c/uboot-rock-3c.mk +++ b/package/batocera/boot/uboot-rock-3c/uboot-rock-3c.mk @@ -12,8 +12,8 @@ endef define UBOOT_ROCK_3C_INSTALL_TARGET_CMDS mkdir -p $(BINARIES_DIR)/uboot-rock-3c - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-rock-3c/idbloader.img $(BINARIES_DIR)/uboot-rock-3c/idbloader.img - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-rock-3c/u-boot.itb $(BINARIES_DIR)/uboot-rock-3c/u-boot.itb + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-rock-3c/idbloader.img $(BINARIES_DIR)/uboot-rock-3c/idbloader.img + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-rock-3c/u-boot.itb $(BINARIES_DIR)/uboot-rock-3c/u-boot.itb endef $(eval $(generic-package)) diff --git a/package/boot/uboot-rock-5c/Config.in b/package/batocera/boot/uboot-rock-5c/Config.in similarity index 100% rename from package/boot/uboot-rock-5c/Config.in rename to package/batocera/boot/uboot-rock-5c/Config.in diff --git a/package/boot/uboot-rock-5c/idbloader.img b/package/batocera/boot/uboot-rock-5c/idbloader.img similarity index 100% rename from package/boot/uboot-rock-5c/idbloader.img rename to package/batocera/boot/uboot-rock-5c/idbloader.img diff --git a/package/boot/uboot-rock-5c/u-boot.itb b/package/batocera/boot/uboot-rock-5c/u-boot.itb similarity index 100% rename from package/boot/uboot-rock-5c/u-boot.itb rename to package/batocera/boot/uboot-rock-5c/u-boot.itb diff --git a/package/boot/uboot-rock-5c/uboot-rock-5c.mk b/package/batocera/boot/uboot-rock-5c/uboot-rock-5c.mk similarity index 73% rename from package/boot/uboot-rock-5c/uboot-rock-5c.mk rename to package/batocera/boot/uboot-rock-5c/uboot-rock-5c.mk index d18699a8104..18a84798432 100644 --- a/package/boot/uboot-rock-5c/uboot-rock-5c.mk +++ b/package/batocera/boot/uboot-rock-5c/uboot-rock-5c.mk @@ -12,9 +12,9 @@ endef define UBOOT_ROCK_5C_INSTALL_TARGET_CMDS mkdir -p $(BINARIES_DIR)/rock-5c - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-rock-5c/idbloader.img \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-rock-5c/idbloader.img \ $(BINARIES_DIR)/rock-5c/idbloader.img - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-rock-5c/u-boot.itb \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-rock-5c/u-boot.itb \ $(BINARIES_DIR)/rock-5c/u-boot.itb endef diff --git a/package/boot/uboot-vim1s/Config.in b/package/batocera/boot/uboot-vim1s/Config.in similarity index 100% rename from package/boot/uboot-vim1s/Config.in rename to package/batocera/boot/uboot-vim1s/Config.in diff --git a/package/boot/uboot-vim1s/u-boot.bin.sd.bin.signed b/package/batocera/boot/uboot-vim1s/u-boot.bin.sd.bin.signed similarity index 100% rename from package/boot/uboot-vim1s/u-boot.bin.sd.bin.signed rename to package/batocera/boot/uboot-vim1s/u-boot.bin.sd.bin.signed diff --git a/package/boot/uboot-vim1s/uboot-vim1s.mk b/package/batocera/boot/uboot-vim1s/uboot-vim1s.mk similarity index 73% rename from package/boot/uboot-vim1s/uboot-vim1s.mk rename to package/batocera/boot/uboot-vim1s/uboot-vim1s.mk index 3a892febc72..49c2bfd9bd2 100644 --- a/package/boot/uboot-vim1s/uboot-vim1s.mk +++ b/package/batocera/boot/uboot-vim1s/uboot-vim1s.mk @@ -12,7 +12,7 @@ endef define UBOOT_VIM1S_INSTALL_TARGET_CMDS mkdir -p $(BINARIES_DIR)/uboot-vim1s/ - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-vim1s/u-boot.bin.sd.bin.signed $(BINARIES_DIR)/uboot-vim1s/u-boot.bin.sd.signed + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-vim1s/u-boot.bin.sd.bin.signed $(BINARIES_DIR)/uboot-vim1s/u-boot.bin.sd.signed endef $(eval $(generic-package)) diff --git a/package/boot/uboot-vim4/Config.in b/package/batocera/boot/uboot-vim4/Config.in similarity index 100% rename from package/boot/uboot-vim4/Config.in rename to package/batocera/boot/uboot-vim4/Config.in diff --git a/package/boot/uboot-vim4/u-boot.bin.sd.bin.signed b/package/batocera/boot/uboot-vim4/u-boot.bin.sd.bin.signed similarity index 100% rename from package/boot/uboot-vim4/u-boot.bin.sd.bin.signed rename to package/batocera/boot/uboot-vim4/u-boot.bin.sd.bin.signed diff --git a/package/boot/uboot-vim4/uboot-vim4.mk b/package/batocera/boot/uboot-vim4/uboot-vim4.mk similarity index 73% rename from package/boot/uboot-vim4/uboot-vim4.mk rename to package/batocera/boot/uboot-vim4/uboot-vim4.mk index 002922a63bb..469e85ce879 100644 --- a/package/boot/uboot-vim4/uboot-vim4.mk +++ b/package/batocera/boot/uboot-vim4/uboot-vim4.mk @@ -12,7 +12,7 @@ endef define UBOOT_VIM4_INSTALL_TARGET_CMDS mkdir -p $(BINARIES_DIR)/uboot-vim4/ - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/boot/uboot-vim4/u-boot.bin.sd.bin.signed $(BINARIES_DIR)/uboot-vim4/u-boot.bin.sd.signed + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-vim4/u-boot.bin.sd.bin.signed $(BINARIES_DIR)/uboot-vim4/u-boot.bin.sd.signed endef $(eval $(generic-package)) diff --git a/package/boot/uboot-visionfive2/Config.in b/package/batocera/boot/uboot-visionfive2/Config.in similarity index 100% rename from package/boot/uboot-visionfive2/Config.in rename to package/batocera/boot/uboot-visionfive2/Config.in diff --git a/package/boot/uboot-visionfive2/uboot-visionfive2.hash b/package/batocera/boot/uboot-visionfive2/uboot-visionfive2.hash similarity index 100% rename from package/boot/uboot-visionfive2/uboot-visionfive2.hash rename to package/batocera/boot/uboot-visionfive2/uboot-visionfive2.hash diff --git a/package/boot/uboot-visionfive2/uboot-visionfive2.mk b/package/batocera/boot/uboot-visionfive2/uboot-visionfive2.mk similarity index 100% rename from package/boot/uboot-visionfive2/uboot-visionfive2.mk rename to package/batocera/boot/uboot-visionfive2/uboot-visionfive2.mk diff --git a/package/cases/deskpipro-case/Config.in b/package/batocera/cases/deskpipro-case/Config.in similarity index 100% rename from package/cases/deskpipro-case/Config.in rename to package/batocera/cases/deskpipro-case/Config.in diff --git a/package/cases/deskpipro-case/deskpipro-case.mk b/package/batocera/cases/deskpipro-case/deskpipro-case.mk similarity index 100% rename from package/cases/deskpipro-case/deskpipro-case.mk rename to package/batocera/cases/deskpipro-case/deskpipro-case.mk diff --git a/package/cases/element14-pi-desktop/Config.in b/package/batocera/cases/element14-pi-desktop/Config.in similarity index 100% rename from package/cases/element14-pi-desktop/Config.in rename to package/batocera/cases/element14-pi-desktop/Config.in diff --git a/package/cases/element14-pi-desktop/element14-pi-desktop.mk b/package/batocera/cases/element14-pi-desktop/element14-pi-desktop.mk similarity index 100% rename from package/cases/element14-pi-desktop/element14-pi-desktop.mk rename to package/batocera/cases/element14-pi-desktop/element14-pi-desktop.mk diff --git a/package/cases/pironman/001-binary-fixes.patch b/package/batocera/cases/pironman/001-binary-fixes.patch similarity index 100% rename from package/cases/pironman/001-binary-fixes.patch rename to package/batocera/cases/pironman/001-binary-fixes.patch diff --git a/package/cases/pironman/002-remove-sudo.patch b/package/batocera/cases/pironman/002-remove-sudo.patch similarity index 100% rename from package/cases/pironman/002-remove-sudo.patch rename to package/batocera/cases/pironman/002-remove-sudo.patch diff --git a/package/cases/pironman/003-fix-cpu-percentage.patch b/package/batocera/cases/pironman/003-fix-cpu-percentage.patch similarity index 100% rename from package/cases/pironman/003-fix-cpu-percentage.patch rename to package/batocera/cases/pironman/003-fix-cpu-percentage.patch diff --git a/package/cases/pironman/004-fix-pin.patch b/package/batocera/cases/pironman/004-fix-pin.patch similarity index 100% rename from package/cases/pironman/004-fix-pin.patch rename to package/batocera/cases/pironman/004-fix-pin.patch diff --git a/package/cases/pironman/Config.in b/package/batocera/cases/pironman/Config.in similarity index 100% rename from package/cases/pironman/Config.in rename to package/batocera/cases/pironman/Config.in diff --git a/package/cases/pironman/pironman.mk b/package/batocera/cases/pironman/pironman.mk similarity index 100% rename from package/cases/pironman/pironman.mk rename to package/batocera/cases/pironman/pironman.mk diff --git a/package/cases/pironman5/001-fix-service-location.patch b/package/batocera/cases/pironman5/001-fix-service-location.patch similarity index 100% rename from package/cases/pironman5/001-fix-service-location.patch rename to package/batocera/cases/pironman5/001-fix-service-location.patch diff --git a/package/cases/pironman5/002-fix-deprecated-method.patch b/package/batocera/cases/pironman5/002-fix-deprecated-method.patch similarity index 100% rename from package/cases/pironman5/002-fix-deprecated-method.patch rename to package/batocera/cases/pironman5/002-fix-deprecated-method.patch diff --git a/package/cases/pironman5/Config.in b/package/batocera/cases/pironman5/Config.in similarity index 100% rename from package/cases/pironman5/Config.in rename to package/batocera/cases/pironman5/Config.in diff --git a/package/cases/pironman5/pironman5.mk b/package/batocera/cases/pironman5/pironman5.mk similarity index 100% rename from package/cases/pironman5/pironman5.mk rename to package/batocera/cases/pironman5/pironman5.mk diff --git a/package/cases/roshambo-case/Config.in b/package/batocera/cases/roshambo-case/Config.in similarity index 100% rename from package/cases/roshambo-case/Config.in rename to package/batocera/cases/roshambo-case/Config.in diff --git a/package/cases/roshambo-case/S14roshambo b/package/batocera/cases/roshambo-case/S14roshambo similarity index 100% rename from package/cases/roshambo-case/S14roshambo rename to package/batocera/cases/roshambo-case/S14roshambo diff --git a/package/cases/roshambo-case/roshambo-case.mk b/package/batocera/cases/roshambo-case/roshambo-case.mk similarity index 67% rename from package/cases/roshambo-case/roshambo-case.mk rename to package/batocera/cases/roshambo-case/roshambo-case.mk index 72d744a60b1..2792c103139 100644 --- a/package/cases/roshambo-case/roshambo-case.mk +++ b/package/batocera/cases/roshambo-case/roshambo-case.mk @@ -11,15 +11,15 @@ ROSHAMBO_CASE_DEPENDENCIES = python3 host-python3 define ROSHAMBO_CASE_BUILD_CMDS (cd $(@D) && $(HOST_DIR)/bin/python -m compileall R64) - (cd $(BR2_EXTERNAL_BATOCERA_PATH)/package/cases/roshambo-case && $(HOST_DIR)/bin/python -m compileall roshambo-case.py) + (cd $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/cases/roshambo-case && $(HOST_DIR)/bin/python -m compileall roshambo-case.py) endef define ROSHAMBO_CASE_INSTALL_TARGET_CMDS install -d -m 755 $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/R64 cp -r $(@D)/R64/* $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/R64 - $(INSTALL) -Dm755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/cases/roshambo-case/S14roshambo $(TARGET_DIR)/etc/init.d/ - $(INSTALL) -Dm755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/cases/roshambo-case/roshambo-case.py* $(TARGET_DIR)/usr/bin/ + $(INSTALL) -Dm755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/cases/roshambo-case/S14roshambo $(TARGET_DIR)/etc/init.d/ + $(INSTALL) -Dm755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/cases/roshambo-case/roshambo-case.py* $(TARGET_DIR)/usr/bin/ endef $(eval $(generic-package)) diff --git a/package/cases/roshambo-case/roshambo-case.py b/package/batocera/cases/roshambo-case/roshambo-case.py similarity index 100% rename from package/cases/roshambo-case/roshambo-case.py rename to package/batocera/cases/roshambo-case/roshambo-case.py diff --git a/package/controllers/aelightgun/99-aelightgun.rules b/package/batocera/controllers/aelightgun/99-aelightgun.rules similarity index 100% rename from package/controllers/aelightgun/99-aelightgun.rules rename to package/batocera/controllers/aelightgun/99-aelightgun.rules diff --git a/package/controllers/aelightgun/Config.in b/package/batocera/controllers/aelightgun/Config.in similarity index 100% rename from package/controllers/aelightgun/Config.in rename to package/batocera/controllers/aelightgun/Config.in diff --git a/package/batocera/controllers/aelightgun/aelightgun.mk b/package/batocera/controllers/aelightgun/aelightgun.mk new file mode 100644 index 00000000000..36fbcdca47b --- /dev/null +++ b/package/batocera/controllers/aelightgun/aelightgun.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# aelightgun +# +################################################################################ +AELIGHTGUN_VERSION = 1 +AELIGHTGUN_LICENSE = GPL +AELIGHTGUN_SOURCE= + +define AELIGHTGUN_INSTALL_TARGET_CMDS + $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/aelightgun/99-aelightgun.rules $(TARGET_DIR)/etc/udev/rules.d/99-aelightgun.rules + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/aelightgun/virtual-aelightgun-add $(TARGET_DIR)/usr/bin/virtual-aelightgun-add +endef + +$(eval $(generic-package)) diff --git a/package/controllers/aelightgun/virtual-aelightgun-add b/package/batocera/controllers/aelightgun/virtual-aelightgun-add similarity index 100% rename from package/controllers/aelightgun/virtual-aelightgun-add rename to package/batocera/controllers/aelightgun/virtual-aelightgun-add diff --git a/package/controllers/aimtrak-guns/99-Aimtrak_ATRAK.rules b/package/batocera/controllers/aimtrak-guns/99-Aimtrak_ATRAK.rules similarity index 100% rename from package/controllers/aimtrak-guns/99-Aimtrak_ATRAK.rules rename to package/batocera/controllers/aimtrak-guns/99-Aimtrak_ATRAK.rules diff --git a/package/controllers/aimtrak-guns/Config.in b/package/batocera/controllers/aimtrak-guns/Config.in similarity index 100% rename from package/controllers/aimtrak-guns/Config.in rename to package/batocera/controllers/aimtrak-guns/Config.in diff --git a/package/controllers/aimtrak-guns/aimtrak-add b/package/batocera/controllers/aimtrak-guns/aimtrak-add similarity index 100% rename from package/controllers/aimtrak-guns/aimtrak-add rename to package/batocera/controllers/aimtrak-guns/aimtrak-add diff --git a/package/controllers/aimtrak-guns/aimtrak-guns.mk b/package/batocera/controllers/aimtrak-guns/aimtrak-guns.mk similarity index 51% rename from package/controllers/aimtrak-guns/aimtrak-guns.mk rename to package/batocera/controllers/aimtrak-guns/aimtrak-guns.mk index 606bccc7509..0d5e0e00b9c 100644 --- a/package/controllers/aimtrak-guns/aimtrak-guns.mk +++ b/package/batocera/controllers/aimtrak-guns/aimtrak-guns.mk @@ -8,8 +8,8 @@ AIMTRAK_GUNS_LICENSE = GPL AIMTRAK_GUNS_SOURCE= define AIMTRAK_GUNS_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/aimtrak-guns/99-Aimtrak_ATRAK.rules $(TARGET_DIR)/etc/udev/rules.d/99-Aimtrak_ATRAK.rules - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/aimtrak-guns/aimtrak-add $(TARGET_DIR)/usr/bin/aimtrak-add + $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/aimtrak-guns/99-Aimtrak_ATRAK.rules $(TARGET_DIR)/etc/udev/rules.d/99-Aimtrak_ATRAK.rules + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/aimtrak-guns/aimtrak-add $(TARGET_DIR)/usr/bin/aimtrak-add endef $(eval $(generic-package)) diff --git a/package/controllers/anbernic-gpio-pad/99-anbernic-gpio-pad.rules b/package/batocera/controllers/anbernic-gpio-pad/99-anbernic-gpio-pad.rules similarity index 100% rename from package/controllers/anbernic-gpio-pad/99-anbernic-gpio-pad.rules rename to package/batocera/controllers/anbernic-gpio-pad/99-anbernic-gpio-pad.rules diff --git a/package/controllers/anbernic-gpio-pad/Config.in b/package/batocera/controllers/anbernic-gpio-pad/Config.in similarity index 100% rename from package/controllers/anbernic-gpio-pad/Config.in rename to package/batocera/controllers/anbernic-gpio-pad/Config.in diff --git a/package/controllers/anbernic-gpio-pad/anbernic-gpio-pad-add b/package/batocera/controllers/anbernic-gpio-pad/anbernic-gpio-pad-add similarity index 100% rename from package/controllers/anbernic-gpio-pad/anbernic-gpio-pad-add rename to package/batocera/controllers/anbernic-gpio-pad/anbernic-gpio-pad-add diff --git a/package/controllers/anbernic-gpio-pad/anbernic-gpio-pad.mk b/package/batocera/controllers/anbernic-gpio-pad/anbernic-gpio-pad.mk similarity index 50% rename from package/controllers/anbernic-gpio-pad/anbernic-gpio-pad.mk rename to package/batocera/controllers/anbernic-gpio-pad/anbernic-gpio-pad.mk index e4da5b073e4..2d583e75782 100644 --- a/package/controllers/anbernic-gpio-pad/anbernic-gpio-pad.mk +++ b/package/batocera/controllers/anbernic-gpio-pad/anbernic-gpio-pad.mk @@ -8,8 +8,8 @@ ANBERNIC_GPIO_PAD_LICENSE = GPL ANBERNIC_GPIO_PAD_SOURCE= define ANBERNIC_GPIO_PAD_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/anbernic-gpio-pad/99-anbernic-gpio-pad.rules $(TARGET_DIR)/etc/udev/rules.d/99-anbernic-gpio-pad.rules - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/anbernic-gpio-pad/anbernic-gpio-pad-add $(TARGET_DIR)/usr/bin/anbernic-gpio-pad-add + $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/anbernic-gpio-pad/99-anbernic-gpio-pad.rules $(TARGET_DIR)/etc/udev/rules.d/99-anbernic-gpio-pad.rules + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/anbernic-gpio-pad/anbernic-gpio-pad-add $(TARGET_DIR)/usr/bin/anbernic-gpio-pad-add endef $(eval $(generic-package)) diff --git a/package/controllers/batocera-gun-calibrator/99-gun-calibrator.rules b/package/batocera/controllers/batocera-gun-calibrator/99-gun-calibrator.rules similarity index 100% rename from package/controllers/batocera-gun-calibrator/99-gun-calibrator.rules rename to package/batocera/controllers/batocera-gun-calibrator/99-gun-calibrator.rules diff --git a/package/controllers/batocera-gun-calibrator/Config.in b/package/batocera/controllers/batocera-gun-calibrator/Config.in similarity index 100% rename from package/controllers/batocera-gun-calibrator/Config.in rename to package/batocera/controllers/batocera-gun-calibrator/Config.in diff --git a/package/controllers/batocera-gun-calibrator/batocera-gun-calibrator b/package/batocera/controllers/batocera-gun-calibrator/batocera-gun-calibrator similarity index 100% rename from package/controllers/batocera-gun-calibrator/batocera-gun-calibrator rename to package/batocera/controllers/batocera-gun-calibrator/batocera-gun-calibrator diff --git a/package/controllers/batocera-gun-calibrator/batocera-gun-calibrator-daemon b/package/batocera/controllers/batocera-gun-calibrator/batocera-gun-calibrator-daemon similarity index 100% rename from package/controllers/batocera-gun-calibrator/batocera-gun-calibrator-daemon rename to package/batocera/controllers/batocera-gun-calibrator/batocera-gun-calibrator-daemon diff --git a/package/batocera/controllers/batocera-gun-calibrator/batocera-gun-calibrator.mk b/package/batocera/controllers/batocera-gun-calibrator/batocera-gun-calibrator.mk new file mode 100644 index 00000000000..376cca1a008 --- /dev/null +++ b/package/batocera/controllers/batocera-gun-calibrator/batocera-gun-calibrator.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# batocera-gun-calibrator +# +################################################################################ +BATOCERA_GUN_CALIBRATOR_VERSION = 1 +BATOCERA_GUN_CALIBRATOR_LICENSE = GPL +BATOCERA_GUN_CALIBRATOR_SOURCE= + +define BATOCERA_GUN_CALIBRATOR_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/batocera-gun-calibrator/batocera-gun-calibrator $(TARGET_DIR)/usr/bin/batocera-gun-calibrator + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/batocera-gun-calibrator/batocera-gun-calibrator-daemon $(TARGET_DIR)/usr/bin/batocera-gun-calibrator-daemon + $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/batocera-gun-calibrator/99-gun-calibrator.rules $(TARGET_DIR)/etc/udev/rules.d/99-gun-calibrator.rules + +endef + +$(eval $(generic-package)) diff --git a/package/controllers/batocera-wheel-calibrator/Config.in b/package/batocera/controllers/batocera-wheel-calibrator/Config.in similarity index 100% rename from package/controllers/batocera-wheel-calibrator/Config.in rename to package/batocera/controllers/batocera-wheel-calibrator/Config.in diff --git a/package/controllers/batocera-wheel-calibrator/batocera-wheel-calibrator b/package/batocera/controllers/batocera-wheel-calibrator/batocera-wheel-calibrator similarity index 100% rename from package/controllers/batocera-wheel-calibrator/batocera-wheel-calibrator rename to package/batocera/controllers/batocera-wheel-calibrator/batocera-wheel-calibrator diff --git a/package/controllers/batocera-wheel-calibrator/batocera-wheel-calibrator.mk b/package/batocera/controllers/batocera-wheel-calibrator/batocera-wheel-calibrator.mk similarity index 68% rename from package/controllers/batocera-wheel-calibrator/batocera-wheel-calibrator.mk rename to package/batocera/controllers/batocera-wheel-calibrator/batocera-wheel-calibrator.mk index 5c72ee4441f..17aa76eb763 100644 --- a/package/controllers/batocera-wheel-calibrator/batocera-wheel-calibrator.mk +++ b/package/batocera/controllers/batocera-wheel-calibrator/batocera-wheel-calibrator.mk @@ -8,7 +8,7 @@ BATOCERA_WHEEL_CALIBRATOR_LICENSE = GPL BATOCERA_WHEEL_CALIBRATOR_SOURCE= define BATOCERA_WHEEL_CALIBRATOR_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/batocera-wheel-calibrator/batocera-wheel-calibrator $(TARGET_DIR)/usr/bin/batocera-wheel-calibrator + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/batocera-wheel-calibrator/batocera-wheel-calibrator $(TARGET_DIR)/usr/bin/batocera-wheel-calibrator endef $(eval $(generic-package)) diff --git a/package/controllers/db9_gpio_rpi/001-Makefile.patch b/package/batocera/controllers/db9_gpio_rpi/001-Makefile.patch similarity index 100% rename from package/controllers/db9_gpio_rpi/001-Makefile.patch rename to package/batocera/controllers/db9_gpio_rpi/001-Makefile.patch diff --git a/package/controllers/db9_gpio_rpi/Config.in b/package/batocera/controllers/db9_gpio_rpi/Config.in similarity index 100% rename from package/controllers/db9_gpio_rpi/Config.in rename to package/batocera/controllers/db9_gpio_rpi/Config.in diff --git a/package/controllers/db9_gpio_rpi/db9_gpio_rpi.mk b/package/batocera/controllers/db9_gpio_rpi/db9_gpio_rpi.mk similarity index 100% rename from package/controllers/db9_gpio_rpi/db9_gpio_rpi.mk rename to package/batocera/controllers/db9_gpio_rpi/db9_gpio_rpi.mk diff --git a/package/controllers/dolphinCrosshairsPack/Config.in b/package/batocera/controllers/dolphinCrosshairsPack/Config.in similarity index 100% rename from package/controllers/dolphinCrosshairsPack/Config.in rename to package/batocera/controllers/dolphinCrosshairsPack/Config.in diff --git a/package/controllers/dolphinCrosshairsPack/dolphinCrosshairsPack.mk b/package/batocera/controllers/dolphinCrosshairsPack/dolphinCrosshairsPack.mk similarity index 100% rename from package/controllers/dolphinCrosshairsPack/dolphinCrosshairsPack.mk rename to package/batocera/controllers/dolphinCrosshairsPack/dolphinCrosshairsPack.mk diff --git a/package/controllers/dolphinbar-guns/99-dolphinbar.rules b/package/batocera/controllers/dolphinbar-guns/99-dolphinbar.rules similarity index 100% rename from package/controllers/dolphinbar-guns/99-dolphinbar.rules rename to package/batocera/controllers/dolphinbar-guns/99-dolphinbar.rules diff --git a/package/controllers/dolphinbar-guns/Config.in b/package/batocera/controllers/dolphinbar-guns/Config.in similarity index 100% rename from package/controllers/dolphinbar-guns/Config.in rename to package/batocera/controllers/dolphinbar-guns/Config.in diff --git a/package/controllers/dolphinbar-guns/dolphinbar-guns.mk b/package/batocera/controllers/dolphinbar-guns/dolphinbar-guns.mk similarity index 67% rename from package/controllers/dolphinbar-guns/dolphinbar-guns.mk rename to package/batocera/controllers/dolphinbar-guns/dolphinbar-guns.mk index baf5335bbf4..283e09a6513 100644 --- a/package/controllers/dolphinbar-guns/dolphinbar-guns.mk +++ b/package/batocera/controllers/dolphinbar-guns/dolphinbar-guns.mk @@ -8,7 +8,7 @@ DOLPHINBAR_GUNS_LICENSE = GPL DOLPHINBAR_GUNS_SOURCE= define DOLPHINBAR_GUNS_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/dolphinbar-guns/99-dolphinbar.rules $(TARGET_DIR)/etc/udev/rules.d/99-dolphinbar.rules + $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/dolphinbar-guns/99-dolphinbar.rules $(TARGET_DIR)/etc/udev/rules.d/99-dolphinbar.rules endef $(eval $(generic-package)) diff --git a/package/controllers/fun-r1-gamepad/Config.in b/package/batocera/controllers/fun-r1-gamepad/Config.in similarity index 100% rename from package/controllers/fun-r1-gamepad/Config.in rename to package/batocera/controllers/fun-r1-gamepad/Config.in diff --git a/package/controllers/fun-r1-gamepad/S31funr1gamepad b/package/batocera/controllers/fun-r1-gamepad/S31funr1gamepad similarity index 100% rename from package/controllers/fun-r1-gamepad/S31funr1gamepad rename to package/batocera/controllers/fun-r1-gamepad/S31funr1gamepad diff --git a/package/controllers/fun-r1-gamepad/fun-r1-gamepad.mk b/package/batocera/controllers/fun-r1-gamepad/fun-r1-gamepad.mk similarity index 65% rename from package/controllers/fun-r1-gamepad/fun-r1-gamepad.mk rename to package/batocera/controllers/fun-r1-gamepad/fun-r1-gamepad.mk index a0812e17118..c98ee74507a 100644 --- a/package/controllers/fun-r1-gamepad/fun-r1-gamepad.mk +++ b/package/batocera/controllers/fun-r1-gamepad/fun-r1-gamepad.mk @@ -11,12 +11,12 @@ FUN_R1_GAMEPAD_LICENSE = GPLv2 FUN_R1_GAMEPAD_FLAGS= define FUN_R1_GAMEPAD_BUILD_CMDS - $(TARGET_CC) $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/fun-r1-gamepad/fun_r1_gamepad.c -o $(@D)/fun_r1_gamepad + $(TARGET_CC) $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/fun-r1-gamepad/fun_r1_gamepad.c -o $(@D)/fun_r1_gamepad endef define FUN_R1_GAMEPAD_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(@D)/fun_r1_gamepad $(TARGET_DIR)/usr/bin/fun_r1_gamepad - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/fun-r1-gamepad/S31funr1gamepad $(TARGET_DIR)/etc/init.d/S31funr1gamepad + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/fun-r1-gamepad/S31funr1gamepad $(TARGET_DIR)/etc/init.d/S31funr1gamepad endef $(eval $(generic-package)) diff --git a/package/controllers/fun-r1-gamepad/fun_r1_gamepad.c b/package/batocera/controllers/fun-r1-gamepad/fun_r1_gamepad.c similarity index 100% rename from package/controllers/fun-r1-gamepad/fun_r1_gamepad.c rename to package/batocera/controllers/fun-r1-gamepad/fun_r1_gamepad.c diff --git a/package/controllers/fusion-lightguns/99-fusion-lightguns.rules b/package/batocera/controllers/fusion-lightguns/99-fusion-lightguns.rules similarity index 100% rename from package/controllers/fusion-lightguns/99-fusion-lightguns.rules rename to package/batocera/controllers/fusion-lightguns/99-fusion-lightguns.rules diff --git a/package/controllers/fusion-lightguns/Config.in b/package/batocera/controllers/fusion-lightguns/Config.in similarity index 100% rename from package/controllers/fusion-lightguns/Config.in rename to package/batocera/controllers/fusion-lightguns/Config.in diff --git a/package/controllers/fusion-lightguns/fusion-lightguns-add b/package/batocera/controllers/fusion-lightguns/fusion-lightguns-add similarity index 100% rename from package/controllers/fusion-lightguns/fusion-lightguns-add rename to package/batocera/controllers/fusion-lightguns/fusion-lightguns-add diff --git a/package/controllers/fusion-lightguns/fusion-lightguns.mk b/package/batocera/controllers/fusion-lightguns/fusion-lightguns.mk similarity index 50% rename from package/controllers/fusion-lightguns/fusion-lightguns.mk rename to package/batocera/controllers/fusion-lightguns/fusion-lightguns.mk index 63881731ebe..51f9b09ea8e 100644 --- a/package/controllers/fusion-lightguns/fusion-lightguns.mk +++ b/package/batocera/controllers/fusion-lightguns/fusion-lightguns.mk @@ -8,8 +8,8 @@ FUSION_LIGHTGUNS_LICENSE = GPL FUSION_LIGHTGUNS_SOURCE= define FUSION_LIGHTGUNS_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/fusion-lightguns/99-fusion-lightguns.rules $(TARGET_DIR)/etc/udev/rules.d/99-fusion-lightguns.rules - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/fusion-lightguns/fusion-lightguns-add $(TARGET_DIR)/usr/bin/fusion-lightguns-add + $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/fusion-lightguns/99-fusion-lightguns.rules $(TARGET_DIR)/etc/udev/rules.d/99-fusion-lightguns.rules + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/fusion-lightguns/fusion-lightguns-add $(TARGET_DIR)/usr/bin/fusion-lightguns-add endef $(eval $(generic-package)) diff --git a/package/controllers/gamecon_gpio_rpi/Config.in b/package/batocera/controllers/gamecon_gpio_rpi/Config.in similarity index 100% rename from package/controllers/gamecon_gpio_rpi/Config.in rename to package/batocera/controllers/gamecon_gpio_rpi/Config.in diff --git a/package/controllers/gamecon_gpio_rpi/gamecon_gpio_rpi.mk b/package/batocera/controllers/gamecon_gpio_rpi/gamecon_gpio_rpi.mk similarity index 100% rename from package/controllers/gamecon_gpio_rpi/gamecon_gpio_rpi.mk rename to package/batocera/controllers/gamecon_gpio_rpi/gamecon_gpio_rpi.mk diff --git a/package/controllers/gun4ir-guns/99-gun4ir.rules b/package/batocera/controllers/gun4ir-guns/99-gun4ir.rules similarity index 100% rename from package/controllers/gun4ir-guns/99-gun4ir.rules rename to package/batocera/controllers/gun4ir-guns/99-gun4ir.rules diff --git a/package/controllers/gun4ir-guns/Config.in b/package/batocera/controllers/gun4ir-guns/Config.in similarity index 100% rename from package/controllers/gun4ir-guns/Config.in rename to package/batocera/controllers/gun4ir-guns/Config.in diff --git a/package/controllers/gun4ir-guns/gun4ir-guns.mk b/package/batocera/controllers/gun4ir-guns/gun4ir-guns.mk similarity index 51% rename from package/controllers/gun4ir-guns/gun4ir-guns.mk rename to package/batocera/controllers/gun4ir-guns/gun4ir-guns.mk index d4e5d088b0e..300065dc5d3 100644 --- a/package/controllers/gun4ir-guns/gun4ir-guns.mk +++ b/package/batocera/controllers/gun4ir-guns/gun4ir-guns.mk @@ -8,8 +8,8 @@ GUN4IR_GUNS_LICENSE = GPL GUN4IR_GUNS_SOURCE= define GUN4IR_GUNS_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/gun4ir-guns/99-gun4ir.rules $(TARGET_DIR)/etc/udev/rules.d/99-gun4ir.rules - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/gun4ir-guns/virtual-gun4ir-add $(TARGET_DIR)/usr/bin/virtual-gun4ir-add + $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/gun4ir-guns/99-gun4ir.rules $(TARGET_DIR)/etc/udev/rules.d/99-gun4ir.rules + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/gun4ir-guns/virtual-gun4ir-add $(TARGET_DIR)/usr/bin/virtual-gun4ir-add endef $(eval $(generic-package)) diff --git a/package/controllers/gun4ir-guns/virtual-gun4ir-add b/package/batocera/controllers/gun4ir-guns/virtual-gun4ir-add similarity index 100% rename from package/controllers/gun4ir-guns/virtual-gun4ir-add rename to package/batocera/controllers/gun4ir-guns/virtual-gun4ir-add diff --git a/package/controllers/guncon/99-guncon.rules b/package/batocera/controllers/guncon/99-guncon.rules similarity index 100% rename from package/controllers/guncon/99-guncon.rules rename to package/batocera/controllers/guncon/99-guncon.rules diff --git a/package/controllers/guncon/Config.in b/package/batocera/controllers/guncon/Config.in similarity index 100% rename from package/controllers/guncon/Config.in rename to package/batocera/controllers/guncon/Config.in diff --git a/package/controllers/guncon/guncon-add b/package/batocera/controllers/guncon/guncon-add similarity index 100% rename from package/controllers/guncon/guncon-add rename to package/batocera/controllers/guncon/guncon-add diff --git a/package/controllers/guncon/guncon.mk b/package/batocera/controllers/guncon/guncon.mk similarity index 80% rename from package/controllers/guncon/guncon.mk rename to package/batocera/controllers/guncon/guncon.mk index dd7c8fa6904..fa8cc35c4b8 100644 --- a/package/controllers/guncon/guncon.mk +++ b/package/batocera/controllers/guncon/guncon.mk @@ -7,8 +7,8 @@ GUNCON_VERSION = 4e959300f14b9ad364ea66dce6189c076de63a27 GUNCON_SITE = $(call github,Redemp,guncon2,$(GUNCON_VERSION)) define GUNCON_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/guncon/99-guncon.rules $(TARGET_DIR)/etc/udev/rules.d/99-guncon.rules - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/guncon/guncon-add $(TARGET_DIR)/usr/bin/guncon-add + $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/guncon/99-guncon.rules $(TARGET_DIR)/etc/udev/rules.d/99-guncon.rules + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/guncon/guncon-add $(TARGET_DIR)/usr/bin/guncon-add $(INSTALL) -D -m 0755 $(@D)/guncon2_calibrate.sh $(TARGET_DIR)/usr/bin/guncon2_calibrate.sh $(INSTALL) -D -m 0755 $(@D)/calibrate.py $(TARGET_DIR)/usr/bin/calibrate.py endef diff --git a/package/controllers/guncon3/001-remove-unused-variables.patch b/package/batocera/controllers/guncon3/001-remove-unused-variables.patch similarity index 100% rename from package/controllers/guncon3/001-remove-unused-variables.patch rename to package/batocera/controllers/guncon3/001-remove-unused-variables.patch diff --git a/package/controllers/guncon3/99-guncon3.rules b/package/batocera/controllers/guncon3/99-guncon3.rules similarity index 100% rename from package/controllers/guncon3/99-guncon3.rules rename to package/batocera/controllers/guncon3/99-guncon3.rules diff --git a/package/controllers/guncon3/Config.in b/package/batocera/controllers/guncon3/Config.in similarity index 100% rename from package/controllers/guncon3/Config.in rename to package/batocera/controllers/guncon3/Config.in diff --git a/package/controllers/guncon3/batocera-guncon3-calibrator b/package/batocera/controllers/guncon3/batocera-guncon3-calibrator similarity index 100% rename from package/controllers/guncon3/batocera-guncon3-calibrator rename to package/batocera/controllers/guncon3/batocera-guncon3-calibrator diff --git a/package/controllers/guncon3/batocera-guncon3-calibrator-daemon b/package/batocera/controllers/guncon3/batocera-guncon3-calibrator-daemon similarity index 100% rename from package/controllers/guncon3/batocera-guncon3-calibrator-daemon rename to package/batocera/controllers/guncon3/batocera-guncon3-calibrator-daemon diff --git a/package/controllers/guncon3/guncon3-add b/package/batocera/controllers/guncon3/guncon3-add similarity index 100% rename from package/controllers/guncon3/guncon3-add rename to package/batocera/controllers/guncon3/guncon3-add diff --git a/package/controllers/guncon3/guncon3.mk b/package/batocera/controllers/guncon3/guncon3.mk similarity index 91% rename from package/controllers/guncon3/guncon3.mk rename to package/batocera/controllers/guncon3/guncon3.mk index 5416abbf318..7c73a842dd0 100644 --- a/package/controllers/guncon3/guncon3.mk +++ b/package/batocera/controllers/guncon3/guncon3.mk @@ -8,7 +8,7 @@ GUNCON3_SITE = $(call github,pcnimdock,guncon3_dkms,$(GUNCON3_VERSION)) GUNCON3_MODULE_SUBDIRS = src -GUNCON3_SOURCE_PATH = $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/guncon3 +GUNCON3_SOURCE_PATH = $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/guncon3 define GUNCON3_INSTALL_TARGET_CMDS $(INSTALL) -m 0644 -D $(GUNCON3_SOURCE_PATH)/99-guncon3.rules \ diff --git a/package/controllers/hid-nx/0001-3rdparty-workaround.patch b/package/batocera/controllers/hid-nx/0001-3rdparty-workaround.patch similarity index 100% rename from package/controllers/hid-nx/0001-3rdparty-workaround.patch rename to package/batocera/controllers/hid-nx/0001-3rdparty-workaround.patch diff --git a/package/controllers/hid-nx/Config.in b/package/batocera/controllers/hid-nx/Config.in similarity index 100% rename from package/controllers/hid-nx/Config.in rename to package/batocera/controllers/hid-nx/Config.in diff --git a/package/controllers/hid-nx/hid-nx.mk b/package/batocera/controllers/hid-nx/hid-nx.mk similarity index 100% rename from package/controllers/hid-nx/hid-nx.mk rename to package/batocera/controllers/hid-nx/hid-nx.mk diff --git a/package/controllers/input-wrapper/000-makefile.patch b/package/batocera/controllers/input-wrapper/000-makefile.patch similarity index 100% rename from package/controllers/input-wrapper/000-makefile.patch rename to package/batocera/controllers/input-wrapper/000-makefile.patch diff --git a/package/controllers/input-wrapper/Config.in b/package/batocera/controllers/input-wrapper/Config.in similarity index 100% rename from package/controllers/input-wrapper/Config.in rename to package/batocera/controllers/input-wrapper/Config.in diff --git a/package/controllers/input-wrapper/input-wrapper.mk b/package/batocera/controllers/input-wrapper/input-wrapper.mk similarity index 73% rename from package/controllers/input-wrapper/input-wrapper.mk rename to package/batocera/controllers/input-wrapper/input-wrapper.mk index 6698b5d1ff6..5e2f930101b 100644 --- a/package/controllers/input-wrapper/input-wrapper.mk +++ b/package/batocera/controllers/input-wrapper/input-wrapper.mk @@ -18,8 +18,8 @@ define INPUT_WRAPPER_INSTALL_TARGET_CMDS $(INSTALL) $(@D)/virtual_controller $(TARGET_DIR)/usr/bin/virtual_controller - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/input-wrapper/sysconfigs/S60input-wrapper $(TARGET_DIR)/etc/init.d - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/input-wrapper/sysconfigs/99-input-wrapper.rules $(TARGET_DIR)/etc/udev/rules.d + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/input-wrapper/sysconfigs/S60input-wrapper $(TARGET_DIR)/etc/init.d + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/input-wrapper/sysconfigs/99-input-wrapper.rules $(TARGET_DIR)/etc/udev/rules.d endef $(eval $(generic-package)) diff --git a/package/controllers/input-wrapper/sysconfigs/99-input-wrapper.rules b/package/batocera/controllers/input-wrapper/sysconfigs/99-input-wrapper.rules similarity index 100% rename from package/controllers/input-wrapper/sysconfigs/99-input-wrapper.rules rename to package/batocera/controllers/input-wrapper/sysconfigs/99-input-wrapper.rules diff --git a/package/controllers/input-wrapper/sysconfigs/S60input-wrapper b/package/batocera/controllers/input-wrapper/sysconfigs/S60input-wrapper similarity index 100% rename from package/controllers/input-wrapper/sysconfigs/S60input-wrapper rename to package/batocera/controllers/input-wrapper/sysconfigs/S60input-wrapper diff --git a/package/controllers/jammasd/99-jammasd.rules b/package/batocera/controllers/jammasd/99-jammasd.rules similarity index 100% rename from package/controllers/jammasd/99-jammasd.rules rename to package/batocera/controllers/jammasd/99-jammasd.rules diff --git a/package/controllers/jammasd/Config.in b/package/batocera/controllers/jammasd/Config.in similarity index 100% rename from package/controllers/jammasd/Config.in rename to package/batocera/controllers/jammasd/Config.in diff --git a/package/controllers/jammasd/jammASDSplit b/package/batocera/controllers/jammasd/jammASDSplit similarity index 100% rename from package/controllers/jammasd/jammASDSplit rename to package/batocera/controllers/jammasd/jammASDSplit diff --git a/package/batocera/controllers/jammasd/jammasd.mk b/package/batocera/controllers/jammasd/jammasd.mk new file mode 100644 index 00000000000..c2ffe781362 --- /dev/null +++ b/package/batocera/controllers/jammasd/jammasd.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# jammasd +# +################################################################################ + +JAMMASD_VERSION = 1 +JAMMASD_LICENCE = GPL +JAMMASD_SOURCE = + +define JAMMASD_INSTALL_TARGET_CMDS + $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/jammasd/99-jammasd.rules $(TARGET_DIR)/etc/udev/rules.d/99-jammasd.rules + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/jammasd/jammASDSplit $(TARGET_DIR)/usr/bin/jammASDSplit +endef + +$(eval $(generic-package)) diff --git a/package/controllers/joycond/001-fix-udev-path.patch b/package/batocera/controllers/joycond/001-fix-udev-path.patch similarity index 100% rename from package/controllers/joycond/001-fix-udev-path.patch rename to package/batocera/controllers/joycond/001-fix-udev-path.patch diff --git a/package/controllers/joycond/Config.in b/package/batocera/controllers/joycond/Config.in similarity index 100% rename from package/controllers/joycond/Config.in rename to package/batocera/controllers/joycond/Config.in diff --git a/package/controllers/joycond/config/99-joycond-ignore.rules b/package/batocera/controllers/joycond/config/99-joycond-ignore.rules similarity index 100% rename from package/controllers/joycond/config/99-joycond-ignore.rules rename to package/batocera/controllers/joycond/config/99-joycond-ignore.rules diff --git a/package/controllers/joycond/config/S97joycond b/package/batocera/controllers/joycond/config/S97joycond similarity index 100% rename from package/controllers/joycond/config/S97joycond rename to package/batocera/controllers/joycond/config/S97joycond diff --git a/package/controllers/joycond/joycond.mk b/package/batocera/controllers/joycond/joycond.mk similarity index 91% rename from package/controllers/joycond/joycond.mk rename to package/batocera/controllers/joycond/joycond.mk index 4af5cad792e..d62b4e4e083 100644 --- a/package/controllers/joycond/joycond.mk +++ b/package/batocera/controllers/joycond/joycond.mk @@ -9,7 +9,7 @@ JOYCOND_SITE = $(call github,DanielOgorchock,joycond,$(JOYCOND_VERSION)) JOYCOND_LICENSE = GPL-3.0+ JOYCOND_LICENSE_FILES = LICENSE JOYCOND_DEPENDENCIES = acl libevdev udev -JOYCOND_PATH = $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/joycond +JOYCOND_PATH = $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/joycond define JOYCOND_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/joycond $(TARGET_DIR)/usr/bin diff --git a/package/controllers/lightguns-games-precalibrations/Config.in b/package/batocera/controllers/lightguns-games-precalibrations/Config.in similarity index 100% rename from package/controllers/lightguns-games-precalibrations/Config.in rename to package/batocera/controllers/lightguns-games-precalibrations/Config.in diff --git a/package/controllers/lightguns-games-precalibrations/lightguns-games-precalibrations.mk b/package/batocera/controllers/lightguns-games-precalibrations/lightguns-games-precalibrations.mk similarity index 100% rename from package/controllers/lightguns-games-precalibrations/lightguns-games-precalibrations.mk rename to package/batocera/controllers/lightguns-games-precalibrations/lightguns-games-precalibrations.mk diff --git a/package/controllers/mk_arcade_joystick_rpi/Config.in b/package/batocera/controllers/mk_arcade_joystick_rpi/Config.in similarity index 100% rename from package/controllers/mk_arcade_joystick_rpi/Config.in rename to package/batocera/controllers/mk_arcade_joystick_rpi/Config.in diff --git a/package/controllers/mk_arcade_joystick_rpi/mk_arcade_joystick_rpi.mk b/package/batocera/controllers/mk_arcade_joystick_rpi/mk_arcade_joystick_rpi.mk similarity index 100% rename from package/controllers/mk_arcade_joystick_rpi/mk_arcade_joystick_rpi.mk rename to package/batocera/controllers/mk_arcade_joystick_rpi/mk_arcade_joystick_rpi.mk diff --git a/package/controllers/new-lg4ff/Config.in b/package/batocera/controllers/new-lg4ff/Config.in similarity index 100% rename from package/controllers/new-lg4ff/Config.in rename to package/batocera/controllers/new-lg4ff/Config.in diff --git a/package/controllers/new-lg4ff/new-lg4ff.mk b/package/batocera/controllers/new-lg4ff/new-lg4ff.mk similarity index 100% rename from package/controllers/new-lg4ff/new-lg4ff.mk rename to package/batocera/controllers/new-lg4ff/new-lg4ff.mk diff --git a/package/controllers/qtsixa-shanwan/Config.in b/package/batocera/controllers/qtsixa-shanwan/Config.in similarity index 100% rename from package/controllers/qtsixa-shanwan/Config.in rename to package/batocera/controllers/qtsixa-shanwan/Config.in diff --git a/package/controllers/qtsixa-shanwan/qtsixa-Makefile.patch b/package/batocera/controllers/qtsixa-shanwan/qtsixa-Makefile.patch similarity index 100% rename from package/controllers/qtsixa-shanwan/qtsixa-Makefile.patch rename to package/batocera/controllers/qtsixa-shanwan/qtsixa-Makefile.patch diff --git a/package/controllers/qtsixa-shanwan/qtsixa-shanwan.mk b/package/batocera/controllers/qtsixa-shanwan/qtsixa-shanwan.mk similarity index 100% rename from package/controllers/qtsixa-shanwan/qtsixa-shanwan.mk rename to package/batocera/controllers/qtsixa-shanwan/qtsixa-shanwan.mk diff --git a/package/controllers/qtsixa-shanwan/qtsixa-timeout.patch b/package/batocera/controllers/qtsixa-shanwan/qtsixa-timeout.patch similarity index 100% rename from package/controllers/qtsixa-shanwan/qtsixa-timeout.patch rename to package/batocera/controllers/qtsixa-shanwan/qtsixa-timeout.patch diff --git a/package/controllers/qtsixa/Config.in b/package/batocera/controllers/qtsixa/Config.in similarity index 100% rename from package/controllers/qtsixa/Config.in rename to package/batocera/controllers/qtsixa/Config.in diff --git a/package/controllers/qtsixa/qtsixa-001-makefile.patch b/package/batocera/controllers/qtsixa/qtsixa-001-makefile.patch similarity index 100% rename from package/controllers/qtsixa/qtsixa-001-makefile.patch rename to package/batocera/controllers/qtsixa/qtsixa-001-makefile.patch diff --git a/package/controllers/qtsixa/qtsixa-002-timeout.patch b/package/batocera/controllers/qtsixa/qtsixa-002-timeout.patch similarity index 100% rename from package/controllers/qtsixa/qtsixa-002-timeout.patch rename to package/batocera/controllers/qtsixa/qtsixa-002-timeout.patch diff --git a/package/controllers/qtsixa/qtsixa.mk b/package/batocera/controllers/qtsixa/qtsixa.mk similarity index 100% rename from package/controllers/qtsixa/qtsixa.mk rename to package/batocera/controllers/qtsixa/qtsixa.mk diff --git a/package/controllers/retrogame/Config.in b/package/batocera/controllers/retrogame/Config.in similarity index 100% rename from package/controllers/retrogame/Config.in rename to package/batocera/controllers/retrogame/Config.in diff --git a/package/controllers/retrogame/RetroGame/Makefile b/package/batocera/controllers/retrogame/RetroGame/Makefile similarity index 100% rename from package/controllers/retrogame/RetroGame/Makefile rename to package/batocera/controllers/retrogame/RetroGame/Makefile diff --git a/package/controllers/retrogame/RetroGame/README.md b/package/batocera/controllers/retrogame/RetroGame/README.md similarity index 100% rename from package/controllers/retrogame/RetroGame/README.md rename to package/batocera/controllers/retrogame/RetroGame/README.md diff --git a/package/controllers/retrogame/RetroGame/gamera.c b/package/batocera/controllers/retrogame/RetroGame/gamera.c similarity index 100% rename from package/controllers/retrogame/RetroGame/gamera.c rename to package/batocera/controllers/retrogame/RetroGame/gamera.c diff --git a/package/controllers/retrogame/RetroGame/retrogame.c b/package/batocera/controllers/retrogame/RetroGame/retrogame.c similarity index 100% rename from package/controllers/retrogame/RetroGame/retrogame.c rename to package/batocera/controllers/retrogame/RetroGame/retrogame.c diff --git a/package/controllers/retrogame/retrogame.mk b/package/batocera/controllers/retrogame/retrogame.mk similarity index 85% rename from package/controllers/retrogame/retrogame.mk rename to package/batocera/controllers/retrogame/retrogame.mk index 72288b9223c..a0f2d15aa1a 100644 --- a/package/controllers/retrogame/retrogame.mk +++ b/package/batocera/controllers/retrogame/retrogame.mk @@ -7,7 +7,7 @@ RETROGAME_VERSION = 1.0 RETROGAME_SOURCE= define RETROGAME_EXTRACT_CMDS - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/retrogame/RetroGame/* $(@D) + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/retrogame/RetroGame/* $(@D) endef define RETROGAME_BUILD_CMDS diff --git a/package/controllers/retroshooter-guns/99-retroshooter-guns.rules b/package/batocera/controllers/retroshooter-guns/99-retroshooter-guns.rules similarity index 100% rename from package/controllers/retroshooter-guns/99-retroshooter-guns.rules rename to package/batocera/controllers/retroshooter-guns/99-retroshooter-guns.rules diff --git a/package/controllers/retroshooter-guns/Config.in b/package/batocera/controllers/retroshooter-guns/Config.in similarity index 100% rename from package/controllers/retroshooter-guns/Config.in rename to package/batocera/controllers/retroshooter-guns/Config.in diff --git a/package/controllers/retroshooter-guns/batocera-retroshooter-calibrator b/package/batocera/controllers/retroshooter-guns/batocera-retroshooter-calibrator similarity index 100% rename from package/controllers/retroshooter-guns/batocera-retroshooter-calibrator rename to package/batocera/controllers/retroshooter-guns/batocera-retroshooter-calibrator diff --git a/package/controllers/retroshooter-guns/batocera-retroshooter-calibrator-daemon b/package/batocera/controllers/retroshooter-guns/batocera-retroshooter-calibrator-daemon similarity index 100% rename from package/controllers/retroshooter-guns/batocera-retroshooter-calibrator-daemon rename to package/batocera/controllers/retroshooter-guns/batocera-retroshooter-calibrator-daemon diff --git a/package/controllers/retroshooter-guns/retroshooter-guns-add b/package/batocera/controllers/retroshooter-guns/retroshooter-guns-add similarity index 100% rename from package/controllers/retroshooter-guns/retroshooter-guns-add rename to package/batocera/controllers/retroshooter-guns/retroshooter-guns-add diff --git a/package/batocera/controllers/retroshooter-guns/retroshooter-guns.mk b/package/batocera/controllers/retroshooter-guns/retroshooter-guns.mk new file mode 100644 index 00000000000..296adc851a5 --- /dev/null +++ b/package/batocera/controllers/retroshooter-guns/retroshooter-guns.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# Retro Shooter Lightguns +# +################################################################################ +RETROSHOOTER_GUNS_VERSION = 1 +RETROSHOOTER_GUNS_LICENSE = GPL +RETROSHOOTER_GUNS_SOURCE= + +define RETROSHOOTER_GUNS_INSTALL_TARGET_CMDS + $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/retroshooter-guns/99-retroshooter-guns.rules $(TARGET_DIR)/etc/udev/rules.d/99-retroshooter-guns.rules + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/retroshooter-guns/retroshooter-guns-add $(TARGET_DIR)/usr/bin/retroshooter-guns-add + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/retroshooter-guns/batocera-retroshooter-calibrator $(TARGET_DIR)/usr/bin/batocera-retroshooter-calibrator + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/retroshooter-guns/batocera-retroshooter-calibrator-daemon $(TARGET_DIR)/usr/bin/batocera-retroshooter-calibrator-daemon +endef + +$(eval $(generic-package)) diff --git a/package/controllers/samco-guns/99-samco-guns.rules b/package/batocera/controllers/samco-guns/99-samco-guns.rules similarity index 100% rename from package/controllers/samco-guns/99-samco-guns.rules rename to package/batocera/controllers/samco-guns/99-samco-guns.rules diff --git a/package/controllers/samco-guns/Config.in b/package/batocera/controllers/samco-guns/Config.in similarity index 100% rename from package/controllers/samco-guns/Config.in rename to package/batocera/controllers/samco-guns/Config.in diff --git a/package/batocera/controllers/samco-guns/samco-guns.mk b/package/batocera/controllers/samco-guns/samco-guns.mk new file mode 100644 index 00000000000..1c97896c405 --- /dev/null +++ b/package/batocera/controllers/samco-guns/samco-guns.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# samco-guns +# +################################################################################ +SAMCO_GUNS_VERSION = 1 +SAMCO_GUNS_LICENSE = GPL +SAMCO_GUNS_SOURCE= + +define SAMCO_GUNS_INSTALL_TARGET_CMDS + $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/samco-guns/99-samco-guns.rules $(TARGET_DIR)/etc/udev/rules.d/99-samco-guns.rules + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/samco-guns/virtual-samco-gun-status $(TARGET_DIR)/usr/bin/virtual-samco-gun-status +endef + +$(eval $(generic-package)) diff --git a/package/controllers/samco-guns/virtual-samco-gun-status b/package/batocera/controllers/samco-guns/virtual-samco-gun-status similarity index 100% rename from package/controllers/samco-guns/virtual-samco-gun-status rename to package/batocera/controllers/samco-guns/virtual-samco-gun-status diff --git a/package/controllers/sinden-guns-libs/Config.in b/package/batocera/controllers/sinden-guns-libs/Config.in similarity index 100% rename from package/controllers/sinden-guns-libs/Config.in rename to package/batocera/controllers/sinden-guns-libs/Config.in diff --git a/package/controllers/sinden-guns-libs/licence.txt b/package/batocera/controllers/sinden-guns-libs/licence.txt similarity index 100% rename from package/controllers/sinden-guns-libs/licence.txt rename to package/batocera/controllers/sinden-guns-libs/licence.txt diff --git a/package/controllers/sinden-guns-libs/sinden-guns-libs.mk b/package/batocera/controllers/sinden-guns-libs/sinden-guns-libs.mk similarity index 100% rename from package/controllers/sinden-guns-libs/sinden-guns-libs.mk rename to package/batocera/controllers/sinden-guns-libs/sinden-guns-libs.mk diff --git a/package/controllers/sinden-guns/99-sinden.rules b/package/batocera/controllers/sinden-guns/99-sinden.rules similarity index 100% rename from package/controllers/sinden-guns/99-sinden.rules rename to package/batocera/controllers/sinden-guns/99-sinden.rules diff --git a/package/controllers/sinden-guns/Config.in b/package/batocera/controllers/sinden-guns/Config.in similarity index 100% rename from package/controllers/sinden-guns/Config.in rename to package/batocera/controllers/sinden-guns/Config.in diff --git a/package/controllers/sinden-guns/LightgunMono.exe.config.template b/package/batocera/controllers/sinden-guns/LightgunMono.exe.config.template similarity index 100% rename from package/controllers/sinden-guns/LightgunMono.exe.config.template rename to package/batocera/controllers/sinden-guns/LightgunMono.exe.config.template diff --git a/package/controllers/sinden-guns/licence.txt b/package/batocera/controllers/sinden-guns/licence.txt similarity index 100% rename from package/controllers/sinden-guns/licence.txt rename to package/batocera/controllers/sinden-guns/licence.txt diff --git a/package/controllers/sinden-guns/sinden-guns.hash b/package/batocera/controllers/sinden-guns/sinden-guns.hash similarity index 100% rename from package/controllers/sinden-guns/sinden-guns.hash rename to package/batocera/controllers/sinden-guns/sinden-guns.hash diff --git a/package/controllers/sinden-guns/sinden-guns.mk b/package/batocera/controllers/sinden-guns/sinden-guns.mk similarity index 68% rename from package/controllers/sinden-guns/sinden-guns.mk rename to package/batocera/controllers/sinden-guns/sinden-guns.mk index 1d2ca3701b5..ccde4e278dc 100644 --- a/package/controllers/sinden-guns/sinden-guns.mk +++ b/package/batocera/controllers/sinden-guns/sinden-guns.mk @@ -18,12 +18,12 @@ define SINDEN_GUNS_EXTRACT_CMDS endef define SINDEN_GUNS_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/sinden-guns/99-sinden.rules $(TARGET_DIR)/etc/udev/rules.d/99-sinden.rules - $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/sinden-guns/uvcvideo.conf $(TARGET_DIR)/etc/modprobe.d/uvcvideo.conf - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/sinden-guns/virtual-sindenlightgun-add $(TARGET_DIR)/usr/bin/virtual-sindenlightgun-add - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/sinden-guns/virtual-sindenlightgun-remap $(TARGET_DIR)/usr/bin/virtual-sindenlightgun-remap + $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/sinden-guns/99-sinden.rules $(TARGET_DIR)/etc/udev/rules.d/99-sinden.rules + $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/sinden-guns/uvcvideo.conf $(TARGET_DIR)/etc/modprobe.d/uvcvideo.conf + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/sinden-guns/virtual-sindenlightgun-add $(TARGET_DIR)/usr/bin/virtual-sindenlightgun-add + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/sinden-guns/virtual-sindenlightgun-remap $(TARGET_DIR)/usr/bin/virtual-sindenlightgun-remap - $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/sinden-guns/LightgunMono.exe.config.template $(TARGET_DIR)/usr/share/sinden/LightgunMono.exe.config + $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/sinden-guns/LightgunMono.exe.config.template $(TARGET_DIR)/usr/share/sinden/LightgunMono.exe.config $(INSTALL) -m 0644 -D $(@D)/$(SINDEN_GUNS_ARCHIVE_DIR_PLAYER1)/LightgunMono.exe $(TARGET_DIR)/usr/share/sinden/LightgunMono.exe $(INSTALL) -m 0644 -D $(@D)/$(SINDEN_GUNS_ARCHIVE_DIR_PLAYER1)/AForge.Math.dll $(TARGET_DIR)/usr/share/sinden/AForge.Math.dll diff --git a/package/controllers/sinden-guns/uvcvideo.conf b/package/batocera/controllers/sinden-guns/uvcvideo.conf similarity index 100% rename from package/controllers/sinden-guns/uvcvideo.conf rename to package/batocera/controllers/sinden-guns/uvcvideo.conf diff --git a/package/controllers/sinden-guns/virtual-sindenlightgun-add b/package/batocera/controllers/sinden-guns/virtual-sindenlightgun-add similarity index 100% rename from package/controllers/sinden-guns/virtual-sindenlightgun-add rename to package/batocera/controllers/sinden-guns/virtual-sindenlightgun-add diff --git a/package/controllers/sinden-guns/virtual-sindenlightgun-remap b/package/batocera/controllers/sinden-guns/virtual-sindenlightgun-remap similarity index 100% rename from package/controllers/sinden-guns/virtual-sindenlightgun-remap rename to package/batocera/controllers/sinden-guns/virtual-sindenlightgun-remap diff --git a/package/controllers/steamdeckgun/99-steamdeckgun.rules b/package/batocera/controllers/steamdeckgun/99-steamdeckgun.rules similarity index 100% rename from package/controllers/steamdeckgun/99-steamdeckgun.rules rename to package/batocera/controllers/steamdeckgun/99-steamdeckgun.rules diff --git a/package/controllers/steamdeckgun/Config.in b/package/batocera/controllers/steamdeckgun/Config.in similarity index 100% rename from package/controllers/steamdeckgun/Config.in rename to package/batocera/controllers/steamdeckgun/Config.in diff --git a/package/controllers/steamdeckgun/steamdeckgun-add b/package/batocera/controllers/steamdeckgun/steamdeckgun-add similarity index 100% rename from package/controllers/steamdeckgun/steamdeckgun-add rename to package/batocera/controllers/steamdeckgun/steamdeckgun-add diff --git a/package/controllers/steamdeckgun/steamdeckgun-remap b/package/batocera/controllers/steamdeckgun/steamdeckgun-remap similarity index 100% rename from package/controllers/steamdeckgun/steamdeckgun-remap rename to package/batocera/controllers/steamdeckgun/steamdeckgun-remap diff --git a/package/controllers/steamdeckgun/steamdeckgun.mk b/package/batocera/controllers/steamdeckgun/steamdeckgun.mk similarity index 63% rename from package/controllers/steamdeckgun/steamdeckgun.mk rename to package/batocera/controllers/steamdeckgun/steamdeckgun.mk index 46ee2f03c31..7a6999097e3 100644 --- a/package/controllers/steamdeckgun/steamdeckgun.mk +++ b/package/batocera/controllers/steamdeckgun/steamdeckgun.mk @@ -8,9 +8,9 @@ STEAMDECKGUN_LICENSE = GPL STEAMDECKGUN_SOURCE= define STEAMDECKGUN_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/steamdeckgun/99-steamdeckgun.rules $(TARGET_DIR)/etc/udev/rules.d/99-steamdeckgun.rules - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/steamdeckgun/steamdeckgun-add $(TARGET_DIR)/usr/bin/steamdeckgun-add - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/steamdeckgun/steamdeckgun-remap $(TARGET_DIR)/usr/bin/steamdeckgun-remap + $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/steamdeckgun/99-steamdeckgun.rules $(TARGET_DIR)/etc/udev/rules.d/99-steamdeckgun.rules + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/steamdeckgun/steamdeckgun-add $(TARGET_DIR)/usr/bin/steamdeckgun-add + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/steamdeckgun/steamdeckgun-remap $(TARGET_DIR)/usr/bin/steamdeckgun-remap endef $(eval $(generic-package)) diff --git a/package/controllers/uinput-joystick/Config.in b/package/batocera/controllers/uinput-joystick/Config.in similarity index 100% rename from package/controllers/uinput-joystick/Config.in rename to package/batocera/controllers/uinput-joystick/Config.in diff --git a/package/controllers/uinput-joystick/S60uinput-joystick b/package/batocera/controllers/uinput-joystick/S60uinput-joystick similarity index 100% rename from package/controllers/uinput-joystick/S60uinput-joystick rename to package/batocera/controllers/uinput-joystick/S60uinput-joystick diff --git a/package/controllers/uinput-joystick/uinput-joystick.mk b/package/batocera/controllers/uinput-joystick/uinput-joystick.mk similarity index 88% rename from package/controllers/uinput-joystick/uinput-joystick.mk rename to package/batocera/controllers/uinput-joystick/uinput-joystick.mk index e77fa1dbed3..54869c46a59 100644 --- a/package/controllers/uinput-joystick/uinput-joystick.mk +++ b/package/batocera/controllers/uinput-joystick/uinput-joystick.mk @@ -19,7 +19,7 @@ define UINPUT_JOYSTICK_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/bin $(TARGET_DIR)/etc/init.d $(INSTALL) $(@D)/uinput_joystick $(TARGET_DIR)/usr/bin/uinput_joystick $(INSTALL) $(@D)/fftest $(TARGET_DIR)/usr/bin/fftest - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/uinput-joystick/S60uinput-joystick $(TARGET_DIR)/etc/init.d + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/uinput-joystick/S60uinput-joystick $(TARGET_DIR)/etc/init.d endef $(eval $(generic-package)) diff --git a/package/controllers/umtool/Config.in b/package/batocera/controllers/umtool/Config.in similarity index 100% rename from package/controllers/umtool/Config.in rename to package/batocera/controllers/umtool/Config.in diff --git a/package/controllers/umtool/umtool.mk b/package/batocera/controllers/umtool/umtool.mk similarity index 100% rename from package/controllers/umtool/umtool.mk rename to package/batocera/controllers/umtool/umtool.mk diff --git a/package/controllers/wiimote-3rdparty/Config.in b/package/batocera/controllers/wiimote-3rdparty/Config.in similarity index 100% rename from package/controllers/wiimote-3rdparty/Config.in rename to package/batocera/controllers/wiimote-3rdparty/Config.in diff --git a/package/controllers/wiimote-3rdparty/wiimote-3rdparty.mk b/package/batocera/controllers/wiimote-3rdparty/wiimote-3rdparty.mk similarity index 50% rename from package/controllers/wiimote-3rdparty/wiimote-3rdparty.mk rename to package/batocera/controllers/wiimote-3rdparty/wiimote-3rdparty.mk index 312d0b70020..97867815b4d 100644 --- a/package/controllers/wiimote-3rdparty/wiimote-3rdparty.mk +++ b/package/batocera/controllers/wiimote-3rdparty/wiimote-3rdparty.mk @@ -8,8 +8,8 @@ WIIMOTE_3RDPARTY_LICENSE = GPL WIIMOTE_3RDPARTY_SOURCE= define WIIMOTE_3RDPARTY_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/wiimote-3rdparty/wiimote3rdPartyConnect $(TARGET_DIR)/usr/bin/wiimote3rdPartyConnect - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/wiimote-3rdparty/wiimote-3rdparty.service $(TARGET_DIR)/usr/share/reglinux/services/wiimote3rdparty + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/wiimote-3rdparty/wiimote3rdPartyConnect $(TARGET_DIR)/usr/bin/wiimote3rdPartyConnect + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/wiimote-3rdparty/wiimote-3rdparty.service $(TARGET_DIR)/usr/share/reglinux/services/wiimote3rdparty endef $(eval $(generic-package)) diff --git a/package/controllers/wiimote-3rdparty/wiimote-3rdparty.service b/package/batocera/controllers/wiimote-3rdparty/wiimote-3rdparty.service similarity index 100% rename from package/controllers/wiimote-3rdparty/wiimote-3rdparty.service rename to package/batocera/controllers/wiimote-3rdparty/wiimote-3rdparty.service diff --git a/package/controllers/wiimote-3rdparty/wiimote3rdPartyConnect b/package/batocera/controllers/wiimote-3rdparty/wiimote3rdPartyConnect similarity index 100% rename from package/controllers/wiimote-3rdparty/wiimote3rdPartyConnect rename to package/batocera/controllers/wiimote-3rdparty/wiimote3rdPartyConnect diff --git a/package/controllers/wiimotes-rules/99-wiimote.rules b/package/batocera/controllers/wiimotes-rules/99-wiimote.rules similarity index 100% rename from package/controllers/wiimotes-rules/99-wiimote.rules rename to package/batocera/controllers/wiimotes-rules/99-wiimote.rules diff --git a/package/controllers/wiimotes-rules/Config.in b/package/batocera/controllers/wiimotes-rules/Config.in similarity index 100% rename from package/controllers/wiimotes-rules/Config.in rename to package/batocera/controllers/wiimotes-rules/Config.in diff --git a/package/controllers/wiimotes-rules/virtual-wii-mouse-bar-add b/package/batocera/controllers/wiimotes-rules/virtual-wii-mouse-bar-add similarity index 100% rename from package/controllers/wiimotes-rules/virtual-wii-mouse-bar-add rename to package/batocera/controllers/wiimotes-rules/virtual-wii-mouse-bar-add diff --git a/package/controllers/wiimotes-rules/virtual-wii-mouse-bar-joystick-status b/package/batocera/controllers/wiimotes-rules/virtual-wii-mouse-bar-joystick-status similarity index 100% rename from package/controllers/wiimotes-rules/virtual-wii-mouse-bar-joystick-status rename to package/batocera/controllers/wiimotes-rules/virtual-wii-mouse-bar-joystick-status diff --git a/package/controllers/wiimotes-rules/virtual-wii-mouse-bar-remap b/package/batocera/controllers/wiimotes-rules/virtual-wii-mouse-bar-remap similarity index 100% rename from package/controllers/wiimotes-rules/virtual-wii-mouse-bar-remap rename to package/batocera/controllers/wiimotes-rules/virtual-wii-mouse-bar-remap diff --git a/package/batocera/controllers/wiimotes-rules/wiimotes-rules.mk b/package/batocera/controllers/wiimotes-rules/wiimotes-rules.mk new file mode 100644 index 00000000000..8fb8f3a026a --- /dev/null +++ b/package/batocera/controllers/wiimotes-rules/wiimotes-rules.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# wiimotes-rules +# +################################################################################ +WIIMOTES_RULES_VERSION = 1 +WIIMOTES_RULES_LICENSE = GPL +WIIMOTES_RULES_SOURCE= + +define WIIMOTES_RULES_INSTALL_TARGET_CMDS + $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/wiimotes-rules/99-wiimote.rules $(TARGET_DIR)/etc/udev/rules.d/99-wiimote.rules + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/wiimotes-rules/virtual-wii-mouse-bar-add $(TARGET_DIR)/usr/bin/virtual-wii-mouse-bar-add + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/wiimotes-rules/virtual-wii-mouse-bar-remap $(TARGET_DIR)/usr/bin/virtual-wii-mouse-bar-remap + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/wiimotes-rules/virtual-wii-mouse-bar-joystick-status $(TARGET_DIR)/usr/bin/virtual-wii-mouse-bar-joystick-status +endef + +$(eval $(generic-package)) diff --git a/package/controllers/xarcade2jstick/0001-xarcade2jstick-is-now-compatible-with-any-keyboard-k.patch b/package/batocera/controllers/xarcade2jstick/0001-xarcade2jstick-is-now-compatible-with-any-keyboard-k.patch similarity index 100% rename from package/controllers/xarcade2jstick/0001-xarcade2jstick-is-now-compatible-with-any-keyboard-k.patch rename to package/batocera/controllers/xarcade2jstick/0001-xarcade2jstick-is-now-compatible-with-any-keyboard-k.patch diff --git a/package/controllers/xarcade2jstick/0002-Better-MAME-default-inputs-better-IPAC-support.patch b/package/batocera/controllers/xarcade2jstick/0002-Better-MAME-default-inputs-better-IPAC-support.patch similarity index 100% rename from package/controllers/xarcade2jstick/0002-Better-MAME-default-inputs-better-IPAC-support.patch rename to package/batocera/controllers/xarcade2jstick/0002-Better-MAME-default-inputs-better-IPAC-support.patch diff --git a/package/controllers/xarcade2jstick/0003-forold-linux-kernel-definitions.patch b/package/batocera/controllers/xarcade2jstick/0003-forold-linux-kernel-definitions.patch similarity index 100% rename from package/controllers/xarcade2jstick/0003-forold-linux-kernel-definitions.patch rename to package/batocera/controllers/xarcade2jstick/0003-forold-linux-kernel-definitions.patch diff --git a/package/controllers/xarcade2jstick/Config.in b/package/batocera/controllers/xarcade2jstick/Config.in similarity index 100% rename from package/controllers/xarcade2jstick/Config.in rename to package/batocera/controllers/xarcade2jstick/Config.in diff --git a/package/controllers/xarcade2jstick/config/usb-Ultimarc_I-PAC_Ultimarc_I-PAC-event-kbd b/package/batocera/controllers/xarcade2jstick/config/usb-Ultimarc_I-PAC_Ultimarc_I-PAC-event-kbd similarity index 100% rename from package/controllers/xarcade2jstick/config/usb-Ultimarc_I-PAC_Ultimarc_I-PAC-event-kbd rename to package/batocera/controllers/xarcade2jstick/config/usb-Ultimarc_I-PAC_Ultimarc_I-PAC-event-kbd diff --git a/package/controllers/xarcade2jstick/config/usb-Ultimarc_IPAC_2_Ultimarc_IPAC_2_9-if01-event-kbd b/package/batocera/controllers/xarcade2jstick/config/usb-Ultimarc_IPAC_2_Ultimarc_IPAC_2_9-if01-event-kbd similarity index 100% rename from package/controllers/xarcade2jstick/config/usb-Ultimarc_IPAC_2_Ultimarc_IPAC_2_9-if01-event-kbd rename to package/batocera/controllers/xarcade2jstick/config/usb-Ultimarc_IPAC_2_Ultimarc_IPAC_2_9-if01-event-kbd diff --git a/package/controllers/xarcade2jstick/xarcade2jstick.mk b/package/batocera/controllers/xarcade2jstick/xarcade2jstick.mk similarity index 90% rename from package/controllers/xarcade2jstick/xarcade2jstick.mk rename to package/batocera/controllers/xarcade2jstick/xarcade2jstick.mk index 54612eb73cd..d999cb0475c 100644 --- a/package/controllers/xarcade2jstick/xarcade2jstick.mk +++ b/package/batocera/controllers/xarcade2jstick/xarcade2jstick.mk @@ -18,7 +18,7 @@ define XARCADE2JSTICK_INSTALL_TARGET_CMDS # config mkdir -p $(TARGET_DIR)/usr/share/reglinux/datainit/system/configs/xarcade2jstick - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/xarcade2jstick/config/* \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/xarcade2jstick/config/* \ $(TARGET_DIR)/usr/share/reglinux/datainit/system/configs/xarcade2jstick endef diff --git a/package/controllers/xone/001-disable-Thrustmaster-prefer-xpad-driver.patch b/package/batocera/controllers/xone/001-disable-Thrustmaster-prefer-xpad-driver.patch similarity index 100% rename from package/controllers/xone/001-disable-Thrustmaster-prefer-xpad-driver.patch rename to package/batocera/controllers/xone/001-disable-Thrustmaster-prefer-xpad-driver.patch diff --git a/package/controllers/xone/Config.in b/package/batocera/controllers/xone/Config.in similarity index 100% rename from package/controllers/xone/Config.in rename to package/batocera/controllers/xone/Config.in diff --git a/package/controllers/xone/FW_ACC_00U.bin b/package/batocera/controllers/xone/FW_ACC_00U.bin similarity index 100% rename from package/controllers/xone/FW_ACC_00U.bin rename to package/batocera/controllers/xone/FW_ACC_00U.bin diff --git a/package/controllers/xone/xone.mk b/package/batocera/controllers/xone/xone.mk similarity index 91% rename from package/controllers/xone/xone.mk rename to package/batocera/controllers/xone/xone.mk index 7c058061b36..e30e9c269d3 100644 --- a/package/controllers/xone/xone.mk +++ b/package/batocera/controllers/xone/xone.mk @@ -18,7 +18,7 @@ XONE_DEPENDENCIES = host-libcurl host-cabextract libusb define XONE_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0644 $(@D)/install/modprobe.conf $(TARGET_DIR)/etc/modprobe.d/xone-blacklist.conf # copy firmware - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/xone/FW_ACC_00U.bin \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/xone/FW_ACC_00U.bin \ $(TARGET_DIR)/lib/firmware/xow_dongle.bin endef diff --git a/package/controllers/xow/99-xow.rules b/package/batocera/controllers/xow/99-xow.rules similarity index 100% rename from package/controllers/xow/99-xow.rules rename to package/batocera/controllers/xow/99-xow.rules diff --git a/package/controllers/xow/Config.in b/package/batocera/controllers/xow/Config.in similarity index 100% rename from package/controllers/xow/Config.in rename to package/batocera/controllers/xow/Config.in diff --git a/package/controllers/xow/xow-daemon b/package/batocera/controllers/xow/xow-daemon similarity index 100% rename from package/controllers/xow/xow-daemon rename to package/batocera/controllers/xow/xow-daemon diff --git a/package/controllers/xow/xow.mk b/package/batocera/controllers/xow/xow.mk similarity index 74% rename from package/controllers/xow/xow.mk rename to package/batocera/controllers/xow/xow.mk index e2bb6795c46..c68651c3765 100644 --- a/package/controllers/xow/xow.mk +++ b/package/batocera/controllers/xow/xow.mk @@ -15,8 +15,8 @@ endef define XOW_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(@D)/xow $(TARGET_DIR)/usr/bin/xow $(INSTALL) -m 0755 -D $(@D)/install/modprobe.conf $(TARGET_DIR)/etc/modprobe.d/xow-blacklist.conf - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/xow/xow-daemon $(TARGET_DIR)/usr/bin/xow-daemon - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/xow/99-xow.rules $(TARGET_DIR)/etc/udev/rules.d + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/xow/xow-daemon $(TARGET_DIR)/usr/bin/xow-daemon + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/controllers/xow/99-xow.rules $(TARGET_DIR)/etc/udev/rules.d endef $(eval $(generic-package)) diff --git a/package/controllers/xpad-noone/001-fix-knockoff-brands.patch b/package/batocera/controllers/xpad-noone/001-fix-knockoff-brands.patch similarity index 100% rename from package/controllers/xpad-noone/001-fix-knockoff-brands.patch rename to package/batocera/controllers/xpad-noone/001-fix-knockoff-brands.patch diff --git a/package/controllers/xpad-noone/002-updated-xpad360w-button-poweroff.patch b/package/batocera/controllers/xpad-noone/002-updated-xpad360w-button-poweroff.patch similarity index 100% rename from package/controllers/xpad-noone/002-updated-xpad360w-button-poweroff.patch rename to package/batocera/controllers/xpad-noone/002-updated-xpad360w-button-poweroff.patch diff --git a/package/controllers/xpad-noone/003-add-legion-go.patch b/package/batocera/controllers/xpad-noone/003-add-legion-go.patch similarity index 100% rename from package/controllers/xpad-noone/003-add-legion-go.patch rename to package/batocera/controllers/xpad-noone/003-add-legion-go.patch diff --git a/package/controllers/xpad-noone/004-add-msi-claw.patch b/package/batocera/controllers/xpad-noone/004-add-msi-claw.patch similarity index 100% rename from package/controllers/xpad-noone/004-add-msi-claw.patch rename to package/batocera/controllers/xpad-noone/004-add-msi-claw.patch diff --git a/package/controllers/xpad-noone/Config.in b/package/batocera/controllers/xpad-noone/Config.in similarity index 100% rename from package/controllers/xpad-noone/Config.in rename to package/batocera/controllers/xpad-noone/Config.in diff --git a/package/controllers/xpad-noone/xpad-noone.mk b/package/batocera/controllers/xpad-noone/xpad-noone.mk similarity index 100% rename from package/controllers/xpad-noone/xpad-noone.mk rename to package/batocera/controllers/xpad-noone/xpad-noone.mk diff --git a/package/controllers/xpadneo/Config.in b/package/batocera/controllers/xpadneo/Config.in similarity index 100% rename from package/controllers/xpadneo/Config.in rename to package/batocera/controllers/xpadneo/Config.in diff --git a/package/controllers/xpadneo/xpadneo.mk b/package/batocera/controllers/xpadneo/xpadneo.mk similarity index 100% rename from package/controllers/xpadneo/xpadneo.mk rename to package/batocera/controllers/xpadneo/xpadneo.mk diff --git a/package/core/README.md b/package/batocera/core/README.md similarity index 100% rename from package/core/README.md rename to package/batocera/core/README.md diff --git a/package/core/batocera-audio-alsa/90-alsa-setup.rules b/package/batocera/core/batocera-audio-alsa/90-alsa-setup.rules similarity index 100% rename from package/core/batocera-audio-alsa/90-alsa-setup.rules rename to package/batocera/core/batocera-audio-alsa/90-alsa-setup.rules diff --git a/package/core/batocera-audio-alsa/Config.in b/package/batocera/core/batocera-audio-alsa/Config.in similarity index 100% rename from package/core/batocera-audio-alsa/Config.in rename to package/batocera/core/batocera-audio-alsa/Config.in diff --git a/package/core/batocera-audio-alsa/Mallet.wav b/package/batocera/core/batocera-audio-alsa/Mallet.wav similarity index 100% rename from package/core/batocera-audio-alsa/Mallet.wav rename to package/batocera/core/batocera-audio-alsa/Mallet.wav diff --git a/package/core/batocera-audio-alsa/S01audio b/package/batocera/core/batocera-audio-alsa/S01audio similarity index 100% rename from package/core/batocera-audio-alsa/S01audio rename to package/batocera/core/batocera-audio-alsa/S01audio diff --git a/package/core/batocera-audio-alsa/alsa/asoundrc-dmix+softvol b/package/batocera/core/batocera-audio-alsa/alsa/asoundrc-dmix+softvol similarity index 100% rename from package/core/batocera-audio-alsa/alsa/asoundrc-dmix+softvol rename to package/batocera/core/batocera-audio-alsa/alsa/asoundrc-dmix+softvol diff --git a/package/core/batocera-audio-alsa/alsa/batocera-audio b/package/batocera/core/batocera-audio-alsa/alsa/batocera-audio similarity index 100% rename from package/core/batocera-audio-alsa/alsa/batocera-audio rename to package/batocera/core/batocera-audio-alsa/alsa/batocera-audio diff --git a/package/core/batocera-audio-alsa/alsa/batocera-audio-bcm b/package/batocera/core/batocera-audio-alsa/alsa/batocera-audio-bcm similarity index 100% rename from package/core/batocera-audio-alsa/alsa/batocera-audio-bcm rename to package/batocera/core/batocera-audio-alsa/alsa/batocera-audio-bcm diff --git a/package/core/batocera-audio-alsa/batocera-audio-alsa.mk b/package/batocera/core/batocera-audio-alsa/batocera-audio-alsa.mk similarity index 59% rename from package/core/batocera-audio-alsa/batocera-audio-alsa.mk rename to package/batocera/core/batocera-audio-alsa/batocera-audio-alsa.mk index 61ff3d66532..229518a3661 100644 --- a/package/core/batocera-audio-alsa/batocera-audio-alsa.mk +++ b/package/batocera/core/batocera-audio-alsa/batocera-audio-alsa.mk @@ -19,19 +19,19 @@ endif define BATOCERA_AUDIO_ALSA_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/bin $(TARGET_DIR)/usr/share/sounds $(TARGET_DIR)/usr/share/reglinux/alsa # default alsa configurations - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-audio-alsa/alsa/asoundrc-* \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-audio-alsa/alsa/asoundrc-* \ $(TARGET_DIR)/usr/share/reglinux/alsa/ # sample audio files - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-audio-alsa/*.wav $(TARGET_DIR)/usr/share/sounds + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-audio-alsa/*.wav $(TARGET_DIR)/usr/share/sounds # init script - install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-audio-alsa/S01audio \ + install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-audio-alsa/S01audio \ $(TARGET_DIR)/etc/init.d/S01audio # udev script to unmute audio devices - install -m 0644 $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-audio-alsa/90-alsa-setup.rules \ + install -m 0644 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-audio-alsa/90-alsa-setup.rules \ $(TARGET_DIR)/etc/udev/rules.d/90-alsa-setup.rules - install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-audio-alsa/soundconfig \ + install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-audio-alsa/soundconfig \ $(TARGET_DIR)/usr/bin/soundconfig - install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-audio-alsa/alsa/batocera-audio$(ALSA_SUFFIX) \ + install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-audio-alsa/alsa/batocera-audio$(ALSA_SUFFIX) \ $(TARGET_DIR)/usr/bin/batocera-audio endef diff --git a/package/core/batocera-audio-alsa/soundconfig b/package/batocera/core/batocera-audio-alsa/soundconfig similarity index 100% rename from package/core/batocera-audio-alsa/soundconfig rename to package/batocera/core/batocera-audio-alsa/soundconfig diff --git a/package/core/batocera-audio/50-alsa-config.lua b/package/batocera/core/batocera-audio/50-alsa-config.lua similarity index 100% rename from package/core/batocera-audio/50-alsa-config.lua rename to package/batocera/core/batocera-audio/50-alsa-config.lua diff --git a/package/core/batocera-audio/90-alsa-setup.rules b/package/batocera/core/batocera-audio/90-alsa-setup.rules similarity index 100% rename from package/core/batocera-audio/90-alsa-setup.rules rename to package/batocera/core/batocera-audio/90-alsa-setup.rules diff --git a/package/core/batocera-audio/Config.in b/package/batocera/core/batocera-audio/Config.in similarity index 100% rename from package/core/batocera-audio/Config.in rename to package/batocera/core/batocera-audio/Config.in diff --git a/package/core/batocera-audio/Mallet.wav b/package/batocera/core/batocera-audio/Mallet.wav similarity index 100% rename from package/core/batocera-audio/Mallet.wav rename to package/batocera/core/batocera-audio/Mallet.wav diff --git a/package/core/batocera-audio/S27audioconfig b/package/batocera/core/batocera-audio/S27audioconfig similarity index 100% rename from package/core/batocera-audio/S27audioconfig rename to package/batocera/core/batocera-audio/S27audioconfig diff --git a/package/core/batocera-audio/Saudio b/package/batocera/core/batocera-audio/Saudio similarity index 100% rename from package/core/batocera-audio/Saudio rename to package/batocera/core/batocera-audio/Saudio diff --git a/package/core/batocera-audio/alsa/asoundrc-dmix+softvol b/package/batocera/core/batocera-audio/alsa/asoundrc-dmix+softvol similarity index 100% rename from package/core/batocera-audio/alsa/asoundrc-dmix+softvol rename to package/batocera/core/batocera-audio/alsa/asoundrc-dmix+softvol diff --git a/package/core/batocera-audio/alsa/batocera-audio b/package/batocera/core/batocera-audio/alsa/batocera-audio similarity index 100% rename from package/core/batocera-audio/alsa/batocera-audio rename to package/batocera/core/batocera-audio/alsa/batocera-audio diff --git a/package/core/batocera-audio/alsa/batocera-mixer b/package/batocera/core/batocera-audio/alsa/batocera-mixer similarity index 100% rename from package/core/batocera-audio/alsa/batocera-mixer rename to package/batocera/core/batocera-audio/alsa/batocera-mixer diff --git a/package/core/batocera-audio/batocera-audio.mk b/package/batocera/core/batocera-audio/batocera-audio.mk similarity index 63% rename from package/core/batocera-audio/batocera-audio.mk rename to package/batocera/core/batocera-audio/batocera-audio.mk index f9607f46085..e213f57fd1c 100644 --- a/package/core/batocera-audio/batocera-audio.mk +++ b/package/batocera/core/batocera-audio/batocera-audio.mk @@ -23,31 +23,31 @@ define BATOCERA_AUDIO_INSTALL_TARGET_CMDS $(TARGET_DIR)/usr/share/pipewire/media-session.d # default alsa configurations - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-audio/alsa/asoundrc-* \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-audio/alsa/asoundrc-* \ $(TARGET_DIR)/usr/share/reglinux/alsa/ # sample audio files - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-audio/*.wav \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-audio/*.wav \ $(TARGET_DIR)/usr/share/sounds # init script - install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-audio/Saudio \ + install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-audio/Saudio \ $(TARGET_DIR)/etc/init.d/S06audio - install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-audio/S27audioconfig \ + install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-audio/S27audioconfig \ $(TARGET_DIR)/etc/init.d/S27audioconfig # udev script to unmute audio devices - install -m 0644 $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-audio/90-alsa-setup.rules \ + install -m 0644 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-audio/90-alsa-setup.rules \ $(TARGET_DIR)/etc/udev/rules.d/90-alsa-setup.rules - install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-audio/soundconfig \ + install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-audio/soundconfig \ $(TARGET_DIR)/usr/bin/soundconfig - install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-audio/alsa/batocera-audio \ + install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-audio/alsa/batocera-audio \ $(TARGET_DIR)/usr/bin/batocera-audio - install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-audio/alsa/batocera-mixer \ + install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-audio/alsa/batocera-mixer \ $(TARGET_DIR)/usr/bin/batocera-mixer # pipewire-pulse policy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-audio/pulseaudio-system.conf \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-audio/pulseaudio-system.conf \ $(TARGET_DIR)/etc/dbus-1/system.d # pipewire-alsa @@ -56,30 +56,30 @@ define BATOCERA_AUDIO_INSTALL_TARGET_CMDS # pipewire-media-session config: disable dbus device reservation mkdir -p $(TARGET_DIR)/usr/share/wireplumber/main.lua.d - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-audio/50-alsa-config.lua \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-audio/50-alsa-config.lua \ $(TARGET_DIR)/usr/share/wireplumber/main.lua.d/50-alsa-config.lua - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-audio/pipewire.conf \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-audio/pipewire.conf \ $(TARGET_DIR)/usr/share/pipewire/pipewire.conf endef define BATOCERA_AUDIO_X86_INTEL_DSP mkdir -p $(TARGET_DIR)/etc/modprobe.d - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-audio/intel-dsp.conf \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-audio/intel-dsp.conf \ $(TARGET_DIR)/etc/modprobe.d/intel-dsp.conf endef # Steam Deck OLED SOF files are not in the sound-open-firmware package yet define BATOCERA_AUDIO_STEAM_DECK_OLED mkdir -p $(TARGET_DIR)/lib/firmware/amd/sof - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-audio/sof-vangogh-*.bin \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-audio/sof-vangogh-*.bin \ $(TARGET_DIR)/lib/firmware/amd/sof/ mkdir -p $(TARGET_DIR)/lib/firmware/amd/sof-tplg - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-audio/sof-vangogh-nau8821-max.tplg \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-audio/sof-vangogh-nau8821-max.tplg \ $(TARGET_DIR)/lib/firmware/amd/sof-tplg/sof-vangogh-nau8821-max.tplg # extra ucm files mkdir -p $(TARGET_DIR)/usr/share/alsa/ucm2 - cp -pr $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-audio/ucm2/* \ + cp -pr $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-audio/ucm2/* \ $(TARGET_DIR)/usr/share/alsa/ucm2/ endef diff --git a/package/core/batocera-audio/intel-dsp.conf b/package/batocera/core/batocera-audio/intel-dsp.conf similarity index 100% rename from package/core/batocera-audio/intel-dsp.conf rename to package/batocera/core/batocera-audio/intel-dsp.conf diff --git a/package/core/batocera-audio/pipewire.conf b/package/batocera/core/batocera-audio/pipewire.conf similarity index 100% rename from package/core/batocera-audio/pipewire.conf rename to package/batocera/core/batocera-audio/pipewire.conf diff --git a/package/core/batocera-audio/pulseaudio-system.conf b/package/batocera/core/batocera-audio/pulseaudio-system.conf similarity index 100% rename from package/core/batocera-audio/pulseaudio-system.conf rename to package/batocera/core/batocera-audio/pulseaudio-system.conf diff --git a/package/core/batocera-audio/sof-vangogh-code.bin b/package/batocera/core/batocera-audio/sof-vangogh-code.bin similarity index 100% rename from package/core/batocera-audio/sof-vangogh-code.bin rename to package/batocera/core/batocera-audio/sof-vangogh-code.bin diff --git a/package/core/batocera-audio/sof-vangogh-data.bin b/package/batocera/core/batocera-audio/sof-vangogh-data.bin similarity index 100% rename from package/core/batocera-audio/sof-vangogh-data.bin rename to package/batocera/core/batocera-audio/sof-vangogh-data.bin diff --git a/package/core/batocera-audio/sof-vangogh-nau8821-max.tplg b/package/batocera/core/batocera-audio/sof-vangogh-nau8821-max.tplg similarity index 100% rename from package/core/batocera-audio/sof-vangogh-nau8821-max.tplg rename to package/batocera/core/batocera-audio/sof-vangogh-nau8821-max.tplg diff --git a/package/core/batocera-audio/soundconfig b/package/batocera/core/batocera-audio/soundconfig similarity index 100% rename from package/core/batocera-audio/soundconfig rename to package/batocera/core/batocera-audio/soundconfig diff --git a/package/core/batocera-audio/ucm2/conf.d/sof-nau8821-max/HiFi.conf b/package/batocera/core/batocera-audio/ucm2/conf.d/sof-nau8821-max/HiFi.conf similarity index 100% rename from package/core/batocera-audio/ucm2/conf.d/sof-nau8821-max/HiFi.conf rename to package/batocera/core/batocera-audio/ucm2/conf.d/sof-nau8821-max/HiFi.conf diff --git a/package/core/batocera-audio/ucm2/conf.d/sof-nau8821-max/sof-nau8821-max.conf b/package/batocera/core/batocera-audio/ucm2/conf.d/sof-nau8821-max/sof-nau8821-max.conf similarity index 100% rename from package/core/batocera-audio/ucm2/conf.d/sof-nau8821-max/sof-nau8821-max.conf rename to package/batocera/core/batocera-audio/ucm2/conf.d/sof-nau8821-max/sof-nau8821-max.conf diff --git a/package/core/batocera-bluetooth/Config.in b/package/batocera/core/batocera-bluetooth/Config.in similarity index 100% rename from package/core/batocera-bluetooth/Config.in rename to package/batocera/core/batocera-bluetooth/Config.in diff --git a/package/core/batocera-bluetooth/S29namebluetooth b/package/batocera/core/batocera-bluetooth/S29namebluetooth similarity index 100% rename from package/core/batocera-bluetooth/S29namebluetooth rename to package/batocera/core/batocera-bluetooth/S29namebluetooth diff --git a/package/core/batocera-bluetooth/S32bluetooth.template b/package/batocera/core/batocera-bluetooth/S32bluetooth.template similarity index 100% rename from package/core/batocera-bluetooth/S32bluetooth.template rename to package/batocera/core/batocera-bluetooth/S32bluetooth.template diff --git a/package/core/batocera-bluetooth/batocera-bluetooth.mk b/package/batocera/core/batocera-bluetooth/batocera-bluetooth.mk similarity index 85% rename from package/core/batocera-bluetooth/batocera-bluetooth.mk rename to package/batocera/core/batocera-bluetooth/batocera-bluetooth.mk index 41d50254516..86d2ff3223e 100644 --- a/package/core/batocera-bluetooth/batocera-bluetooth.mk +++ b/package/batocera/core/batocera-bluetooth/batocera-bluetooth.mk @@ -24,9 +24,9 @@ endif define BATOCERA_BLUETOOTH_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/etc/init.d/ - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-bluetooth/S29namebluetooth \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-bluetooth/S29namebluetooth \ $(TARGET_DIR)/etc/init.d/S29namebluetooth - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-bluetooth/S32bluetooth.template \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-bluetooth/S32bluetooth.template \ $(TARGET_DIR)/etc/init.d/S32bluetooth sed -i -e s+"@INTERNAL_BLUETOOTH_STACK@"+"$(BATOCERA_BLUETOOTH_STACK)"+ \ $(TARGET_DIR)/etc/init.d/S32bluetooth diff --git a/package/core/batocera-configgen/Config.in b/package/batocera/core/batocera-configgen/Config.in similarity index 100% rename from package/core/batocera-configgen/Config.in rename to package/batocera/core/batocera-configgen/Config.in diff --git a/package/core/batocera-configgen/README.md b/package/batocera/core/batocera-configgen/README.md similarity index 76% rename from package/core/batocera-configgen/README.md rename to package/batocera/core/batocera-configgen/README.md index eef9f47492e..90917d0ff60 100644 --- a/package/core/batocera-configgen/README.md +++ b/package/batocera/core/batocera-configgen/README.md @@ -1,5 +1,5 @@ ## Directory navigation - `configgen` Go here for the generators themselves. - - `configs` A set of default settings, for both global and per-platform. If defining a new emulator/system, it will need to be defined in [configgen-defaults](https://github.com/batocera-linux/batocera.linux/blob/master/package/core/batocera-configgen/configs/configgen-defaults.yml). + - `configs` A set of default settings, for both global and per-platform. If defining a new emulator/system, it will need to be defined in [configgen-defaults](https://github.com/batocera-linux/batocera.linux/blob/master/package/batocera/core/batocera-configgen/configs/configgen-defaults.yml). - `datainit` Some extraneous files required for emulators. diff --git a/package/core/batocera-configgen/batocera-configgen.mk b/package/batocera/core/batocera-configgen/batocera-configgen.mk similarity index 98% rename from package/core/batocera-configgen/batocera-configgen.mk rename to package/batocera/core/batocera-configgen/batocera-configgen.mk index 51d68ed38b5..05e91d6b7c8 100644 --- a/package/core/batocera-configgen/batocera-configgen.mk +++ b/package/batocera/core/batocera-configgen/batocera-configgen.mk @@ -10,7 +10,7 @@ BATOCERA_CONFIGGEN_SOURCE= BATOCERA_CONFIGGEN_DEPENDENCIES = python3 python-pyyaml python-requests BATOCERA_CONFIGGEN_INSTALL_STAGING = YES -CONFIGGEN_DIR = $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-configgen +CONFIGGEN_DIR = $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-configgen define BATOCERA_CONFIGGEN_EXTRACT_CMDS cp -avf $(CONFIGGEN_DIR)/configgen/* $(@D) diff --git a/package/core/batocera-configgen/configgen/__init__.py b/package/batocera/core/batocera-configgen/configgen/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/__init__.py rename to package/batocera/core/batocera-configgen/configgen/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/Command.py b/package/batocera/core/batocera-configgen/configgen/configgen/Command.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/Command.py rename to package/batocera/core/batocera-configgen/configgen/configgen/Command.py diff --git a/package/core/batocera-configgen/configgen/configgen/Emulator.py b/package/batocera/core/batocera-configgen/configgen/configgen/Emulator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/Emulator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/Emulator.py diff --git a/package/core/batocera-configgen/configgen/configgen/Evmapy.py b/package/batocera/core/batocera-configgen/configgen/configgen/Evmapy.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/Evmapy.py rename to package/batocera/core/batocera-configgen/configgen/configgen/Evmapy.py diff --git a/package/core/batocera-configgen/configgen/configgen/GeneratorImporter.py b/package/batocera/core/batocera-configgen/configgen/configgen/GeneratorImporter.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/GeneratorImporter.py rename to package/batocera/core/batocera-configgen/configgen/configgen/GeneratorImporter.py diff --git a/package/core/batocera-configgen/configgen/configgen/README.md b/package/batocera/core/batocera-configgen/configgen/configgen/README.md similarity index 63% rename from package/core/batocera-configgen/configgen/configgen/README.md rename to package/batocera/core/batocera-configgen/configgen/configgen/README.md index a6eda587f54..df535863ae9 100644 --- a/package/core/batocera-configgen/configgen/configgen/README.md +++ b/package/batocera/core/batocera-configgen/configgen/configgen/README.md @@ -1,6 +1,6 @@ ## Directory navigation - - `generators` The infamous Python configuration generators, bane of the end-user who's used to modifying INI and XML files directly. These are what create the necessary configuration files, controller profiles and any other necessary INI/CFG file an emulator uses upon launching an emulator. Used in conjunction with [ES features](https://github.com/batocera-linux/batocera.linux/blob/master/package/emulationstation/batocera-es-system/es_features.yml) to make these generated configs based on the options the user has set in ES. If creating a new one, don't forget to [define](https://github.com/batocera-linux/batocera.linux/blob/master/package/core/batocera-configgen/configgen/configgen/emulatorlauncher.py) it as well. + - `generators` The infamous Python configuration generators, bane of the end-user who's used to modifying INI and XML files directly. These are what create the necessary configuration files, controller profiles and any other necessary INI/CFG file an emulator uses upon launching an emulator. Used in conjunction with [ES features](https://github.com/batocera-linux/batocera.linux/blob/master/package/batocera/emulationstation/batocera-es-system/es_features.yml) to make these generated configs based on the options the user has set in ES. If creating a new one, don't forget to [define](https://github.com/batocera-linux/batocera.linux/blob/master/package/batocera/core/batocera-configgen/configgen/configgen/emulatorlauncher.py) it as well. - `batoceraFiles.py` The paths used by emulators for their configuration files, saves, etc. - `Emulator.py` How do we grab all the settings? And in what order? - `emulatorlauncher.py` The main launcher. diff --git a/package/core/batocera-configgen/configgen/configgen/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/batoceraFiles.py b/package/batocera/core/batocera-configgen/configgen/configgen/batoceraFiles.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/batoceraFiles.py rename to package/batocera/core/batocera-configgen/configgen/configgen/batoceraFiles.py diff --git a/package/core/batocera-configgen/configgen/configgen/controllersConfig.py b/package/batocera/core/batocera-configgen/configgen/configgen/controllersConfig.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/controllersConfig.py rename to package/batocera/core/batocera-configgen/configgen/configgen/controllersConfig.py diff --git a/package/core/batocera-configgen/configgen/configgen/emulatorlauncher.py b/package/batocera/core/batocera-configgen/configgen/configgen/emulatorlauncher.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/emulatorlauncher.py rename to package/batocera/core/batocera-configgen/configgen/configgen/emulatorlauncher.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/Generator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/Generator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/Generator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/Generator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/abuse/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/abuse/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/abuse/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/abuse/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/abuse/abuseGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/abuse/abuseGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/abuse/abuseGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/abuse/abuseGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/amiberry/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/amiberry/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/amiberry/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/amiberry/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/amiberry/amiberryGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/amiberry/amiberryGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/amiberry/amiberryGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/amiberry/amiberryGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/applewin/applewinGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/applewin/applewinGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/applewin/applewinGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/applewin/applewinGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/bigpemu/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/bigpemu/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/bigpemu/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/bigpemu/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/bigpemu/bigpemuGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/bigpemu/bigpemuGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/bigpemu/bigpemuGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/bigpemu/bigpemuGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/cannonball/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/cannonball/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/cannonball/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/cannonball/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/cannonball/cannonballControllers.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/cannonball/cannonballControllers.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/cannonball/cannonballControllers.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/cannonball/cannonballControllers.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/cannonball/cannonballGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/cannonball/cannonballGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/cannonball/cannonballGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/cannonball/cannonballGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/cdogs/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/cdogs/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/cdogs/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/cdogs/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/cdogs/cdogsGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/cdogs/cdogsGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/cdogs/cdogsGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/cdogs/cdogsGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/cemu/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/cemu/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/cemu/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/cemu/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/cemu/cemuControllers.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/cemu/cemuControllers.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/cemu/cemuControllers.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/cemu/cemuControllers.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/cemu/cemuGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/cemu/cemuGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/cemu/cemuGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/cemu/cemuGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/cgenius/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/cgenius/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/cgenius/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/cgenius/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/cgenius/cgeniusGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/cgenius/cgeniusGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/cgenius/cgeniusGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/cgenius/cgeniusGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/citra/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/citra/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/citra/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/citra/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/citra/citraGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/citra/citraGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/citra/citraGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/citra/citraGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/corsixth/corsixthGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/corsixth/corsixthGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/corsixth/corsixthGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/corsixth/corsixthGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/demul/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/demul/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/demul/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/demul/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/demul/demulGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/demul/demulGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/demul/demulGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/demul/demulGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/devilutionx/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/devilutionx/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/devilutionx/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/devilutionx/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/devilutionx/devilutionxGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/devilutionx/devilutionxGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/devilutionx/devilutionxGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/devilutionx/devilutionxGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/dolphin/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/dolphin/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/dolphin/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/dolphin/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/dolphin/dolphinControllers.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/dolphin/dolphinControllers.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/dolphin/dolphinControllers.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/dolphin/dolphinControllers.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/dolphin/dolphinGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/dolphin/dolphinGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/dolphin/dolphinGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/dolphin/dolphinGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/dolphin/dolphinSYSCONF.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/dolphin/dolphinSYSCONF.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/dolphin/dolphinSYSCONF.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/dolphin/dolphinSYSCONF.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/dolphin_triforce/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/dolphin_triforce/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/dolphin_triforce/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/dolphin_triforce/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/dolphin_triforce/dolphinTriforceControllers.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/dolphin_triforce/dolphinTriforceControllers.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/dolphin_triforce/dolphinTriforceControllers.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/dolphin_triforce/dolphinTriforceControllers.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/dolphin_triforce/dolphinTriforceGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/dolphin_triforce/dolphinTriforceGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/dolphin_triforce/dolphinTriforceGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/dolphin_triforce/dolphinTriforceGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/dosboxstaging/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/dosboxstaging/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/dosboxstaging/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/dosboxstaging/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/dosboxstaging/dosboxstagingGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/dosboxstaging/dosboxstagingGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/dosboxstaging/dosboxstagingGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/dosboxstaging/dosboxstagingGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/dosboxx/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/dosboxx/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/dosboxx/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/dosboxx/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/dosboxx/dosboxxGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/dosboxx/dosboxxGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/dosboxx/dosboxxGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/dosboxx/dosboxxGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/drastic/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/drastic/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/drastic/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/drastic/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/drastic/drasticGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/drastic/drasticGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/drastic/drasticGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/drastic/drasticGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/duckstation/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/duckstation/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/duckstation/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/duckstation/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/duckstation/duckstationGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/duckstation/duckstationGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/duckstation/duckstationGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/duckstation/duckstationGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/duckstation_legacy/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/duckstation_legacy/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/duckstation_legacy/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/duckstation_legacy/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/duckstation_legacy/duckstationLegacyGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/duckstation_legacy/duckstationLegacyGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/duckstation_legacy/duckstationLegacyGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/duckstation_legacy/duckstationLegacyGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/dxx_rebirth/dxx_rebirthGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/dxx_rebirth/dxx_rebirthGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/dxx_rebirth/dxx_rebirthGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/dxx_rebirth/dxx_rebirthGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/easyrpg/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/easyrpg/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/easyrpg/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/easyrpg/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/easyrpg/easyrpgGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/easyrpg/easyrpgGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/easyrpg/easyrpgGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/easyrpg/easyrpgGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/ecwolf/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/ecwolf/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/ecwolf/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/ecwolf/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/ecwolf/ecwolfGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/ecwolf/ecwolfGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/ecwolf/ecwolfGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/ecwolf/ecwolfGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/eduke32/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/eduke32/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/eduke32/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/eduke32/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/eduke32/eduke32Generator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/eduke32/eduke32Generator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/eduke32/eduke32Generator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/eduke32/eduke32Generator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/etekwar/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/etekwar/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/etekwar/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/etekwar/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/etekwar/etekwarGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/etekwar/etekwarGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/etekwar/etekwarGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/etekwar/etekwarGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/etlegacy/etlegacyGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/etlegacy/etlegacyGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/etlegacy/etlegacyGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/etlegacy/etlegacyGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/fallout1/fallout1Generator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/fallout1/fallout1Generator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/fallout1/fallout1Generator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/fallout1/fallout1Generator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/fallout2/fallout2Generator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/fallout2/fallout2Generator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/fallout2/fallout2Generator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/fallout2/fallout2Generator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/flatpak/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/flatpak/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/flatpak/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/flatpak/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/flatpak/flatpakGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/flatpak/flatpakGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/flatpak/flatpakGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/flatpak/flatpakGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/flycast/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/flycast/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/flycast/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/flycast/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/flycast/flycastControllers.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/flycast/flycastControllers.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/flycast/flycastControllers.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/flycast/flycastControllers.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/flycast/flycastGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/flycast/flycastGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/flycast/flycastGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/flycast/flycastGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/fpinball/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/fpinball/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/fpinball/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/fpinball/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/fpinball/fpinballGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/fpinball/fpinballGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/fpinball/fpinballGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/fpinball/fpinballGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/fsuae/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/fsuae/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/fsuae/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/fsuae/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/fsuae/fsuaeControllers.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/fsuae/fsuaeControllers.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/fsuae/fsuaeControllers.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/fsuae/fsuaeControllers.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/fsuae/fsuaeGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/fsuae/fsuaeGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/fsuae/fsuaeGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/fsuae/fsuaeGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/gsplus/gsplusGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/gsplus/gsplusGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/gsplus/gsplusGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/gsplus/gsplusGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/gzdoom/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/gzdoom/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/gzdoom/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/gzdoom/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/gzdoom/gzdoomGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/gzdoom/gzdoomGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/gzdoom/gzdoomGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/gzdoom/gzdoomGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/hatari/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/hatari/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/hatari/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/hatari/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/hatari/hatariGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/hatari/hatariGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/hatari/hatariGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/hatari/hatariGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/hcl/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/hcl/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/hcl/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/hcl/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/hcl/hclGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/hcl/hclGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/hcl/hclGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/hcl/hclGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/hurrican/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/hurrican/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/hurrican/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/hurrican/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/hurrican/hurricanGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/hurrican/hurricanGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/hurrican/hurricanGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/hurrican/hurricanGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/hypseus_singe/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/hypseus_singe/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/hypseus_singe/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/hypseus_singe/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/hypseus_singe/hypseusSingeGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/hypseus_singe/hypseusSingeGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/hypseus_singe/hypseusSingeGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/hypseus_singe/hypseusSingeGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/ikemen/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/ikemen/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/ikemen/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/ikemen/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/ikemen/ikemenGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/ikemen/ikemenGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/ikemen/ikemenGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/ikemen/ikemenGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/ioquake3/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/ioquake3/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/ioquake3/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/ioquake3/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/ioquake3/ioquake3Config.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/ioquake3/ioquake3Config.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/ioquake3/ioquake3Config.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/ioquake3/ioquake3Config.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/ioquake3/ioquake3Generator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/ioquake3/ioquake3Generator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/ioquake3/ioquake3Generator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/ioquake3/ioquake3Generator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/iortcw/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/iortcw/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/iortcw/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/iortcw/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/iortcw/iortcwGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/iortcw/iortcwGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/iortcw/iortcwGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/iortcw/iortcwGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/lexaloffle/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/lexaloffle/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/lexaloffle/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/lexaloffle/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/lexaloffle/lexaloffleGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/lexaloffle/lexaloffleGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/lexaloffle/lexaloffleGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/lexaloffle/lexaloffleGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/libretro/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/libretro/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/libretro/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/libretro/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/libretro/libretroConfig.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/libretro/libretroConfig.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/libretro/libretroConfig.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/libretro/libretroConfig.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/libretro/libretroControllers.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/libretro/libretroControllers.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/libretro/libretroControllers.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/libretro/libretroControllers.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/libretro/libretroGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/libretro/libretroGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/libretro/libretroGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/libretro/libretroGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/libretro/libretroMAMEConfig.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/libretro/libretroMAMEConfig.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/libretro/libretroMAMEConfig.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/libretro/libretroMAMEConfig.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/libretro/libretroOptions.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/libretro/libretroOptions.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/libretro/libretroOptions.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/libretro/libretroOptions.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/libretro/libretroRetroarchCustom.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/libretro/libretroRetroarchCustom.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/libretro/libretroRetroarchCustom.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/libretro/libretroRetroarchCustom.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/lightspark/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/lightspark/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/lightspark/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/lightspark/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/lightspark/lightsparkGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/lightspark/lightsparkGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/lightspark/lightsparkGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/lightspark/lightsparkGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/lime3ds/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/lime3ds/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/lime3ds/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/lime3ds/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/lime3ds/lime3DSGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/lime3ds/lime3DSGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/lime3ds/lime3DSGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/lime3ds/lime3DSGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/mame/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/mame/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/mame/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/mame/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/mame/mameControllers.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/mame/mameControllers.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/mame/mameControllers.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/mame/mameControllers.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/mame/mameGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/mame/mameGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/mame/mameGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/mame/mameGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/mednafen/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/mednafen/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/mednafen/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/mednafen/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/mednafen/mednafenGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/mednafen/mednafenGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/mednafen/mednafenGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/mednafen/mednafenGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/melonds/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/melonds/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/melonds/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/melonds/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/melonds/melondsGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/melonds/melondsGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/melonds/melondsGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/melonds/melondsGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/model2emu/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/model2emu/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/model2emu/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/model2emu/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/model2emu/model2emuGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/model2emu/model2emuGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/model2emu/model2emuGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/model2emu/model2emuGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/moonlight/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/moonlight/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/moonlight/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/moonlight/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/moonlight/moonlightConfig.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/moonlight/moonlightConfig.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/moonlight/moonlightConfig.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/moonlight/moonlightConfig.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/moonlight/moonlightGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/moonlight/moonlightGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/moonlight/moonlightGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/moonlight/moonlightGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/mugen/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/mugen/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/mugen/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/mugen/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/mugen/mugenGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/mugen/mugenGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/mugen/mugenGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/mugen/mugenGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/mupen/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/mupen/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/mupen/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/mupen/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/mupen/mupenConfig.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/mupen/mupenConfig.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/mupen/mupenConfig.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/mupen/mupenConfig.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/mupen/mupenControllers.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/mupen/mupenControllers.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/mupen/mupenControllers.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/mupen/mupenControllers.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/mupen/mupenGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/mupen/mupenGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/mupen/mupenGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/mupen/mupenGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/odcommander/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/odcommander/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/odcommander/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/odcommander/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/odcommander/odcommanderGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/odcommander/odcommanderGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/odcommander/odcommanderGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/odcommander/odcommanderGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/openbor/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/openbor/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/openbor/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/openbor/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/openbor/openborControllers.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/openbor/openborControllers.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/openbor/openborControllers.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/openbor/openborControllers.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/openbor/openborGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/openbor/openborGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/openbor/openborGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/openbor/openborGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/openjazz/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/openjazz/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/openjazz/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/openjazz/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/openjazz/openjazzGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/openjazz/openjazzGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/openjazz/openjazzGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/openjazz/openjazzGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/openmsx/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/openmsx/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/openmsx/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/openmsx/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/openmsx/openmsxGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/openmsx/openmsxGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/openmsx/openmsxGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/openmsx/openmsxGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/pcsx2/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/pcsx2/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/pcsx2/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/pcsx2/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/pcsx2/pcsx2Generator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/pcsx2/pcsx2Generator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/pcsx2/pcsx2Generator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/pcsx2/pcsx2Generator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/play/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/play/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/play/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/play/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/play/playGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/play/playGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/play/playGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/play/playGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/ppsspp/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/ppsspp/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/ppsspp/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/ppsspp/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/ppsspp/ppssppConfig.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/ppsspp/ppssppConfig.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/ppsspp/ppssppConfig.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/ppsspp/ppssppConfig.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/ppsspp/ppssppControllers.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/ppsspp/ppssppControllers.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/ppsspp/ppssppControllers.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/ppsspp/ppssppControllers.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/ppsspp/ppssppGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/ppsspp/ppssppGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/ppsspp/ppssppGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/ppsspp/ppssppGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/pygame/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/pygame/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/pygame/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/pygame/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/pygame/pygameGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/pygame/pygameGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/pygame/pygameGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/pygame/pygameGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/pyxel/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/pyxel/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/pyxel/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/pyxel/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/pyxel/pyxelGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/pyxel/pyxelGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/pyxel/pyxelGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/pyxel/pyxelGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/raze/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/raze/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/raze/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/raze/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/raze/razeGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/raze/razeGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/raze/razeGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/raze/razeGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/rpcs3/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/rpcs3/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/rpcs3/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/rpcs3/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/rpcs3/rpcs3Controllers.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/rpcs3/rpcs3Controllers.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/rpcs3/rpcs3Controllers.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/rpcs3/rpcs3Controllers.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/rpcs3/rpcs3Generator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/rpcs3/rpcs3Generator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/rpcs3/rpcs3Generator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/rpcs3/rpcs3Generator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/ruffle/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/ruffle/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/ruffle/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/ruffle/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/ruffle/ruffleGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/ruffle/ruffleGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/ruffle/ruffleGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/ruffle/ruffleGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/ryujinx/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/ryujinx/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/ryujinx/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/ryujinx/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/ryujinx/ryujinxGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/ryujinx/ryujinxGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/ryujinx/ryujinxGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/ryujinx/ryujinxGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/samcoupe/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/samcoupe/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/samcoupe/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/samcoupe/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/samcoupe/samcoupeGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/samcoupe/samcoupeGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/samcoupe/samcoupeGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/samcoupe/samcoupeGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/scummvm/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/scummvm/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/scummvm/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/scummvm/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/scummvm/scummvmGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/scummvm/scummvmGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/scummvm/scummvmGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/scummvm/scummvmGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/sdlpop/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/sdlpop/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/sdlpop/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/sdlpop/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/sdlpop/sdlpopGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/sdlpop/sdlpopGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/sdlpop/sdlpopGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/sdlpop/sdlpopGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/sh/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/sh/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/sh/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/sh/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/sh/shGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/sh/shGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/sh/shGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/sh/shGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/solarus/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/solarus/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/solarus/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/solarus/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/solarus/solarusGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/solarus/solarusGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/solarus/solarusGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/solarus/solarusGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/sonic3_air/sonic3_airGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/sonic3_air/sonic3_airGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/sonic3_air/sonic3_airGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/sonic3_air/sonic3_airGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/sonic_mania/sonic_maniaGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/sonic_mania/sonic_maniaGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/sonic_mania/sonic_maniaGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/sonic_mania/sonic_maniaGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/sonicretro/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/sonicretro/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/sonicretro/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/sonicretro/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/sonicretro/sonicretroGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/sonicretro/sonicretroGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/sonicretro/sonicretroGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/sonicretro/sonicretroGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/steam/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/steam/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/steam/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/steam/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/steam/steamGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/steam/steamGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/steam/steamGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/steam/steamGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/stella/stellaGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/stella/stellaGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/stella/stellaGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/stella/stellaGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/sudachi/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/sudachi/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/sudachi/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/sudachi/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/sudachi/sudachiGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/sudachi/sudachiGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/sudachi/sudachiGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/sudachi/sudachiGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/supermodel/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/supermodel/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/supermodel/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/supermodel/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/supermodel/supermodelGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/supermodel/supermodelGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/supermodel/supermodelGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/supermodel/supermodelGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/theforceengine/theforceengineGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/theforceengine/theforceengineGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/theforceengine/theforceengineGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/theforceengine/theforceengineGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/thextech/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/thextech/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/thextech/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/thextech/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/thextech/thextechGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/thextech/thextechGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/thextech/thextechGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/thextech/thextechGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/tsugaru/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/tsugaru/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/tsugaru/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/tsugaru/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/tsugaru/tsugaruGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/tsugaru/tsugaruGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/tsugaru/tsugaruGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/tsugaru/tsugaruGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/tyrian/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/tyrian/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/tyrian/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/tyrian/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/tyrian/tyrianGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/tyrian/tyrianGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/tyrian/tyrianGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/tyrian/tyrianGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/uqm/uqmGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/uqm/uqmGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/uqm/uqmGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/uqm/uqmGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/vice/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/vice/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/vice/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/vice/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/vice/viceConfig.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/vice/viceConfig.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/vice/viceConfig.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/vice/viceConfig.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/vice/viceControllers.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/vice/viceControllers.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/vice/viceControllers.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/vice/viceControllers.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/vice/viceGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/vice/viceGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/vice/viceGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/vice/viceGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/vita3k/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/vita3k/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/vita3k/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/vita3k/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/vita3k/vita3kGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/vita3k/vita3kGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/vita3k/vita3kGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/vita3k/vita3kGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/vpinball/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/vpinball/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/vpinball/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/vpinball/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/vpinball/vpinballGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/vpinball/vpinballGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/vpinball/vpinballGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/vpinball/vpinballGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/vpinball/vpinballOptions.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/vpinball/vpinballOptions.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/vpinball/vpinballOptions.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/vpinball/vpinballOptions.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/vpinball/vpinballWindowing.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/vpinball/vpinballWindowing.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/vpinball/vpinballWindowing.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/vpinball/vpinballWindowing.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/wine/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/wine/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/wine/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/wine/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/wine/wineGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/wine/wineGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/wine/wineGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/wine/wineGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/xash3d_fwgs/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/xash3d_fwgs/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/xash3d_fwgs/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/xash3d_fwgs/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/xash3d_fwgs/gamepad.cfg b/package/batocera/core/batocera-configgen/configgen/configgen/generators/xash3d_fwgs/gamepad.cfg similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/xash3d_fwgs/gamepad.cfg rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/xash3d_fwgs/gamepad.cfg diff --git a/package/core/batocera-configgen/configgen/configgen/generators/xash3d_fwgs/xash3dFwgsGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/xash3d_fwgs/xash3dFwgsGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/xash3d_fwgs/xash3dFwgsGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/xash3d_fwgs/xash3dFwgsGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/xemu/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/xemu/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/xemu/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/xemu/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/xemu/xemuConfig.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/xemu/xemuConfig.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/xemu/xemuConfig.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/xemu/xemuConfig.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/xemu/xemuGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/xemu/xemuGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/xemu/xemuGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/xemu/xemuGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/xenia/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/xenia/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/xenia/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/xenia/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/generators/xenia/xeniaGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/xenia/xeniaGenerator.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/generators/xenia/xeniaGenerator.py rename to package/batocera/core/batocera-configgen/configgen/configgen/generators/xenia/xeniaGenerator.py diff --git a/package/core/batocera-configgen/configgen/configgen/settings/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/settings/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/settings/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/settings/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/settings/unixSettings.py b/package/batocera/core/batocera-configgen/configgen/configgen/settings/unixSettings.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/settings/unixSettings.py rename to package/batocera/core/batocera-configgen/configgen/configgen/settings/unixSettings.py diff --git a/package/core/batocera-configgen/configgen/configgen/utils/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/utils/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/utils/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/utils/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/utils/batoceraServices.py b/package/batocera/core/batocera-configgen/configgen/configgen/utils/batoceraServices.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/utils/batoceraServices.py rename to package/batocera/core/batocera-configgen/configgen/configgen/utils/batoceraServices.py diff --git a/package/core/batocera-configgen/configgen/configgen/utils/bezels.py b/package/batocera/core/batocera-configgen/configgen/configgen/utils/bezels.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/utils/bezels.py rename to package/batocera/core/batocera-configgen/configgen/configgen/utils/bezels.py diff --git a/package/core/batocera-configgen/configgen/configgen/utils/buildargs.py b/package/batocera/core/batocera-configgen/configgen/configgen/utils/buildargs.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/utils/buildargs.py rename to package/batocera/core/batocera-configgen/configgen/configgen/utils/buildargs.py diff --git a/package/core/batocera-configgen/configgen/configgen/utils/gunsUtils.py b/package/batocera/core/batocera-configgen/configgen/configgen/utils/gunsUtils.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/utils/gunsUtils.py rename to package/batocera/core/batocera-configgen/configgen/configgen/utils/gunsUtils.py diff --git a/package/core/batocera-configgen/configgen/configgen/utils/logger.py b/package/batocera/core/batocera-configgen/configgen/configgen/utils/logger.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/utils/logger.py rename to package/batocera/core/batocera-configgen/configgen/configgen/utils/logger.py diff --git a/package/core/batocera-configgen/configgen/configgen/utils/video/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/utils/video/__init__.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/utils/video/__init__.py rename to package/batocera/core/batocera-configgen/configgen/configgen/utils/video/__init__.py diff --git a/package/core/batocera-configgen/configgen/configgen/utils/video/videoModeDrm.py b/package/batocera/core/batocera-configgen/configgen/configgen/utils/video/videoModeDrm.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/utils/video/videoModeDrm.py rename to package/batocera/core/batocera-configgen/configgen/configgen/utils/video/videoModeDrm.py diff --git a/package/core/batocera-configgen/configgen/configgen/utils/video/videoModeWayland.py b/package/batocera/core/batocera-configgen/configgen/configgen/utils/video/videoModeWayland.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/utils/video/videoModeWayland.py rename to package/batocera/core/batocera-configgen/configgen/configgen/utils/video/videoModeWayland.py diff --git a/package/core/batocera-configgen/configgen/configgen/utils/video/videoModeX11.py b/package/batocera/core/batocera-configgen/configgen/configgen/utils/video/videoModeX11.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/utils/video/videoModeX11.py rename to package/batocera/core/batocera-configgen/configgen/configgen/utils/video/videoModeX11.py diff --git a/package/core/batocera-configgen/configgen/configgen/utils/videoMode.py b/package/batocera/core/batocera-configgen/configgen/configgen/utils/videoMode.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/utils/videoMode.py rename to package/batocera/core/batocera-configgen/configgen/configgen/utils/videoMode.py diff --git a/package/core/batocera-configgen/configgen/configgen/utils/wheelsUtils.py b/package/batocera/core/batocera-configgen/configgen/configgen/utils/wheelsUtils.py similarity index 100% rename from package/core/batocera-configgen/configgen/configgen/utils/wheelsUtils.py rename to package/batocera/core/batocera-configgen/configgen/configgen/utils/wheelsUtils.py diff --git a/package/core/batocera-configgen/configgen/setup.py b/package/batocera/core/batocera-configgen/configgen/setup.py similarity index 100% rename from package/core/batocera-configgen/configgen/setup.py rename to package/batocera/core/batocera-configgen/configgen/setup.py diff --git a/package/core/batocera-configgen/configs/configgen-defaults-a3gen2.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-a3gen2.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-a3gen2.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-a3gen2.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-bcm2711.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-bcm2711.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-bcm2711.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-bcm2711.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-bcm2712.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-bcm2712.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-bcm2712.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-bcm2712.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-bcm2835.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-bcm2835.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-bcm2835.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-bcm2835.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-bcm2836.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-bcm2836.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-bcm2836.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-bcm2836.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-bcm2837.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-bcm2837.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-bcm2837.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-bcm2837.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-cha.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-cha.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-cha.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-cha.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-h3.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-h3.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-h3.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-h3.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-h5.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-h5.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-h5.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-h5.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-h6.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-h6.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-h6.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-h6.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-h616.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-h616.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-h616.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-h616.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-jh7110.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-jh7110.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-jh7110.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-jh7110.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-jz4770.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-jz4770.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-jz4770.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-jz4770.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-k1.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-k1.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-k1.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-k1.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-mt8395.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-mt8395.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-mt8395.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-mt8395.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-odin.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-odin.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-odin.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-odin.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-odroidxu4.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-odroidxu4.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-odroidxu4.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-odroidxu4.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-rk3128.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-rk3128.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-rk3128.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-rk3128.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-rk3288.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-rk3288.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-rk3288.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-rk3288.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-rk3326.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-rk3326.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-rk3326.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-rk3326.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-rk3328.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-rk3328.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-rk3328.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-rk3328.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-rk3399.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-rk3399.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-rk3399.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-rk3399.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-rk3568.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-rk3568.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-rk3568.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-rk3568.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-rk3588.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-rk3588.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-rk3588.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-rk3588.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-s812.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-s812.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-s812.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-s812.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-s905.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-s905.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-s905.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-s905.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-s905gen2.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-s905gen2.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-s905gen2.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-s905gen2.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-s905gen3.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-s905gen3.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-s905gen3.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-s905gen3.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-s912.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-s912.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-s912.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-s912.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-s922x.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-s922x.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-s922x.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-s922x.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-s9gen4.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-s9gen4.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-s9gen4.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-s9gen4.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-x86.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-x86.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-x86.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-x86.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults-x86_64.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults-x86_64.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults-x86_64.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults-x86_64.yml diff --git a/package/core/batocera-configgen/configs/configgen-defaults.yml b/package/batocera/core/batocera-configgen/configs/configgen-defaults.yml similarity index 100% rename from package/core/batocera-configgen/configs/configgen-defaults.yml rename to package/batocera/core/batocera-configgen/configs/configgen-defaults.yml diff --git a/package/core/batocera-configgen/data/dreamcast/vmu_save_blank.bin b/package/batocera/core/batocera-configgen/data/dreamcast/vmu_save_blank.bin similarity index 100% rename from package/core/batocera-configgen/data/dreamcast/vmu_save_blank.bin rename to package/batocera/core/batocera-configgen/data/dreamcast/vmu_save_blank.bin diff --git a/package/core/batocera-configgen/data/linapple/Master.dsk b/package/batocera/core/batocera-configgen/data/linapple/Master.dsk similarity index 100% rename from package/core/batocera-configgen/data/linapple/Master.dsk rename to package/batocera/core/batocera-configgen/data/linapple/Master.dsk diff --git a/package/core/batocera-configgen/data/mame/atom_flop_autoload.csv b/package/batocera/core/batocera-configgen/data/mame/atom_flop_autoload.csv similarity index 100% rename from package/core/batocera-configgen/data/mame/atom_flop_autoload.csv rename to package/batocera/core/batocera-configgen/data/mame/atom_flop_autoload.csv diff --git a/package/core/batocera-configgen/data/mame/camplynx_cass_autoload.csv b/package/batocera/core/batocera-configgen/data/mame/camplynx_cass_autoload.csv similarity index 100% rename from package/core/batocera-configgen/data/mame/camplynx_cass_autoload.csv rename to package/batocera/core/batocera-configgen/data/mame/camplynx_cass_autoload.csv diff --git a/package/core/batocera-configgen/data/mame/mameCapcom.txt b/package/batocera/core/batocera-configgen/data/mame/mameCapcom.txt similarity index 100% rename from package/core/batocera-configgen/data/mame/mameCapcom.txt rename to package/batocera/core/batocera-configgen/data/mame/mameCapcom.txt diff --git a/package/core/batocera-configgen/data/mame/mameControls.csv b/package/batocera/core/batocera-configgen/data/mame/mameControls.csv similarity index 100% rename from package/core/batocera-configgen/data/mame/mameControls.csv rename to package/batocera/core/batocera-configgen/data/mame/mameControls.csv diff --git a/package/core/batocera-configgen/data/mame/mameKInstinct.txt b/package/batocera/core/batocera-configgen/data/mame/mameKInstinct.txt similarity index 100% rename from package/core/batocera-configgen/data/mame/mameKInstinct.txt rename to package/batocera/core/batocera-configgen/data/mame/mameKInstinct.txt diff --git a/package/core/batocera-configgen/data/mame/mameMKombat.txt b/package/batocera/core/batocera-configgen/data/mame/mameMKombat.txt similarity index 100% rename from package/core/batocera-configgen/data/mame/mameMKombat.txt rename to package/batocera/core/batocera-configgen/data/mame/mameMKombat.txt diff --git a/package/core/batocera-configgen/data/mame/mameNeogeo.txt b/package/batocera/core/batocera-configgen/data/mame/mameNeogeo.txt similarity index 100% rename from package/core/batocera-configgen/data/mame/mameNeogeo.txt rename to package/batocera/core/batocera-configgen/data/mame/mameNeogeo.txt diff --git a/package/core/batocera-configgen/data/mame/mameRotatedstick.txt b/package/batocera/core/batocera-configgen/data/mame/mameRotatedstick.txt similarity index 100% rename from package/core/batocera-configgen/data/mame/mameRotatedstick.txt rename to package/batocera/core/batocera-configgen/data/mame/mameRotatedstick.txt diff --git a/package/core/batocera-configgen/data/mame/mameTwinstick.txt b/package/batocera/core/batocera-configgen/data/mame/mameTwinstick.txt similarity index 100% rename from package/core/batocera-configgen/data/mame/mameTwinstick.txt rename to package/batocera/core/batocera-configgen/data/mame/mameTwinstick.txt diff --git a/package/core/batocera-configgen/data/mame/messControls.csv b/package/batocera/core/batocera-configgen/data/mame/messControls.csv similarity index 100% rename from package/core/batocera-configgen/data/mame/messControls.csv rename to package/batocera/core/batocera-configgen/data/mame/messControls.csv diff --git a/package/core/batocera-configgen/data/mame/messSystems.csv b/package/batocera/core/batocera-configgen/data/mame/messSystems.csv similarity index 100% rename from package/core/batocera-configgen/data/mame/messSystems.csv rename to package/batocera/core/batocera-configgen/data/mame/messSystems.csv diff --git a/package/core/batocera-configgen/data/special/3ds.csv b/package/batocera/core/batocera-configgen/data/special/3ds.csv similarity index 100% rename from package/core/batocera-configgen/data/special/3ds.csv rename to package/batocera/core/batocera-configgen/data/special/3ds.csv diff --git a/package/core/batocera-configgen/data/special/atomiswave.csv b/package/batocera/core/batocera-configgen/data/special/atomiswave.csv similarity index 100% rename from package/core/batocera-configgen/data/special/atomiswave.csv rename to package/batocera/core/batocera-configgen/data/special/atomiswave.csv diff --git a/package/core/batocera-configgen/data/special/fbneo.csv b/package/batocera/core/batocera-configgen/data/special/fbneo.csv similarity index 100% rename from package/core/batocera-configgen/data/special/fbneo.csv rename to package/batocera/core/batocera-configgen/data/special/fbneo.csv diff --git a/package/core/batocera-configgen/data/special/lynx.csv b/package/batocera/core/batocera-configgen/data/special/lynx.csv similarity index 100% rename from package/core/batocera-configgen/data/special/lynx.csv rename to package/batocera/core/batocera-configgen/data/special/lynx.csv diff --git a/package/core/batocera-configgen/data/special/mame.csv b/package/batocera/core/batocera-configgen/data/special/mame.csv similarity index 100% rename from package/core/batocera-configgen/data/special/mame.csv rename to package/batocera/core/batocera-configgen/data/special/mame.csv diff --git a/package/core/batocera-configgen/data/special/naomi.csv b/package/batocera/core/batocera-configgen/data/special/naomi.csv similarity index 100% rename from package/core/batocera-configgen/data/special/naomi.csv rename to package/batocera/core/batocera-configgen/data/special/naomi.csv diff --git a/package/core/batocera-configgen/data/special/nds.csv b/package/batocera/core/batocera-configgen/data/special/nds.csv similarity index 100% rename from package/core/batocera-configgen/data/special/nds.csv rename to package/batocera/core/batocera-configgen/data/special/nds.csv diff --git a/package/core/batocera-configgen/data/special/vectrex.csv b/package/batocera/core/batocera-configgen/data/special/vectrex.csv similarity index 100% rename from package/core/batocera-configgen/data/special/vectrex.csv rename to package/batocera/core/batocera-configgen/data/special/vectrex.csv diff --git a/package/core/batocera-configgen/data/special/wswan.csv b/package/batocera/core/batocera-configgen/data/special/wswan.csv similarity index 100% rename from package/core/batocera-configgen/data/special/wswan.csv rename to package/batocera/core/batocera-configgen/data/special/wswan.csv diff --git a/package/core/batocera-configgen/data/special/wswanc.csv b/package/batocera/core/batocera-configgen/data/special/wswanc.csv similarity index 100% rename from package/core/batocera-configgen/data/special/wswanc.csv rename to package/batocera/core/batocera-configgen/data/special/wswanc.csv diff --git a/package/core/batocera-configgen/scripts/call_achievements_hooks.sh b/package/batocera/core/batocera-configgen/scripts/call_achievements_hooks.sh similarity index 100% rename from package/core/batocera-configgen/scripts/call_achievements_hooks.sh rename to package/batocera/core/batocera-configgen/scripts/call_achievements_hooks.sh diff --git a/package/core/batocera-configgen/scripts/nvidia-workaround.sh b/package/batocera/core/batocera-configgen/scripts/nvidia-workaround.sh similarity index 100% rename from package/core/batocera-configgen/scripts/nvidia-workaround.sh rename to package/batocera/core/batocera-configgen/scripts/nvidia-workaround.sh diff --git a/package/core/batocera-configgen/scripts/powermode_launch_hooks.sh b/package/batocera/core/batocera-configgen/scripts/powermode_launch_hooks.sh similarity index 100% rename from package/core/batocera-configgen/scripts/powermode_launch_hooks.sh rename to package/batocera/core/batocera-configgen/scripts/powermode_launch_hooks.sh diff --git a/package/core/batocera-configgen/scripts/tdp_hooks.sh b/package/batocera/core/batocera-configgen/scripts/tdp_hooks.sh similarity index 100% rename from package/core/batocera-configgen/scripts/tdp_hooks.sh rename to package/batocera/core/batocera-configgen/scripts/tdp_hooks.sh diff --git a/package/core/batocera-controller-overlays/Config.in b/package/batocera/core/batocera-controller-overlays/Config.in similarity index 100% rename from package/core/batocera-controller-overlays/Config.in rename to package/batocera/core/batocera-controller-overlays/Config.in diff --git a/package/core/batocera-controller-overlays/batocera-controller-overlays.hash b/package/batocera/core/batocera-controller-overlays/batocera-controller-overlays.hash similarity index 100% rename from package/core/batocera-controller-overlays/batocera-controller-overlays.hash rename to package/batocera/core/batocera-controller-overlays/batocera-controller-overlays.hash diff --git a/package/core/batocera-controller-overlays/batocera-controller-overlays.mk b/package/batocera/core/batocera-controller-overlays/batocera-controller-overlays.mk similarity index 100% rename from package/core/batocera-controller-overlays/batocera-controller-overlays.mk rename to package/batocera/core/batocera-controller-overlays/batocera-controller-overlays.mk diff --git a/package/core/batocera-desktopapps/Config.in b/package/batocera/core/batocera-desktopapps/Config.in similarity index 100% rename from package/core/batocera-desktopapps/Config.in rename to package/batocera/core/batocera-desktopapps/Config.in diff --git a/package/core/batocera-desktopapps/apps/cemu-config.desktop b/package/batocera/core/batocera-desktopapps/apps/cemu-config.desktop similarity index 100% rename from package/core/batocera-desktopapps/apps/cemu-config.desktop rename to package/batocera/core/batocera-desktopapps/apps/cemu-config.desktop diff --git a/package/core/batocera-desktopapps/apps/citra-config.desktop b/package/batocera/core/batocera-desktopapps/apps/citra-config.desktop similarity index 100% rename from package/core/batocera-desktopapps/apps/citra-config.desktop rename to package/batocera/core/batocera-desktopapps/apps/citra-config.desktop diff --git a/package/core/batocera-desktopapps/apps/demul-config.desktop b/package/batocera/core/batocera-desktopapps/apps/demul-config.desktop similarity index 100% rename from package/core/batocera-desktopapps/apps/demul-config.desktop rename to package/batocera/core/batocera-desktopapps/apps/demul-config.desktop diff --git a/package/core/batocera-desktopapps/apps/dolphin-config.desktop b/package/batocera/core/batocera-desktopapps/apps/dolphin-config.desktop similarity index 100% rename from package/core/batocera-desktopapps/apps/dolphin-config.desktop rename to package/batocera/core/batocera-desktopapps/apps/dolphin-config.desktop diff --git a/package/core/batocera-desktopapps/apps/dolphin-triforce-config.desktop b/package/batocera/core/batocera-desktopapps/apps/dolphin-triforce-config.desktop similarity index 100% rename from package/core/batocera-desktopapps/apps/dolphin-triforce-config.desktop rename to package/batocera/core/batocera-desktopapps/apps/dolphin-triforce-config.desktop diff --git a/package/core/batocera-desktopapps/apps/duckstation-config.desktop b/package/batocera/core/batocera-desktopapps/apps/duckstation-config.desktop similarity index 100% rename from package/core/batocera-desktopapps/apps/duckstation-config.desktop rename to package/batocera/core/batocera-desktopapps/apps/duckstation-config.desktop diff --git a/package/core/batocera-desktopapps/apps/flatpak-config.desktop b/package/batocera/core/batocera-desktopapps/apps/flatpak-config.desktop similarity index 100% rename from package/core/batocera-desktopapps/apps/flatpak-config.desktop rename to package/batocera/core/batocera-desktopapps/apps/flatpak-config.desktop diff --git a/package/core/batocera-desktopapps/apps/flycast-config.desktop b/package/batocera/core/batocera-desktopapps/apps/flycast-config.desktop similarity index 100% rename from package/core/batocera-desktopapps/apps/flycast-config.desktop rename to package/batocera/core/batocera-desktopapps/apps/flycast-config.desktop diff --git a/package/core/batocera-desktopapps/apps/fpinball-config.desktop b/package/batocera/core/batocera-desktopapps/apps/fpinball-config.desktop similarity index 100% rename from package/core/batocera-desktopapps/apps/fpinball-config.desktop rename to package/batocera/core/batocera-desktopapps/apps/fpinball-config.desktop diff --git a/package/core/batocera-desktopapps/apps/lime3ds-config.desktop b/package/batocera/core/batocera-desktopapps/apps/lime3ds-config.desktop similarity index 100% rename from package/core/batocera-desktopapps/apps/lime3ds-config.desktop rename to package/batocera/core/batocera-desktopapps/apps/lime3ds-config.desktop diff --git a/package/core/batocera-desktopapps/apps/melonds-config.desktop b/package/batocera/core/batocera-desktopapps/apps/melonds-config.desktop similarity index 100% rename from package/core/batocera-desktopapps/apps/melonds-config.desktop rename to package/batocera/core/batocera-desktopapps/apps/melonds-config.desktop diff --git a/package/core/batocera-desktopapps/apps/model2emu-config.desktop b/package/batocera/core/batocera-desktopapps/apps/model2emu-config.desktop similarity index 100% rename from package/core/batocera-desktopapps/apps/model2emu-config.desktop rename to package/batocera/core/batocera-desktopapps/apps/model2emu-config.desktop diff --git a/package/core/batocera-desktopapps/apps/pcsx2-config.desktop b/package/batocera/core/batocera-desktopapps/apps/pcsx2-config.desktop similarity index 100% rename from package/core/batocera-desktopapps/apps/pcsx2-config.desktop rename to package/batocera/core/batocera-desktopapps/apps/pcsx2-config.desktop diff --git a/package/core/batocera-desktopapps/apps/play-config.desktop b/package/batocera/core/batocera-desktopapps/apps/play-config.desktop similarity index 100% rename from package/core/batocera-desktopapps/apps/play-config.desktop rename to package/batocera/core/batocera-desktopapps/apps/play-config.desktop diff --git a/package/core/batocera-desktopapps/apps/ppsspp-config.desktop b/package/batocera/core/batocera-desktopapps/apps/ppsspp-config.desktop similarity index 100% rename from package/core/batocera-desktopapps/apps/ppsspp-config.desktop rename to package/batocera/core/batocera-desktopapps/apps/ppsspp-config.desktop diff --git a/package/core/batocera-desktopapps/apps/retroarch-config.desktop b/package/batocera/core/batocera-desktopapps/apps/retroarch-config.desktop similarity index 100% rename from package/core/batocera-desktopapps/apps/retroarch-config.desktop rename to package/batocera/core/batocera-desktopapps/apps/retroarch-config.desktop diff --git a/package/core/batocera-desktopapps/apps/rpcs3-config.desktop b/package/batocera/core/batocera-desktopapps/apps/rpcs3-config.desktop similarity index 100% rename from package/core/batocera-desktopapps/apps/rpcs3-config.desktop rename to package/batocera/core/batocera-desktopapps/apps/rpcs3-config.desktop diff --git a/package/core/batocera-desktopapps/apps/ryujinx-config.desktop b/package/batocera/core/batocera-desktopapps/apps/ryujinx-config.desktop similarity index 100% rename from package/core/batocera-desktopapps/apps/ryujinx-config.desktop rename to package/batocera/core/batocera-desktopapps/apps/ryujinx-config.desktop diff --git a/package/core/batocera-desktopapps/apps/scummvm-config.desktop b/package/batocera/core/batocera-desktopapps/apps/scummvm-config.desktop similarity index 100% rename from package/core/batocera-desktopapps/apps/scummvm-config.desktop rename to package/batocera/core/batocera-desktopapps/apps/scummvm-config.desktop diff --git a/package/core/batocera-desktopapps/apps/suyu-config.desktop b/package/batocera/core/batocera-desktopapps/apps/suyu-config.desktop similarity index 100% rename from package/core/batocera-desktopapps/apps/suyu-config.desktop rename to package/batocera/core/batocera-desktopapps/apps/suyu-config.desktop diff --git a/package/core/batocera-desktopapps/apps/vita3k-config.desktop b/package/batocera/core/batocera-desktopapps/apps/vita3k-config.desktop similarity index 100% rename from package/core/batocera-desktopapps/apps/vita3k-config.desktop rename to package/batocera/core/batocera-desktopapps/apps/vita3k-config.desktop diff --git a/package/core/batocera-desktopapps/apps/xenia-canary-config.desktop b/package/batocera/core/batocera-desktopapps/apps/xenia-canary-config.desktop similarity index 100% rename from package/core/batocera-desktopapps/apps/xenia-canary-config.desktop rename to package/batocera/core/batocera-desktopapps/apps/xenia-canary-config.desktop diff --git a/package/core/batocera-desktopapps/apps/xenia-config.desktop b/package/batocera/core/batocera-desktopapps/apps/xenia-config.desktop similarity index 100% rename from package/core/batocera-desktopapps/apps/xenia-config.desktop rename to package/batocera/core/batocera-desktopapps/apps/xenia-config.desktop diff --git a/package/core/batocera-desktopapps/apps/xterm.desktop b/package/batocera/core/batocera-desktopapps/apps/xterm.desktop similarity index 100% rename from package/core/batocera-desktopapps/apps/xterm.desktop rename to package/batocera/core/batocera-desktopapps/apps/xterm.desktop diff --git a/package/core/batocera-desktopapps/apps/xwiishowir.desktop b/package/batocera/core/batocera-desktopapps/apps/xwiishowir.desktop similarity index 100% rename from package/core/batocera-desktopapps/apps/xwiishowir.desktop rename to package/batocera/core/batocera-desktopapps/apps/xwiishowir.desktop diff --git a/package/core/batocera-desktopapps/batocera-desktopapps.mk b/package/batocera/core/batocera-desktopapps/batocera-desktopapps.mk similarity index 91% rename from package/core/batocera-desktopapps/batocera-desktopapps.mk rename to package/batocera/core/batocera-desktopapps/batocera-desktopapps.mk index 9dca89bd94f..c284925aa74 100644 --- a/package/core/batocera-desktopapps/batocera-desktopapps.mk +++ b/package/batocera/core/batocera-desktopapps/batocera-desktopapps.mk @@ -169,19 +169,19 @@ endif define BATOCERA_DESKTOPAPPS_INSTALL_TARGET_CMDS # scripts mkdir -p $(TARGET_DIR)/usr/bin - $(foreach f,$(BATOCERA_DESKTOPAPPS_SCRIPTS), cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-desktopapps/scripts/$(f) $(TARGET_DIR)/usr/bin/$(f)$(sep)) + $(foreach f,$(BATOCERA_DESKTOPAPPS_SCRIPTS), cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-desktopapps/scripts/$(f) $(TARGET_DIR)/usr/bin/$(f)$(sep)) # apps mkdir -p $(TARGET_DIR)/usr/share/applications - $(foreach f,$(BATOCERA_DESKTOPAPPS_APPS), cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-desktopapps/apps/$(f) $(TARGET_DIR)/usr/share/applications/$(f)$(sep)) + $(foreach f,$(BATOCERA_DESKTOPAPPS_APPS), cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-desktopapps/apps/$(f) $(TARGET_DIR)/usr/share/applications/$(f)$(sep)) # icons mkdir -p $(TARGET_DIR)/usr/share/icons/reglinux - $(foreach f,$(BATOCERA_DESKTOPAPPS_ICONS), cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-desktopapps/icons/$(f) $(TARGET_DIR)/usr/share/icons/reglinux/$(f)$(sep)) + $(foreach f,$(BATOCERA_DESKTOPAPPS_ICONS), cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-desktopapps/icons/$(f) $(TARGET_DIR)/usr/share/icons/reglinux/$(f)$(sep)) # menu mkdir -p $(TARGET_DIR)/etc/xdg/menus - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-desktopapps/menu/batocera-applications.menu $(TARGET_DIR)/etc/xdg/menus/batocera-applications.menu + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-desktopapps/menu/batocera-applications.menu $(TARGET_DIR)/etc/xdg/menus/batocera-applications.menu endef $(eval $(generic-package)) diff --git a/package/core/batocera-desktopapps/icons/cemu.png b/package/batocera/core/batocera-desktopapps/icons/cemu.png similarity index 100% rename from package/core/batocera-desktopapps/icons/cemu.png rename to package/batocera/core/batocera-desktopapps/icons/cemu.png diff --git a/package/core/batocera-desktopapps/icons/citra.png b/package/batocera/core/batocera-desktopapps/icons/citra.png similarity index 100% rename from package/core/batocera-desktopapps/icons/citra.png rename to package/batocera/core/batocera-desktopapps/icons/citra.png diff --git a/package/core/batocera-desktopapps/icons/demul.png b/package/batocera/core/batocera-desktopapps/icons/demul.png similarity index 100% rename from package/core/batocera-desktopapps/icons/demul.png rename to package/batocera/core/batocera-desktopapps/icons/demul.png diff --git a/package/core/batocera-desktopapps/icons/dolphin-triforce.png b/package/batocera/core/batocera-desktopapps/icons/dolphin-triforce.png similarity index 100% rename from package/core/batocera-desktopapps/icons/dolphin-triforce.png rename to package/batocera/core/batocera-desktopapps/icons/dolphin-triforce.png diff --git a/package/core/batocera-desktopapps/icons/dolphin.png b/package/batocera/core/batocera-desktopapps/icons/dolphin.png similarity index 100% rename from package/core/batocera-desktopapps/icons/dolphin.png rename to package/batocera/core/batocera-desktopapps/icons/dolphin.png diff --git a/package/core/batocera-desktopapps/icons/duckstation.png b/package/batocera/core/batocera-desktopapps/icons/duckstation.png similarity index 100% rename from package/core/batocera-desktopapps/icons/duckstation.png rename to package/batocera/core/batocera-desktopapps/icons/duckstation.png diff --git a/package/core/batocera-desktopapps/icons/flycast.png b/package/batocera/core/batocera-desktopapps/icons/flycast.png similarity index 100% rename from package/core/batocera-desktopapps/icons/flycast.png rename to package/batocera/core/batocera-desktopapps/icons/flycast.png diff --git a/package/core/batocera-desktopapps/icons/fpinball.png b/package/batocera/core/batocera-desktopapps/icons/fpinball.png similarity index 100% rename from package/core/batocera-desktopapps/icons/fpinball.png rename to package/batocera/core/batocera-desktopapps/icons/fpinball.png diff --git a/package/core/batocera-desktopapps/icons/melonds.png b/package/batocera/core/batocera-desktopapps/icons/melonds.png similarity index 100% rename from package/core/batocera-desktopapps/icons/melonds.png rename to package/batocera/core/batocera-desktopapps/icons/melonds.png diff --git a/package/core/batocera-desktopapps/icons/model2emu.png b/package/batocera/core/batocera-desktopapps/icons/model2emu.png similarity index 100% rename from package/core/batocera-desktopapps/icons/model2emu.png rename to package/batocera/core/batocera-desktopapps/icons/model2emu.png diff --git a/package/core/batocera-desktopapps/icons/pcsx2.png b/package/batocera/core/batocera-desktopapps/icons/pcsx2.png similarity index 100% rename from package/core/batocera-desktopapps/icons/pcsx2.png rename to package/batocera/core/batocera-desktopapps/icons/pcsx2.png diff --git a/package/core/batocera-desktopapps/icons/play.png b/package/batocera/core/batocera-desktopapps/icons/play.png similarity index 100% rename from package/core/batocera-desktopapps/icons/play.png rename to package/batocera/core/batocera-desktopapps/icons/play.png diff --git a/package/core/batocera-desktopapps/icons/ppsspp.png b/package/batocera/core/batocera-desktopapps/icons/ppsspp.png similarity index 100% rename from package/core/batocera-desktopapps/icons/ppsspp.png rename to package/batocera/core/batocera-desktopapps/icons/ppsspp.png diff --git a/package/core/batocera-desktopapps/icons/retroarch.png b/package/batocera/core/batocera-desktopapps/icons/retroarch.png similarity index 100% rename from package/core/batocera-desktopapps/icons/retroarch.png rename to package/batocera/core/batocera-desktopapps/icons/retroarch.png diff --git a/package/core/batocera-desktopapps/icons/rpcs3.png b/package/batocera/core/batocera-desktopapps/icons/rpcs3.png similarity index 100% rename from package/core/batocera-desktopapps/icons/rpcs3.png rename to package/batocera/core/batocera-desktopapps/icons/rpcs3.png diff --git a/package/core/batocera-desktopapps/icons/ryujinx.png b/package/batocera/core/batocera-desktopapps/icons/ryujinx.png similarity index 100% rename from package/core/batocera-desktopapps/icons/ryujinx.png rename to package/batocera/core/batocera-desktopapps/icons/ryujinx.png diff --git a/package/core/batocera-desktopapps/icons/scummvm.png b/package/batocera/core/batocera-desktopapps/icons/scummvm.png similarity index 100% rename from package/core/batocera-desktopapps/icons/scummvm.png rename to package/batocera/core/batocera-desktopapps/icons/scummvm.png diff --git a/package/core/batocera-desktopapps/icons/suyu.png b/package/batocera/core/batocera-desktopapps/icons/suyu.png similarity index 100% rename from package/core/batocera-desktopapps/icons/suyu.png rename to package/batocera/core/batocera-desktopapps/icons/suyu.png diff --git a/package/core/batocera-desktopapps/icons/vita3k.png b/package/batocera/core/batocera-desktopapps/icons/vita3k.png similarity index 100% rename from package/core/batocera-desktopapps/icons/vita3k.png rename to package/batocera/core/batocera-desktopapps/icons/vita3k.png diff --git a/package/core/batocera-desktopapps/icons/xenia-canary.png b/package/batocera/core/batocera-desktopapps/icons/xenia-canary.png similarity index 100% rename from package/core/batocera-desktopapps/icons/xenia-canary.png rename to package/batocera/core/batocera-desktopapps/icons/xenia-canary.png diff --git a/package/core/batocera-desktopapps/icons/xenia.png b/package/batocera/core/batocera-desktopapps/icons/xenia.png similarity index 100% rename from package/core/batocera-desktopapps/icons/xenia.png rename to package/batocera/core/batocera-desktopapps/icons/xenia.png diff --git a/package/core/batocera-desktopapps/icons/xwiishowir.png b/package/batocera/core/batocera-desktopapps/icons/xwiishowir.png similarity index 100% rename from package/core/batocera-desktopapps/icons/xwiishowir.png rename to package/batocera/core/batocera-desktopapps/icons/xwiishowir.png diff --git a/package/core/batocera-desktopapps/menu/batocera-applications.menu b/package/batocera/core/batocera-desktopapps/menu/batocera-applications.menu similarity index 100% rename from package/core/batocera-desktopapps/menu/batocera-applications.menu rename to package/batocera/core/batocera-desktopapps/menu/batocera-applications.menu diff --git a/package/core/batocera-desktopapps/scripts/batocera-config-cemu b/package/batocera/core/batocera-desktopapps/scripts/batocera-config-cemu similarity index 100% rename from package/core/batocera-desktopapps/scripts/batocera-config-cemu rename to package/batocera/core/batocera-desktopapps/scripts/batocera-config-cemu diff --git a/package/core/batocera-desktopapps/scripts/batocera-config-citra b/package/batocera/core/batocera-desktopapps/scripts/batocera-config-citra similarity index 100% rename from package/core/batocera-desktopapps/scripts/batocera-config-citra rename to package/batocera/core/batocera-desktopapps/scripts/batocera-config-citra diff --git a/package/core/batocera-desktopapps/scripts/batocera-config-demul b/package/batocera/core/batocera-desktopapps/scripts/batocera-config-demul similarity index 100% rename from package/core/batocera-desktopapps/scripts/batocera-config-demul rename to package/batocera/core/batocera-desktopapps/scripts/batocera-config-demul diff --git a/package/core/batocera-desktopapps/scripts/batocera-config-dolphin b/package/batocera/core/batocera-desktopapps/scripts/batocera-config-dolphin similarity index 100% rename from package/core/batocera-desktopapps/scripts/batocera-config-dolphin rename to package/batocera/core/batocera-desktopapps/scripts/batocera-config-dolphin diff --git a/package/core/batocera-desktopapps/scripts/batocera-config-dolphin-triforce b/package/batocera/core/batocera-desktopapps/scripts/batocera-config-dolphin-triforce similarity index 100% rename from package/core/batocera-desktopapps/scripts/batocera-config-dolphin-triforce rename to package/batocera/core/batocera-desktopapps/scripts/batocera-config-dolphin-triforce diff --git a/package/core/batocera-desktopapps/scripts/batocera-config-duckstation b/package/batocera/core/batocera-desktopapps/scripts/batocera-config-duckstation similarity index 100% rename from package/core/batocera-desktopapps/scripts/batocera-config-duckstation rename to package/batocera/core/batocera-desktopapps/scripts/batocera-config-duckstation diff --git a/package/core/batocera-desktopapps/scripts/batocera-config-flycast b/package/batocera/core/batocera-desktopapps/scripts/batocera-config-flycast similarity index 100% rename from package/core/batocera-desktopapps/scripts/batocera-config-flycast rename to package/batocera/core/batocera-desktopapps/scripts/batocera-config-flycast diff --git a/package/core/batocera-desktopapps/scripts/batocera-config-fpinball b/package/batocera/core/batocera-desktopapps/scripts/batocera-config-fpinball similarity index 100% rename from package/core/batocera-desktopapps/scripts/batocera-config-fpinball rename to package/batocera/core/batocera-desktopapps/scripts/batocera-config-fpinball diff --git a/package/core/batocera-desktopapps/scripts/batocera-config-melonds b/package/batocera/core/batocera-desktopapps/scripts/batocera-config-melonds similarity index 100% rename from package/core/batocera-desktopapps/scripts/batocera-config-melonds rename to package/batocera/core/batocera-desktopapps/scripts/batocera-config-melonds diff --git a/package/core/batocera-desktopapps/scripts/batocera-config-model2emu b/package/batocera/core/batocera-desktopapps/scripts/batocera-config-model2emu similarity index 100% rename from package/core/batocera-desktopapps/scripts/batocera-config-model2emu rename to package/batocera/core/batocera-desktopapps/scripts/batocera-config-model2emu diff --git a/package/core/batocera-desktopapps/scripts/batocera-config-pcsx2 b/package/batocera/core/batocera-desktopapps/scripts/batocera-config-pcsx2 similarity index 100% rename from package/core/batocera-desktopapps/scripts/batocera-config-pcsx2 rename to package/batocera/core/batocera-desktopapps/scripts/batocera-config-pcsx2 diff --git a/package/core/batocera-desktopapps/scripts/batocera-config-play b/package/batocera/core/batocera-desktopapps/scripts/batocera-config-play similarity index 100% rename from package/core/batocera-desktopapps/scripts/batocera-config-play rename to package/batocera/core/batocera-desktopapps/scripts/batocera-config-play diff --git a/package/core/batocera-desktopapps/scripts/batocera-config-ppsspp b/package/batocera/core/batocera-desktopapps/scripts/batocera-config-ppsspp similarity index 100% rename from package/core/batocera-desktopapps/scripts/batocera-config-ppsspp rename to package/batocera/core/batocera-desktopapps/scripts/batocera-config-ppsspp diff --git a/package/core/batocera-desktopapps/scripts/batocera-config-retroarch b/package/batocera/core/batocera-desktopapps/scripts/batocera-config-retroarch similarity index 100% rename from package/core/batocera-desktopapps/scripts/batocera-config-retroarch rename to package/batocera/core/batocera-desktopapps/scripts/batocera-config-retroarch diff --git a/package/core/batocera-desktopapps/scripts/batocera-config-rpcs3 b/package/batocera/core/batocera-desktopapps/scripts/batocera-config-rpcs3 similarity index 100% rename from package/core/batocera-desktopapps/scripts/batocera-config-rpcs3 rename to package/batocera/core/batocera-desktopapps/scripts/batocera-config-rpcs3 diff --git a/package/core/batocera-desktopapps/scripts/batocera-config-ryujinx b/package/batocera/core/batocera-desktopapps/scripts/batocera-config-ryujinx similarity index 100% rename from package/core/batocera-desktopapps/scripts/batocera-config-ryujinx rename to package/batocera/core/batocera-desktopapps/scripts/batocera-config-ryujinx diff --git a/package/core/batocera-desktopapps/scripts/batocera-config-scummvm b/package/batocera/core/batocera-desktopapps/scripts/batocera-config-scummvm similarity index 100% rename from package/core/batocera-desktopapps/scripts/batocera-config-scummvm rename to package/batocera/core/batocera-desktopapps/scripts/batocera-config-scummvm diff --git a/package/core/batocera-desktopapps/scripts/batocera-config-sudachi b/package/batocera/core/batocera-desktopapps/scripts/batocera-config-sudachi similarity index 100% rename from package/core/batocera-desktopapps/scripts/batocera-config-sudachi rename to package/batocera/core/batocera-desktopapps/scripts/batocera-config-sudachi diff --git a/package/core/batocera-desktopapps/scripts/batocera-config-vita3k b/package/batocera/core/batocera-desktopapps/scripts/batocera-config-vita3k similarity index 100% rename from package/core/batocera-desktopapps/scripts/batocera-config-vita3k rename to package/batocera/core/batocera-desktopapps/scripts/batocera-config-vita3k diff --git a/package/core/batocera-desktopapps/scripts/batocera-config-xenia b/package/batocera/core/batocera-desktopapps/scripts/batocera-config-xenia similarity index 100% rename from package/core/batocera-desktopapps/scripts/batocera-config-xenia rename to package/batocera/core/batocera-desktopapps/scripts/batocera-config-xenia diff --git a/package/core/batocera-desktopapps/scripts/batocera-config-xenia-canary b/package/batocera/core/batocera-desktopapps/scripts/batocera-config-xenia-canary similarity index 100% rename from package/core/batocera-desktopapps/scripts/batocera-config-xenia-canary rename to package/batocera/core/batocera-desktopapps/scripts/batocera-config-xenia-canary diff --git a/package/core/batocera-desktopapps/scripts/filemanagerlauncher b/package/batocera/core/batocera-desktopapps/scripts/filemanagerlauncher similarity index 100% rename from package/core/batocera-desktopapps/scripts/filemanagerlauncher rename to package/batocera/core/batocera-desktopapps/scripts/filemanagerlauncher diff --git a/package/core/batocera-drminfo/Config.in b/package/batocera/core/batocera-drminfo/Config.in similarity index 100% rename from package/core/batocera-drminfo/Config.in rename to package/batocera/core/batocera-drminfo/Config.in diff --git a/package/core/batocera-drminfo/batocera-drminfo.c b/package/batocera/core/batocera-drminfo/batocera-drminfo.c similarity index 100% rename from package/core/batocera-drminfo/batocera-drminfo.c rename to package/batocera/core/batocera-drminfo/batocera-drminfo.c diff --git a/package/core/batocera-drminfo/batocera-drminfo.mk b/package/batocera/core/batocera-drminfo/batocera-drminfo.mk similarity index 88% rename from package/core/batocera-drminfo/batocera-drminfo.mk rename to package/batocera/core/batocera-drminfo/batocera-drminfo.mk index 00fd7355594..bcd4ce7b099 100644 --- a/package/core/batocera-drminfo/batocera-drminfo.mk +++ b/package/batocera/core/batocera-drminfo/batocera-drminfo.mk @@ -30,7 +30,7 @@ ifeq ($(BR2_arm)$(BR2_aarch64),y) endif define BATOCERA_DRMINFO_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(TARGET_CC) -I$(STAGING_DIR)/usr/include/drm -ldrm $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-drminfo/$(BATOCERA_DRMINFO_MAIN) -o $(@D)/batocera-drminfo $(BATOCERA_DRMINFO_FLAGS) + $(TARGET_CONFIGURE_OPTS) $(TARGET_CC) -I$(STAGING_DIR)/usr/include/drm -ldrm $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-drminfo/$(BATOCERA_DRMINFO_MAIN) -o $(@D)/batocera-drminfo $(BATOCERA_DRMINFO_FLAGS) endef define BATOCERA_DRMINFO_INSTALL_TARGET_CMDS diff --git a/package/core/batocera-notice/Config.in b/package/batocera/core/batocera-notice/Config.in similarity index 100% rename from package/core/batocera-notice/Config.in rename to package/batocera/core/batocera-notice/Config.in diff --git a/package/core/batocera-notice/batocera-notice.mk b/package/batocera/core/batocera-notice/batocera-notice.mk similarity index 100% rename from package/core/batocera-notice/batocera-notice.mk rename to package/batocera/core/batocera-notice/batocera-notice.mk diff --git a/package/core/batocera-resolution/Config.in b/package/batocera/core/batocera-resolution/Config.in similarity index 100% rename from package/core/batocera-resolution/Config.in rename to package/batocera/core/batocera-resolution/Config.in diff --git a/package/core/batocera-resolution/batocera-resolution.mk b/package/batocera/core/batocera-resolution/batocera-resolution.mk similarity index 90% rename from package/core/batocera-resolution/batocera-resolution.mk rename to package/batocera/core/batocera-resolution/batocera-resolution.mk index f48d78a0095..3b0a7da26f6 100644 --- a/package/core/batocera-resolution/batocera-resolution.mk +++ b/package/batocera/core/batocera-resolution/batocera-resolution.mk @@ -8,7 +8,7 @@ BATOCERA_RESOLUTION_VERSION = 1.2 BATOCERA_RESOLUTION_LICENSE = GPL BATOCERA_RESOLUTION_DEPENDENCIES = pciutils BATOCERA_RESOLUTION_SOURCE= -BATOCERA_RESOLUTION_PATH = $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-resolution/scripts +BATOCERA_RESOLUTION_PATH = $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-resolution/scripts BATOCERA_SCRIPT_TYPE=basic @@ -32,7 +32,7 @@ endef define BATOCERA_RESOLUTION_INSTALL_XORG mkdir -p $(TARGET_DIR)/etc/X11/xorg.conf.d - cp -prn $(BR2_EXTERNAL_BATOCERA_PATH)/board/x86/fsoverlay/etc/X11/xorg.conf.d/20-amdgpu.conf $(TARGET_DIR)/etc/X11/xorg.conf.d/20-amdgpu.conf + cp -prn $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/x86/fsoverlay/etc/X11/xorg.conf.d/20-amdgpu.conf $(TARGET_DIR)/etc/X11/xorg.conf.d/20-amdgpu.conf endef define BATOCERA_RESOLUTION_INSTALL_RECORDER diff --git a/package/core/batocera-resolution/scripts/recorder/batocera-record.drm b/package/batocera/core/batocera-resolution/scripts/recorder/batocera-record.drm similarity index 100% rename from package/core/batocera-resolution/scripts/recorder/batocera-record.drm rename to package/batocera/core/batocera-resolution/scripts/recorder/batocera-record.drm diff --git a/package/core/batocera-resolution/scripts/recorder/batocera-record.wayland-sway b/package/batocera/core/batocera-resolution/scripts/recorder/batocera-record.wayland-sway similarity index 100% rename from package/core/batocera-resolution/scripts/recorder/batocera-record.wayland-sway rename to package/batocera/core/batocera-resolution/scripts/recorder/batocera-record.wayland-sway diff --git a/package/core/batocera-resolution/scripts/recorder/batocera-record.xorg b/package/batocera/core/batocera-resolution/scripts/recorder/batocera-record.xorg similarity index 100% rename from package/core/batocera-resolution/scripts/recorder/batocera-record.xorg rename to package/batocera/core/batocera-resolution/scripts/recorder/batocera-record.xorg diff --git a/package/core/batocera-resolution/scripts/resolution/batocera-resolution-post-rk3128 b/package/batocera/core/batocera-resolution/scripts/resolution/batocera-resolution-post-rk3128 similarity index 100% rename from package/core/batocera-resolution/scripts/resolution/batocera-resolution-post-rk3128 rename to package/batocera/core/batocera-resolution/scripts/resolution/batocera-resolution-post-rk3128 diff --git a/package/core/batocera-resolution/scripts/resolution/batocera-resolution.basic b/package/batocera/core/batocera-resolution/scripts/resolution/batocera-resolution.basic similarity index 100% rename from package/core/batocera-resolution/scripts/resolution/batocera-resolution.basic rename to package/batocera/core/batocera-resolution/scripts/resolution/batocera-resolution.basic diff --git a/package/core/batocera-resolution/scripts/resolution/batocera-resolution.drm b/package/batocera/core/batocera-resolution/scripts/resolution/batocera-resolution.drm similarity index 100% rename from package/core/batocera-resolution/scripts/resolution/batocera-resolution.drm rename to package/batocera/core/batocera-resolution/scripts/resolution/batocera-resolution.drm diff --git a/package/core/batocera-resolution/scripts/resolution/batocera-resolution.wayland-sway b/package/batocera/core/batocera-resolution/scripts/resolution/batocera-resolution.wayland-sway similarity index 100% rename from package/core/batocera-resolution/scripts/resolution/batocera-resolution.wayland-sway rename to package/batocera/core/batocera-resolution/scripts/resolution/batocera-resolution.wayland-sway diff --git a/package/core/batocera-resolution/scripts/resolution/batocera-resolution.xorg b/package/batocera/core/batocera-resolution/scripts/resolution/batocera-resolution.xorg similarity index 100% rename from package/core/batocera-resolution/scripts/resolution/batocera-resolution.xorg rename to package/batocera/core/batocera-resolution/scripts/resolution/batocera-resolution.xorg diff --git a/package/core/batocera-resolution/scripts/screenshot/batocera-screenshot.drm b/package/batocera/core/batocera-resolution/scripts/screenshot/batocera-screenshot.drm similarity index 100% rename from package/core/batocera-resolution/scripts/screenshot/batocera-screenshot.drm rename to package/batocera/core/batocera-resolution/scripts/screenshot/batocera-screenshot.drm diff --git a/package/core/batocera-resolution/scripts/screenshot/batocera-screenshot.wayland-sway b/package/batocera/core/batocera-resolution/scripts/screenshot/batocera-screenshot.wayland-sway similarity index 100% rename from package/core/batocera-resolution/scripts/screenshot/batocera-screenshot.wayland-sway rename to package/batocera/core/batocera-resolution/scripts/screenshot/batocera-screenshot.wayland-sway diff --git a/package/core/batocera-resolution/scripts/screenshot/batocera-screenshot.xorg b/package/batocera/core/batocera-resolution/scripts/screenshot/batocera-screenshot.xorg similarity index 100% rename from package/core/batocera-resolution/scripts/screenshot/batocera-screenshot.xorg rename to package/batocera/core/batocera-resolution/scripts/screenshot/batocera-screenshot.xorg diff --git a/package/core/batocera-scripts/Config.in b/package/batocera/core/batocera-scripts/Config.in similarity index 100% rename from package/core/batocera-scripts/Config.in rename to package/batocera/core/batocera-scripts/Config.in diff --git a/package/core/batocera-scripts/batocera-scripts.mk b/package/batocera/core/batocera-scripts/batocera-scripts.mk similarity index 98% rename from package/core/batocera-scripts/batocera-scripts.mk rename to package/batocera/core/batocera-scripts/batocera-scripts.mk index 7f8a292503c..7fb1fa4b1e0 100644 --- a/package/core/batocera-scripts/batocera-scripts.mk +++ b/package/batocera/core/batocera-scripts/batocera-scripts.mk @@ -9,7 +9,7 @@ BATOCERA_SCRIPTS_LICENSE = GPL BATOCERA_SCRIPTS_DEPENDENCIES = pciutils BATOCERA_SCRIPTS_SOURCE= -BATOCERA_SCRIPTS_PATH = $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-scripts +BATOCERA_SCRIPTS_PATH = $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-scripts # mouse type # ifeq ($(BR2_PACKAGE_REGLINUX_XWAYLAND),y) diff --git a/package/core/batocera-scripts/rules/80-switch-screen.rules b/package/batocera/core/batocera-scripts/rules/80-switch-screen.rules similarity index 100% rename from package/core/batocera-scripts/rules/80-switch-screen.rules rename to package/batocera/core/batocera-scripts/rules/80-switch-screen.rules diff --git a/package/core/batocera-scripts/scripts/batocera-amd-tdp b/package/batocera/core/batocera-scripts/scripts/batocera-amd-tdp similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-amd-tdp rename to package/batocera/core/batocera-scripts/scripts/batocera-amd-tdp diff --git a/package/core/batocera-scripts/scripts/batocera-autologin b/package/batocera/core/batocera-scripts/scripts/batocera-autologin similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-autologin rename to package/batocera/core/batocera-scripts/scripts/batocera-autologin diff --git a/package/core/batocera-scripts/scripts/batocera-bezels b/package/batocera/core/batocera-scripts/scripts/batocera-bezels similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-bezels rename to package/batocera/core/batocera-scripts/scripts/batocera-bezels diff --git a/package/core/batocera-scripts/scripts/batocera-brightness b/package/batocera/core/batocera-scripts/scripts/batocera-brightness similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-brightness rename to package/batocera/core/batocera-scripts/scripts/batocera-brightness diff --git a/package/core/batocera-scripts/scripts/batocera-cores b/package/batocera/core/batocera-scripts/scripts/batocera-cores similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-cores rename to package/batocera/core/batocera-scripts/scripts/batocera-cores diff --git a/package/core/batocera-scripts/scripts/batocera-encode b/package/batocera/core/batocera-scripts/scripts/batocera-encode similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-encode rename to package/batocera/core/batocera-scripts/scripts/batocera-encode diff --git a/package/core/batocera-scripts/scripts/batocera-es-swissknife b/package/batocera/core/batocera-scripts/scripts/batocera-es-swissknife similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-es-swissknife rename to package/batocera/core/batocera-scripts/scripts/batocera-es-swissknife diff --git a/package/core/batocera-scripts/scripts/batocera-es-thebezelproject b/package/batocera/core/batocera-scripts/scripts/batocera-es-thebezelproject similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-es-thebezelproject rename to package/batocera/core/batocera-scripts/scripts/batocera-es-thebezelproject diff --git a/package/core/batocera-scripts/scripts/batocera-gameforce b/package/batocera/core/batocera-scripts/scripts/batocera-gameforce similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-gameforce rename to package/batocera/core/batocera-scripts/scripts/batocera-gameforce diff --git a/package/core/batocera-scripts/scripts/batocera-get-nvidia-list b/package/batocera/core/batocera-scripts/scripts/batocera-get-nvidia-list similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-get-nvidia-list rename to package/batocera/core/batocera-scripts/scripts/batocera-get-nvidia-list diff --git a/package/core/batocera-scripts/scripts/batocera-ikemen b/package/batocera/core/batocera-scripts/scripts/batocera-ikemen similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-ikemen rename to package/batocera/core/batocera-scripts/scripts/batocera-ikemen diff --git a/package/core/batocera-scripts/scripts/batocera-led-effects b/package/batocera/core/batocera-scripts/scripts/batocera-led-effects similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-led-effects rename to package/batocera/core/batocera-scripts/scripts/batocera-led-effects diff --git a/package/core/batocera-scripts/scripts/batocera-mouse.wayland-sway b/package/batocera/core/batocera-scripts/scripts/batocera-mouse.wayland-sway similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-mouse.wayland-sway rename to package/batocera/core/batocera-scripts/scripts/batocera-mouse.wayland-sway diff --git a/package/core/batocera-scripts/scripts/batocera-mouse.xorg b/package/batocera/core/batocera-scripts/scripts/batocera-mouse.xorg similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-mouse.xorg rename to package/batocera/core/batocera-scripts/scripts/batocera-mouse.xorg diff --git a/package/core/batocera-scripts/scripts/batocera-overclock b/package/batocera/core/batocera-scripts/scripts/batocera-overclock similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-overclock rename to package/batocera/core/batocera-scripts/scripts/batocera-overclock diff --git a/package/core/batocera-scripts/scripts/batocera-padsinfo b/package/batocera/core/batocera-scripts/scripts/batocera-padsinfo similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-padsinfo rename to package/batocera/core/batocera-scripts/scripts/batocera-padsinfo diff --git a/package/core/batocera-scripts/scripts/batocera-planemode b/package/batocera/core/batocera-scripts/scripts/batocera-planemode similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-planemode rename to package/batocera/core/batocera-scripts/scripts/batocera-planemode diff --git a/package/core/batocera-scripts/scripts/batocera-power-mode b/package/batocera/core/batocera-scripts/scripts/batocera-power-mode similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-power-mode rename to package/batocera/core/batocera-scripts/scripts/batocera-power-mode diff --git a/package/core/batocera-scripts/scripts/batocera-rockchip-suspend b/package/batocera/core/batocera-scripts/scripts/batocera-rockchip-suspend similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-rockchip-suspend rename to package/batocera/core/batocera-scripts/scripts/batocera-rockchip-suspend diff --git a/package/core/batocera-scripts/scripts/batocera-save-overlay b/package/batocera/core/batocera-scripts/scripts/batocera-save-overlay similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-save-overlay rename to package/batocera/core/batocera-scripts/scripts/batocera-save-overlay diff --git a/package/core/batocera-scripts/scripts/batocera-spinner-calibrator b/package/batocera/core/batocera-scripts/scripts/batocera-spinner-calibrator similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-spinner-calibrator rename to package/batocera/core/batocera-scripts/scripts/batocera-spinner-calibrator diff --git a/package/core/batocera-scripts/scripts/batocera-store b/package/batocera/core/batocera-scripts/scripts/batocera-store similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-store rename to package/batocera/core/batocera-scripts/scripts/batocera-store diff --git a/package/core/batocera-scripts/scripts/batocera-streaming b/package/batocera/core/batocera-scripts/scripts/batocera-streaming similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-streaming rename to package/batocera/core/batocera-scripts/scripts/batocera-streaming diff --git a/package/core/batocera-scripts/scripts/batocera-support b/package/batocera/core/batocera-scripts/scripts/batocera-support similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-support rename to package/batocera/core/batocera-scripts/scripts/batocera-support diff --git a/package/core/batocera-scripts/scripts/batocera-switch-screen-checker b/package/batocera/core/batocera-scripts/scripts/batocera-switch-screen-checker similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-switch-screen-checker rename to package/batocera/core/batocera-scripts/scripts/batocera-switch-screen-checker diff --git a/package/core/batocera-scripts/scripts/batocera-switch-screen-checker-delayed b/package/batocera/core/batocera-scripts/scripts/batocera-switch-screen-checker-delayed similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-switch-screen-checker-delayed rename to package/batocera/core/batocera-scripts/scripts/batocera-switch-screen-checker-delayed diff --git a/package/core/batocera-scripts/scripts/batocera-sync b/package/batocera/core/batocera-scripts/scripts/batocera-sync similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-sync rename to package/batocera/core/batocera-scripts/scripts/batocera-sync diff --git a/package/core/batocera-scripts/scripts/batocera-systems b/package/batocera/core/batocera-scripts/scripts/batocera-systems similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-systems rename to package/batocera/core/batocera-scripts/scripts/batocera-systems diff --git a/package/core/batocera-scripts/scripts/batocera-timezone b/package/batocera/core/batocera-scripts/scripts/batocera-timezone similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-timezone rename to package/batocera/core/batocera-scripts/scripts/batocera-timezone diff --git a/package/core/batocera-scripts/scripts/batocera-vulkan b/package/batocera/core/batocera-scripts/scripts/batocera-vulkan similarity index 100% rename from package/core/batocera-scripts/scripts/batocera-vulkan rename to package/batocera/core/batocera-scripts/scripts/batocera-vulkan diff --git a/package/core/batocera-scripts/scripts/bluetooth/batocera-bluetooth b/package/batocera/core/batocera-scripts/scripts/bluetooth/batocera-bluetooth similarity index 100% rename from package/core/batocera-scripts/scripts/bluetooth/batocera-bluetooth rename to package/batocera/core/batocera-scripts/scripts/bluetooth/batocera-bluetooth diff --git a/package/core/batocera-scripts/scripts/bluetooth/batocera-bluetooth-agent b/package/batocera/core/batocera-scripts/scripts/bluetooth/batocera-bluetooth-agent similarity index 100% rename from package/core/batocera-scripts/scripts/bluetooth/batocera-bluetooth-agent rename to package/batocera/core/batocera-scripts/scripts/bluetooth/batocera-bluetooth-agent diff --git a/package/core/batocera-scripts/scripts/bluetooth/bluezutils.py b/package/batocera/core/batocera-scripts/scripts/bluetooth/bluezutils.py similarity index 100% rename from package/core/batocera-scripts/scripts/bluetooth/bluezutils.py rename to package/batocera/core/batocera-scripts/scripts/bluetooth/bluezutils.py diff --git a/package/core/batocera-scripts/scripts/system-config b/package/batocera/core/batocera-scripts/scripts/system-config similarity index 100% rename from package/core/batocera-scripts/scripts/system-config rename to package/batocera/core/batocera-scripts/scripts/system-config diff --git a/package/core/batocera-scripts/scripts/system-format b/package/batocera/core/batocera-scripts/scripts/system-format similarity index 100% rename from package/core/batocera-scripts/scripts/system-format rename to package/batocera/core/batocera-scripts/scripts/system-format diff --git a/package/core/batocera-scripts/scripts/system-info b/package/batocera/core/batocera-scripts/scripts/system-info similarity index 100% rename from package/core/batocera-scripts/scripts/system-info rename to package/batocera/core/batocera-scripts/scripts/system-info diff --git a/package/core/batocera-scripts/scripts/system-install b/package/batocera/core/batocera-scripts/scripts/system-install similarity index 100% rename from package/core/batocera-scripts/scripts/system-install rename to package/batocera/core/batocera-scripts/scripts/system-install diff --git a/package/core/batocera-scripts/scripts/system-mount b/package/batocera/core/batocera-scripts/scripts/system-mount similarity index 100% rename from package/core/batocera-scripts/scripts/system-mount rename to package/batocera/core/batocera-scripts/scripts/system-mount diff --git a/package/core/batocera-scripts/scripts/system-part b/package/batocera/core/batocera-scripts/scripts/system-part similarity index 100% rename from package/core/batocera-scripts/scripts/system-part rename to package/batocera/core/batocera-scripts/scripts/system-part diff --git a/package/core/batocera-scripts/scripts/system-services b/package/batocera/core/batocera-scripts/scripts/system-services similarity index 100% rename from package/core/batocera-scripts/scripts/system-services rename to package/batocera/core/batocera-scripts/scripts/system-services diff --git a/package/core/batocera-scripts/scripts/system-shutdown b/package/batocera/core/batocera-scripts/scripts/system-shutdown similarity index 100% rename from package/core/batocera-scripts/scripts/system-shutdown rename to package/batocera/core/batocera-scripts/scripts/system-shutdown diff --git a/package/core/batocera-scripts/scripts/system-upgrade b/package/batocera/core/batocera-scripts/scripts/system-upgrade similarity index 100% rename from package/core/batocera-scripts/scripts/system-upgrade rename to package/batocera/core/batocera-scripts/scripts/system-upgrade diff --git a/package/core/batocera-scripts/scripts/system-usbmount b/package/batocera/core/batocera-scripts/scripts/system-usbmount similarity index 100% rename from package/core/batocera-scripts/scripts/system-usbmount rename to package/batocera/core/batocera-scripts/scripts/system-usbmount diff --git a/package/core/batocera-scripts/scripts/system-version b/package/batocera/core/batocera-scripts/scripts/system-version similarity index 100% rename from package/core/batocera-scripts/scripts/system-version rename to package/batocera/core/batocera-scripts/scripts/system-version diff --git a/package/core/batocera-scripts/scripts/system-wifi b/package/batocera/core/batocera-scripts/scripts/system-wifi similarity index 100% rename from package/core/batocera-scripts/scripts/system-wifi rename to package/batocera/core/batocera-scripts/scripts/system-wifi diff --git a/package/core/batocera-settings/Config.in b/package/batocera/core/batocera-settings/Config.in similarity index 100% rename from package/core/batocera-settings/Config.in rename to package/batocera/core/batocera-settings/Config.in diff --git a/package/core/batocera-settings/batocera-settings.hash b/package/batocera/core/batocera-settings/batocera-settings.hash similarity index 100% rename from package/core/batocera-settings/batocera-settings.hash rename to package/batocera/core/batocera-settings/batocera-settings.hash diff --git a/package/core/batocera-settings/batocera-settings.mk b/package/batocera/core/batocera-settings/batocera-settings.mk similarity index 80% rename from package/core/batocera-settings/batocera-settings.mk rename to package/batocera/core/batocera-settings/batocera-settings.mk index 3c0599fb969..933e2b4573b 100644 --- a/package/core/batocera-settings/batocera-settings.mk +++ b/package/batocera/core/batocera-settings/batocera-settings.mk @@ -13,7 +13,7 @@ BATOCERA_SETTINGS_CONF_OPTS = \ -Dset_exe_name=system-settings-set define BATOCERA_SETTINGS_MASTER_BIN - install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-settings/system-settings-get-master $(TARGET_DIR)/usr/bin/system-settings-get-master + install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-settings/system-settings-get-master $(TARGET_DIR)/usr/bin/system-settings-get-master endef BATOCERA_SETTINGS_POST_INSTALL_TARGET_HOOKS += BATOCERA_SETTINGS_MASTER_BIN diff --git a/package/core/batocera-settings/system-settings-get-master b/package/batocera/core/batocera-settings/system-settings-get-master similarity index 100% rename from package/core/batocera-settings/system-settings-get-master rename to package/batocera/core/batocera-settings/system-settings-get-master diff --git a/package/core/batocera-system/Config.in b/package/batocera/core/batocera-system/Config.in similarity index 100% rename from package/core/batocera-system/Config.in rename to package/batocera/core/batocera-system/Config.in diff --git a/package/core/batocera-system/batocera-system.mk b/package/batocera/core/batocera-system/batocera-system.mk similarity index 87% rename from package/core/batocera-system/batocera-system.mk rename to package/batocera/core/batocera-system/batocera-system.mk index c9d51c99614..d51dff811b8 100644 --- a/package/core/batocera-system/batocera-system.mk +++ b/package/batocera/core/batocera-system/batocera-system.mk @@ -100,22 +100,22 @@ define BATOCERA_SYSTEM_INSTALL_TARGET_CMDS # datainit mkdir -p $(TARGET_DIR)/usr/share/reglinux - rsync -arv $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-system/datainit/ $(TARGET_DIR)/usr/share/reglinux/datainit/ + rsync -arv $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-system/datainit/ $(TARGET_DIR)/usr/share/reglinux/datainit/ mkdir -p $(TARGET_DIR)/usr/share/reglinux/datainit/system - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-system/system.conf \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-system/system.conf \ $(TARGET_DIR)/usr/share/reglinux/datainit/system # system-boot.conf $(INSTALL) -D -m 0644 \ - $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-system/system-boot.conf \ + $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-system/system-boot.conf \ $(BINARIES_DIR)/system-boot.conf # sysconfigs (default system.conf for boards) mkdir -p $(TARGET_DIR)/usr/share/reglinux/sysconfigs if test -d \ - $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-system/sysconfigs/${BATOCERA_SYSTEM_ARCH}; \ + $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-system/sysconfigs/${BATOCERA_SYSTEM_ARCH}; \ then cp -pr \ - $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-system/sysconfigs/${BATOCERA_SYSTEM_ARCH}/* \ + $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-system/sysconfigs/${BATOCERA_SYSTEM_ARCH}/* \ $(TARGET_DIR)/usr/share/reglinux/sysconfigs; fi # mounts @@ -123,9 +123,9 @@ define BATOCERA_SYSTEM_INSTALL_TARGET_CMDS # variables mkdir -p $(TARGET_DIR)/etc/profile.d - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-system/xdg.sh \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-system/xdg.sh \ $(TARGET_DIR)/etc/profile.d/xdg.sh - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-system/dbus.sh \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-system/dbus.sh \ $(TARGET_DIR)/etc/profile.d/dbus.sh # list of modules that doesnt like suspend diff --git a/package/core/batocera-system/datainit/bios/.keep b/package/batocera/core/batocera-system/datainit/bios/.keep similarity index 100% rename from package/core/batocera-system/datainit/bios/.keep rename to package/batocera/core/batocera-system/datainit/bios/.keep diff --git a/package/core/batocera-system/datainit/cheats/.keep b/package/batocera/core/batocera-system/datainit/cheats/.keep similarity index 100% rename from package/core/batocera-system/datainit/cheats/.keep rename to package/batocera/core/batocera-system/datainit/cheats/.keep diff --git a/package/core/batocera-system/datainit/decorations/.keep b/package/batocera/core/batocera-system/datainit/decorations/.keep similarity index 100% rename from package/core/batocera-system/datainit/decorations/.keep rename to package/batocera/core/batocera-system/datainit/decorations/.keep diff --git a/package/core/batocera-system/datainit/extractions/readme.txt b/package/batocera/core/batocera-system/datainit/extractions/readme.txt similarity index 100% rename from package/core/batocera-system/datainit/extractions/readme.txt rename to package/batocera/core/batocera-system/datainit/extractions/readme.txt diff --git a/package/core/batocera-system/datainit/music/readme.txt b/package/batocera/core/batocera-system/datainit/music/readme.txt similarity index 100% rename from package/core/batocera-system/datainit/music/readme.txt rename to package/batocera/core/batocera-system/datainit/music/readme.txt diff --git a/package/core/batocera-system/datainit/recordings/.keep b/package/batocera/core/batocera-system/datainit/recordings/.keep similarity index 100% rename from package/core/batocera-system/datainit/recordings/.keep rename to package/batocera/core/batocera-system/datainit/recordings/.keep diff --git a/package/core/batocera-system/datainit/saves/readme.txt b/package/batocera/core/batocera-system/datainit/saves/readme.txt similarity index 100% rename from package/core/batocera-system/datainit/saves/readme.txt rename to package/batocera/core/batocera-system/datainit/saves/readme.txt diff --git a/package/core/batocera-system/datainit/screenshots/readme.txt b/package/batocera/core/batocera-system/datainit/screenshots/readme.txt similarity index 100% rename from package/core/batocera-system/datainit/screenshots/readme.txt rename to package/batocera/core/batocera-system/datainit/screenshots/readme.txt diff --git a/package/core/batocera-system/datainit/system/bluetooth/.keep b/package/batocera/core/batocera-system/datainit/system/bluetooth/.keep similarity index 100% rename from package/core/batocera-system/datainit/system/bluetooth/.keep rename to package/batocera/core/batocera-system/datainit/system/bluetooth/.keep diff --git a/package/core/batocera-system/datainit/system/configs/.keep b/package/batocera/core/batocera-system/datainit/system/configs/.keep similarity index 100% rename from package/core/batocera-system/datainit/system/configs/.keep rename to package/batocera/core/batocera-system/datainit/system/configs/.keep diff --git a/package/core/batocera-system/datainit/system/iptables.conf b/package/batocera/core/batocera-system/datainit/system/iptables.conf similarity index 100% rename from package/core/batocera-system/datainit/system/iptables.conf rename to package/batocera/core/batocera-system/datainit/system/iptables.conf diff --git a/package/core/batocera-system/datainit/system/logs/.keep b/package/batocera/core/batocera-system/datainit/system/logs/.keep similarity index 100% rename from package/core/batocera-system/datainit/system/logs/.keep rename to package/batocera/core/batocera-system/datainit/system/logs/.keep diff --git a/package/core/batocera-system/datainit/system/pacman/.keep b/package/batocera/core/batocera-system/datainit/system/pacman/.keep similarity index 100% rename from package/core/batocera-system/datainit/system/pacman/.keep rename to package/batocera/core/batocera-system/datainit/system/pacman/.keep diff --git a/package/core/batocera-system/datainit/system/scripts/template-game-start-stop.txt b/package/batocera/core/batocera-system/datainit/system/scripts/template-game-start-stop.txt similarity index 100% rename from package/core/batocera-system/datainit/system/scripts/template-game-start-stop.txt rename to package/batocera/core/batocera-system/datainit/system/scripts/template-game-start-stop.txt diff --git a/package/core/batocera-system/datainit/system/services/.keep b/package/batocera/core/batocera-system/datainit/system/services/.keep similarity index 100% rename from package/core/batocera-system/datainit/system/services/.keep rename to package/batocera/core/batocera-system/datainit/system/services/.keep diff --git a/package/core/batocera-system/datainit/system/ssh/.keep b/package/batocera/core/batocera-system/datainit/system/ssh/.keep similarity index 100% rename from package/core/batocera-system/datainit/system/ssh/.keep rename to package/batocera/core/batocera-system/datainit/system/ssh/.keep diff --git a/package/core/batocera-system/datainit/system/template-custom.txt b/package/batocera/core/batocera-system/datainit/system/template-custom.txt similarity index 100% rename from package/core/batocera-system/datainit/system/template-custom.txt rename to package/batocera/core/batocera-system/datainit/system/template-custom.txt diff --git a/package/core/batocera-system/datainit/themes/.keep b/package/batocera/core/batocera-system/datainit/themes/.keep similarity index 100% rename from package/core/batocera-system/datainit/themes/.keep rename to package/batocera/core/batocera-system/datainit/themes/.keep diff --git a/package/core/batocera-system/dbus.sh b/package/batocera/core/batocera-system/dbus.sh similarity index 100% rename from package/core/batocera-system/dbus.sh rename to package/batocera/core/batocera-system/dbus.sh diff --git a/package/core/batocera-system/sysconfigs/bcm2711/system.conf.Raspberry_Pi_4_Model_B_Rev_1_1 b/package/batocera/core/batocera-system/sysconfigs/bcm2711/system.conf.Raspberry_Pi_4_Model_B_Rev_1_1 similarity index 100% rename from package/core/batocera-system/sysconfigs/bcm2711/system.conf.Raspberry_Pi_4_Model_B_Rev_1_1 rename to package/batocera/core/batocera-system/sysconfigs/bcm2711/system.conf.Raspberry_Pi_4_Model_B_Rev_1_1 diff --git a/package/core/batocera-system/sysconfigs/bcm2711/system.conf.Raspberry_Pi_4_Model_B_Rev_1_2 b/package/batocera/core/batocera-system/sysconfigs/bcm2711/system.conf.Raspberry_Pi_4_Model_B_Rev_1_2 similarity index 100% rename from package/core/batocera-system/sysconfigs/bcm2711/system.conf.Raspberry_Pi_4_Model_B_Rev_1_2 rename to package/batocera/core/batocera-system/sysconfigs/bcm2711/system.conf.Raspberry_Pi_4_Model_B_Rev_1_2 diff --git a/package/core/batocera-system/sysconfigs/bcm2711/system.conf.Raspberry_Pi_4_Model_B_Rev_1_4 b/package/batocera/core/batocera-system/sysconfigs/bcm2711/system.conf.Raspberry_Pi_4_Model_B_Rev_1_4 similarity index 100% rename from package/core/batocera-system/sysconfigs/bcm2711/system.conf.Raspberry_Pi_4_Model_B_Rev_1_4 rename to package/batocera/core/batocera-system/sysconfigs/bcm2711/system.conf.Raspberry_Pi_4_Model_B_Rev_1_4 diff --git a/package/core/batocera-system/sysconfigs/bcm2712/system.conf.Raspberry_Pi_5_Model_B_Rev_1_0 b/package/batocera/core/batocera-system/sysconfigs/bcm2712/system.conf.Raspberry_Pi_5_Model_B_Rev_1_0 similarity index 100% rename from package/core/batocera-system/sysconfigs/bcm2712/system.conf.Raspberry_Pi_5_Model_B_Rev_1_0 rename to package/batocera/core/batocera-system/sysconfigs/bcm2712/system.conf.Raspberry_Pi_5_Model_B_Rev_1_0 diff --git a/package/core/batocera-system/sysconfigs/bcm2837/system.conf.Raspberry_Pi_3_Model_B_Plus_Rev_1_3 b/package/batocera/core/batocera-system/sysconfigs/bcm2837/system.conf.Raspberry_Pi_3_Model_B_Plus_Rev_1_3 similarity index 100% rename from package/core/batocera-system/sysconfigs/bcm2837/system.conf.Raspberry_Pi_3_Model_B_Plus_Rev_1_3 rename to package/batocera/core/batocera-system/sysconfigs/bcm2837/system.conf.Raspberry_Pi_3_Model_B_Plus_Rev_1_3 diff --git a/package/core/batocera-system/sysconfigs/bcm2837/system.conf.Raspberry_Pi_Zero_2_W_Rev_1_0 b/package/batocera/core/batocera-system/sysconfigs/bcm2837/system.conf.Raspberry_Pi_Zero_2_W_Rev_1_0 similarity index 100% rename from package/core/batocera-system/sysconfigs/bcm2837/system.conf.Raspberry_Pi_Zero_2_W_Rev_1_0 rename to package/batocera/core/batocera-system/sysconfigs/bcm2837/system.conf.Raspberry_Pi_Zero_2_W_Rev_1_0 diff --git a/package/core/batocera-system/sysconfigs/h3/system.conf.Banana_Pi_BPI-M2-Zero b/package/batocera/core/batocera-system/sysconfigs/h3/system.conf.Banana_Pi_BPI-M2-Zero similarity index 100% rename from package/core/batocera-system/sysconfigs/h3/system.conf.Banana_Pi_BPI-M2-Zero rename to package/batocera/core/batocera-system/sysconfigs/h3/system.conf.Banana_Pi_BPI-M2-Zero diff --git a/package/core/batocera-system/sysconfigs/h3/system.conf.Capcom_Home_Arcade b/package/batocera/core/batocera-system/sysconfigs/h3/system.conf.Capcom_Home_Arcade similarity index 100% rename from package/core/batocera-system/sysconfigs/h3/system.conf.Capcom_Home_Arcade rename to package/batocera/core/batocera-system/sysconfigs/h3/system.conf.Capcom_Home_Arcade diff --git a/package/core/batocera-system/sysconfigs/h3/system.conf.Xunlong_Orange_Pi_One b/package/batocera/core/batocera-system/sysconfigs/h3/system.conf.Xunlong_Orange_Pi_One similarity index 100% rename from package/core/batocera-system/sysconfigs/h3/system.conf.Xunlong_Orange_Pi_One rename to package/batocera/core/batocera-system/sysconfigs/h3/system.conf.Xunlong_Orange_Pi_One diff --git a/package/core/batocera-system/sysconfigs/h3/system.conf.Xunlong_Orange_Pi_PC b/package/batocera/core/batocera-system/sysconfigs/h3/system.conf.Xunlong_Orange_Pi_PC similarity index 100% rename from package/core/batocera-system/sysconfigs/h3/system.conf.Xunlong_Orange_Pi_PC rename to package/batocera/core/batocera-system/sysconfigs/h3/system.conf.Xunlong_Orange_Pi_PC diff --git a/package/core/batocera-system/sysconfigs/h3/system.conf.Xunlong_Orange_Pi_PC_Plus b/package/batocera/core/batocera-system/sysconfigs/h3/system.conf.Xunlong_Orange_Pi_PC_Plus similarity index 100% rename from package/core/batocera-system/sysconfigs/h3/system.conf.Xunlong_Orange_Pi_PC_Plus rename to package/batocera/core/batocera-system/sysconfigs/h3/system.conf.Xunlong_Orange_Pi_PC_Plus diff --git a/package/core/batocera-system/sysconfigs/h3/system.conf.Xunlong_Orange_Pi_Plus_2E b/package/batocera/core/batocera-system/sysconfigs/h3/system.conf.Xunlong_Orange_Pi_Plus_2E similarity index 100% rename from package/core/batocera-system/sysconfigs/h3/system.conf.Xunlong_Orange_Pi_Plus_2E rename to package/batocera/core/batocera-system/sysconfigs/h3/system.conf.Xunlong_Orange_Pi_Plus_2E diff --git a/package/core/batocera-system/sysconfigs/h616/system.conf.OrangePi_Zero3 b/package/batocera/core/batocera-system/sysconfigs/h616/system.conf.OrangePi_Zero3 similarity index 100% rename from package/core/batocera-system/sysconfigs/h616/system.conf.OrangePi_Zero3 rename to package/batocera/core/batocera-system/sysconfigs/h616/system.conf.OrangePi_Zero3 diff --git a/package/core/batocera-system/sysconfigs/riscv/system.conf.StarFive_VisionFive_V2 b/package/batocera/core/batocera-system/sysconfigs/riscv/system.conf.StarFive_VisionFive_V2 similarity index 100% rename from package/core/batocera-system/sysconfigs/riscv/system.conf.StarFive_VisionFive_V2 rename to package/batocera/core/batocera-system/sysconfigs/riscv/system.conf.StarFive_VisionFive_V2 diff --git a/package/core/batocera-system/sysconfigs/rk3326/system.conf.Anbernic_RG351M b/package/batocera/core/batocera-system/sysconfigs/rk3326/system.conf.Anbernic_RG351M similarity index 100% rename from package/core/batocera-system/sysconfigs/rk3326/system.conf.Anbernic_RG351M rename to package/batocera/core/batocera-system/sysconfigs/rk3326/system.conf.Anbernic_RG351M diff --git a/package/core/batocera-system/sysconfigs/rk3326/system.conf.Anbernic_RG351P b/package/batocera/core/batocera-system/sysconfigs/rk3326/system.conf.Anbernic_RG351P similarity index 100% rename from package/core/batocera-system/sysconfigs/rk3326/system.conf.Anbernic_RG351P rename to package/batocera/core/batocera-system/sysconfigs/rk3326/system.conf.Anbernic_RG351P diff --git a/package/core/batocera-system/sysconfigs/rk3326/system.conf.Golden_GameForce b/package/batocera/core/batocera-system/sysconfigs/rk3326/system.conf.Golden_GameForce similarity index 100% rename from package/core/batocera-system/sysconfigs/rk3326/system.conf.Golden_GameForce rename to package/batocera/core/batocera-system/sysconfigs/rk3326/system.conf.Golden_GameForce diff --git a/package/core/batocera-system/sysconfigs/rk3326/system.conf.ODROID_GO_Advance b/package/batocera/core/batocera-system/sysconfigs/rk3326/system.conf.ODROID_GO_Advance similarity index 100% rename from package/core/batocera-system/sysconfigs/rk3326/system.conf.ODROID_GO_Advance rename to package/batocera/core/batocera-system/sysconfigs/rk3326/system.conf.ODROID_GO_Advance diff --git a/package/core/batocera-system/sysconfigs/rk3326/system.conf.ODROID_GO_Advance_Black_Edition b/package/batocera/core/batocera-system/sysconfigs/rk3326/system.conf.ODROID_GO_Advance_Black_Edition similarity index 100% rename from package/core/batocera-system/sysconfigs/rk3326/system.conf.ODROID_GO_Advance_Black_Edition rename to package/batocera/core/batocera-system/sysconfigs/rk3326/system.conf.ODROID_GO_Advance_Black_Edition diff --git a/package/core/batocera-system/sysconfigs/rk3326/system.conf.ODROID_GO_Super b/package/batocera/core/batocera-system/sysconfigs/rk3326/system.conf.ODROID_GO_Super similarity index 100% rename from package/core/batocera-system/sysconfigs/rk3326/system.conf.ODROID_GO_Super rename to package/batocera/core/batocera-system/sysconfigs/rk3326/system.conf.ODROID_GO_Super diff --git a/package/core/batocera-system/sysconfigs/rk3328/system.conf.Pine64_Rock64 b/package/batocera/core/batocera-system/sysconfigs/rk3328/system.conf.Pine64_Rock64 similarity index 100% rename from package/core/batocera-system/sysconfigs/rk3328/system.conf.Pine64_Rock64 rename to package/batocera/core/batocera-system/sysconfigs/rk3328/system.conf.Pine64_Rock64 diff --git a/package/core/batocera-system/sysconfigs/rk3399/system.conf.Anbernic_RG552 b/package/batocera/core/batocera-system/sysconfigs/rk3399/system.conf.Anbernic_RG552 similarity index 100% rename from package/core/batocera-system/sysconfigs/rk3399/system.conf.Anbernic_RG552 rename to package/batocera/core/batocera-system/sysconfigs/rk3399/system.conf.Anbernic_RG552 diff --git a/package/core/batocera-system/sysconfigs/rk3399/system.conf.OrangePi_800 b/package/batocera/core/batocera-system/sysconfigs/rk3399/system.conf.OrangePi_800 similarity index 100% rename from package/core/batocera-system/sysconfigs/rk3399/system.conf.OrangePi_800 rename to package/batocera/core/batocera-system/sysconfigs/rk3399/system.conf.OrangePi_800 diff --git a/package/core/batocera-system/sysconfigs/rk3399/system.conf.Pine64_RockPro64_v2_1 b/package/batocera/core/batocera-system/sysconfigs/rk3399/system.conf.Pine64_RockPro64_v2_1 similarity index 100% rename from package/core/batocera-system/sysconfigs/rk3399/system.conf.Pine64_RockPro64_v2_1 rename to package/batocera/core/batocera-system/sysconfigs/rk3399/system.conf.Pine64_RockPro64_v2_1 diff --git a/package/core/batocera-system/sysconfigs/rk3399/system.conf.Radxa_ROCK_Pi_4B b/package/batocera/core/batocera-system/sysconfigs/rk3399/system.conf.Radxa_ROCK_Pi_4B similarity index 100% rename from package/core/batocera-system/sysconfigs/rk3399/system.conf.Radxa_ROCK_Pi_4B rename to package/batocera/core/batocera-system/sysconfigs/rk3399/system.conf.Radxa_ROCK_Pi_4B diff --git a/package/core/batocera-system/sysconfigs/rk3568/system.conf.RG353P b/package/batocera/core/batocera-system/sysconfigs/rk3568/system.conf.RG353P similarity index 100% rename from package/core/batocera-system/sysconfigs/rk3568/system.conf.RG353P rename to package/batocera/core/batocera-system/sysconfigs/rk3568/system.conf.RG353P diff --git a/package/core/batocera-system/sysconfigs/rk3568/system.conf.RG353V b/package/batocera/core/batocera-system/sysconfigs/rk3568/system.conf.RG353V similarity index 100% rename from package/core/batocera-system/sysconfigs/rk3568/system.conf.RG353V rename to package/batocera/core/batocera-system/sysconfigs/rk3568/system.conf.RG353V diff --git a/package/core/batocera-system/sysconfigs/rk3568/system.conf.RG503 b/package/batocera/core/batocera-system/sysconfigs/rk3568/system.conf.RG503 similarity index 100% rename from package/core/batocera-system/sysconfigs/rk3568/system.conf.RG503 rename to package/batocera/core/batocera-system/sysconfigs/rk3568/system.conf.RG503 diff --git a/package/core/batocera-system/sysconfigs/rk3588/system.conf.9tripod_rk3588s_Board b/package/batocera/core/batocera-system/sysconfigs/rk3588/system.conf.9tripod_rk3588s_Board similarity index 100% rename from package/core/batocera-system/sysconfigs/rk3588/system.conf.9tripod_rk3588s_Board rename to package/batocera/core/batocera-system/sysconfigs/rk3588/system.conf.9tripod_rk3588s_Board diff --git a/package/core/batocera-system/sysconfigs/rk3588/system.conf.GameForce_ACE b/package/batocera/core/batocera-system/sysconfigs/rk3588/system.conf.GameForce_ACE similarity index 100% rename from package/core/batocera-system/sysconfigs/rk3588/system.conf.GameForce_ACE rename to package/batocera/core/batocera-system/sysconfigs/rk3588/system.conf.GameForce_ACE diff --git a/package/core/batocera-system/sysconfigs/rk3588/system.conf.Orange_Pi_5 b/package/batocera/core/batocera-system/sysconfigs/rk3588/system.conf.Orange_Pi_5 similarity index 100% rename from package/core/batocera-system/sysconfigs/rk3588/system.conf.Orange_Pi_5 rename to package/batocera/core/batocera-system/sysconfigs/rk3588/system.conf.Orange_Pi_5 diff --git a/package/core/batocera-system/sysconfigs/rk3588/system.conf.Radxa_ROCK_5B b/package/batocera/core/batocera-system/sysconfigs/rk3588/system.conf.Radxa_ROCK_5B similarity index 100% rename from package/core/batocera-system/sysconfigs/rk3588/system.conf.Radxa_ROCK_5B rename to package/batocera/core/batocera-system/sysconfigs/rk3588/system.conf.Radxa_ROCK_5B diff --git a/package/core/batocera-system/sysconfigs/s922x/system.conf.Hardkernel_ODROID_GO_Ultra b/package/batocera/core/batocera-system/sysconfigs/s922x/system.conf.Hardkernel_ODROID_GO_Ultra similarity index 100% rename from package/core/batocera-system/sysconfigs/s922x/system.conf.Hardkernel_ODROID_GO_Ultra rename to package/batocera/core/batocera-system/sysconfigs/s922x/system.conf.Hardkernel_ODROID_GO_Ultra diff --git a/package/core/batocera-system/sysconfigs/x86_64-v3 b/package/batocera/core/batocera-system/sysconfigs/x86_64-v3 similarity index 100% rename from package/core/batocera-system/sysconfigs/x86_64-v3 rename to package/batocera/core/batocera-system/sysconfigs/x86_64-v3 diff --git a/package/core/batocera-system/sysconfigs/x86_64/system.conf.83E1 b/package/batocera/core/batocera-system/sysconfigs/x86_64/system.conf.83E1 similarity index 100% rename from package/core/batocera-system/sysconfigs/x86_64/system.conf.83E1 rename to package/batocera/core/batocera-system/sysconfigs/x86_64/system.conf.83E1 diff --git a/package/core/batocera-system/sysconfigs/x86_64/system.conf.AIR_Plus b/package/batocera/core/batocera-system/sysconfigs/x86_64/system.conf.AIR_Plus similarity index 100% rename from package/core/batocera-system/sysconfigs/x86_64/system.conf.AIR_Plus rename to package/batocera/core/batocera-system/sysconfigs/x86_64/system.conf.AIR_Plus diff --git a/package/core/batocera-system/sysconfigs/x86_64/system.conf.AYANEO_2S b/package/batocera/core/batocera-system/sysconfigs/x86_64/system.conf.AYANEO_2S similarity index 100% rename from package/core/batocera-system/sysconfigs/x86_64/system.conf.AYANEO_2S rename to package/batocera/core/batocera-system/sysconfigs/x86_64/system.conf.AYANEO_2S diff --git a/package/core/batocera-system/sysconfigs/x86_64/system.conf.Galileo b/package/batocera/core/batocera-system/sysconfigs/x86_64/system.conf.Galileo similarity index 100% rename from package/core/batocera-system/sysconfigs/x86_64/system.conf.Galileo rename to package/batocera/core/batocera-system/sysconfigs/x86_64/system.conf.Galileo diff --git a/package/core/batocera-system/sysconfigs/x86_64/system.conf.Jupiter b/package/batocera/core/batocera-system/sysconfigs/x86_64/system.conf.Jupiter similarity index 100% rename from package/core/batocera-system/sysconfigs/x86_64/system.conf.Jupiter rename to package/batocera/core/batocera-system/sysconfigs/x86_64/system.conf.Jupiter diff --git a/package/core/batocera-system/sysconfigs/x86_64/system.conf.Loki_MiniPro b/package/batocera/core/batocera-system/sysconfigs/x86_64/system.conf.Loki_MiniPro similarity index 100% rename from package/core/batocera-system/sysconfigs/x86_64/system.conf.Loki_MiniPro rename to package/batocera/core/batocera-system/sysconfigs/x86_64/system.conf.Loki_MiniPro diff --git a/package/core/batocera-system/sysconfigs/x86_64/system.conf.Loki_Zero b/package/batocera/core/batocera-system/sysconfigs/x86_64/system.conf.Loki_Zero similarity index 100% rename from package/core/batocera-system/sysconfigs/x86_64/system.conf.Loki_Zero rename to package/batocera/core/batocera-system/sysconfigs/x86_64/system.conf.Loki_Zero diff --git a/package/core/batocera-system/sysconfigs/x86_64/system.conf.RC71L b/package/batocera/core/batocera-system/sysconfigs/x86_64/system.conf.RC71L similarity index 100% rename from package/core/batocera-system/sysconfigs/x86_64/system.conf.RC71L rename to package/batocera/core/batocera-system/sysconfigs/x86_64/system.conf.RC71L diff --git a/package/core/batocera-system/system-boot.conf b/package/batocera/core/batocera-system/system-boot.conf similarity index 100% rename from package/core/batocera-system/system-boot.conf rename to package/batocera/core/batocera-system/system-boot.conf diff --git a/package/core/batocera-system/system.conf b/package/batocera/core/batocera-system/system.conf similarity index 100% rename from package/core/batocera-system/system.conf rename to package/batocera/core/batocera-system/system.conf diff --git a/package/core/batocera-system/xdg.sh b/package/batocera/core/batocera-system/xdg.sh similarity index 100% rename from package/core/batocera-system/xdg.sh rename to package/batocera/core/batocera-system/xdg.sh diff --git a/package/core/batocera-triggerhappy/Config.in b/package/batocera/core/batocera-triggerhappy/Config.in similarity index 100% rename from package/core/batocera-triggerhappy/Config.in rename to package/batocera/core/batocera-triggerhappy/Config.in diff --git a/package/core/batocera-triggerhappy/batocera-triggerhappy.mk b/package/batocera/core/batocera-triggerhappy/batocera-triggerhappy.mk similarity index 58% rename from package/core/batocera-triggerhappy/batocera-triggerhappy.mk rename to package/batocera/core/batocera-triggerhappy/batocera-triggerhappy.mk index 54bbc04e98b..b62d45af084 100644 --- a/package/core/batocera-triggerhappy/batocera-triggerhappy.mk +++ b/package/batocera/core/batocera-triggerhappy/batocera-triggerhappy.mk @@ -12,25 +12,25 @@ BATOCERA_TRIGGERHAPPY_SOURCE= define BATOCERA_TRIGGERHAPPY_INSTALL_CONFIG mkdir -p $(TARGET_DIR)/etc/triggerhappy/triggers.d mkdir -p $(TARGET_DIR)/etc/init.d - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-triggerhappy/conf/multimedia_keys.conf $(TARGET_DIR)/etc/triggerhappy/triggers.d - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-triggerhappy/conf/multimedia_keys_disabled.conf $(TARGET_DIR)/etc/triggerhappy/triggers.d - install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-triggerhappy/triggerhappy.service $(TARGET_DIR)/etc/init.d/S50triggerhappy + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-triggerhappy/conf/multimedia_keys.conf $(TARGET_DIR)/etc/triggerhappy/triggers.d + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-triggerhappy/conf/multimedia_keys_disabled.conf $(TARGET_DIR)/etc/triggerhappy/triggers.d + install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-triggerhappy/triggerhappy.service $(TARGET_DIR)/etc/init.d/S50triggerhappy endef define BATOCERA_TRIGGERHAPPY_INSTALL_RK3326_CONFIG - cp -v $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-triggerhappy/conf/rk3326/*.conf $(TARGET_DIR)/etc/triggerhappy/triggers.d/ + cp -v $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-triggerhappy/conf/rk3326/*.conf $(TARGET_DIR)/etc/triggerhappy/triggers.d/ endef define BATOCERA_TRIGGERHAPPY_INSTALL_RK3399_CONFIG - cp -v $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-triggerhappy/conf/rk3399/*.conf $(TARGET_DIR)/etc/triggerhappy/triggers.d/ + cp -v $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-triggerhappy/conf/rk3399/*.conf $(TARGET_DIR)/etc/triggerhappy/triggers.d/ endef define BATOCERA_TRIGGERHAPPY_INSTALL_RK3128_CONFIG - cp -v $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-triggerhappy/conf/rk3128/*.conf $(TARGET_DIR)/etc/triggerhappy/triggers.d/ + cp -v $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-triggerhappy/conf/rk3128/*.conf $(TARGET_DIR)/etc/triggerhappy/triggers.d/ endef define BATOCERA_TRIGGERHAPPY_INSTALL_X86_64_CONFIG - cp -v $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-triggerhappy/conf/x86_64/*.conf $(TARGET_DIR)/etc/triggerhappy/triggers.d/ + cp -v $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-triggerhappy/conf/x86_64/*.conf $(TARGET_DIR)/etc/triggerhappy/triggers.d/ endef BATOCERA_TRIGGERHAPPY_POST_INSTALL_TARGET_HOOKS += BATOCERA_TRIGGERHAPPY_INSTALL_CONFIG diff --git a/package/core/batocera-triggerhappy/conf/multimedia_keys.conf b/package/batocera/core/batocera-triggerhappy/conf/multimedia_keys.conf similarity index 100% rename from package/core/batocera-triggerhappy/conf/multimedia_keys.conf rename to package/batocera/core/batocera-triggerhappy/conf/multimedia_keys.conf diff --git a/package/core/batocera-triggerhappy/conf/multimedia_keys_disabled.conf b/package/batocera/core/batocera-triggerhappy/conf/multimedia_keys_disabled.conf similarity index 100% rename from package/core/batocera-triggerhappy/conf/multimedia_keys_disabled.conf rename to package/batocera/core/batocera-triggerhappy/conf/multimedia_keys_disabled.conf diff --git a/package/core/batocera-triggerhappy/conf/rk3128/multimedia_keys_GameSimulatorBoard.conf b/package/batocera/core/batocera-triggerhappy/conf/rk3128/multimedia_keys_GameSimulatorBoard.conf similarity index 100% rename from package/core/batocera-triggerhappy/conf/rk3128/multimedia_keys_GameSimulatorBoard.conf rename to package/batocera/core/batocera-triggerhappy/conf/rk3128/multimedia_keys_GameSimulatorBoard.conf diff --git a/package/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_AnbernicRG351M.conf b/package/batocera/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_AnbernicRG351M.conf similarity index 100% rename from package/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_AnbernicRG351M.conf rename to package/batocera/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_AnbernicRG351M.conf diff --git a/package/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_AnbernicRG351P.conf b/package/batocera/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_AnbernicRG351P.conf similarity index 100% rename from package/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_AnbernicRG351P.conf rename to package/batocera/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_AnbernicRG351P.conf diff --git a/package/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_GameForceChi.conf b/package/batocera/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_GameForceChi.conf similarity index 100% rename from package/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_GameForceChi.conf rename to package/batocera/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_GameForceChi.conf diff --git a/package/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_GoldenGameForce.conf b/package/batocera/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_GoldenGameForce.conf similarity index 100% rename from package/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_GoldenGameForce.conf rename to package/batocera/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_GoldenGameForce.conf diff --git a/package/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_HardkernelODROIDGO2.conf b/package/batocera/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_HardkernelODROIDGO2.conf similarity index 100% rename from package/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_HardkernelODROIDGO2.conf rename to package/batocera/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_HardkernelODROIDGO2.conf diff --git a/package/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_HardkernelODROIDGO3.conf b/package/batocera/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_HardkernelODROIDGO3.conf similarity index 100% rename from package/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_HardkernelODROIDGO3.conf rename to package/batocera/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_HardkernelODROIDGO3.conf diff --git a/package/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_ODROIDGOAdvance.conf b/package/batocera/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_ODROIDGOAdvance.conf similarity index 100% rename from package/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_ODROIDGOAdvance.conf rename to package/batocera/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_ODROIDGOAdvance.conf diff --git a/package/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_ODROIDGOAdvanceBlackEdition.conf b/package/batocera/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_ODROIDGOAdvanceBlackEdition.conf similarity index 100% rename from package/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_ODROIDGOAdvanceBlackEdition.conf rename to package/batocera/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_ODROIDGOAdvanceBlackEdition.conf diff --git a/package/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_ODROIDGOSuper.conf b/package/batocera/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_ODROIDGOSuper.conf similarity index 100% rename from package/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_ODROIDGOSuper.conf rename to package/batocera/core/batocera-triggerhappy/conf/rk3326/multimedia_keys_ODROIDGOSuper.conf diff --git a/package/core/batocera-triggerhappy/conf/rk3399/multimedia_keys.conf b/package/batocera/core/batocera-triggerhappy/conf/rk3399/multimedia_keys.conf similarity index 100% rename from package/core/batocera-triggerhappy/conf/rk3399/multimedia_keys.conf rename to package/batocera/core/batocera-triggerhappy/conf/rk3399/multimedia_keys.conf diff --git a/package/core/batocera-triggerhappy/conf/rk3399/multimedia_keys_disabled.conf b/package/batocera/core/batocera-triggerhappy/conf/rk3399/multimedia_keys_disabled.conf similarity index 100% rename from package/core/batocera-triggerhappy/conf/rk3399/multimedia_keys_disabled.conf rename to package/batocera/core/batocera-triggerhappy/conf/rk3399/multimedia_keys_disabled.conf diff --git a/package/core/batocera-triggerhappy/conf/x86_64/multimedia_keys_Jupiter.conf b/package/batocera/core/batocera-triggerhappy/conf/x86_64/multimedia_keys_Jupiter.conf similarity index 100% rename from package/core/batocera-triggerhappy/conf/x86_64/multimedia_keys_Jupiter.conf rename to package/batocera/core/batocera-triggerhappy/conf/x86_64/multimedia_keys_Jupiter.conf diff --git a/package/core/batocera-triggerhappy/triggerhappy.service b/package/batocera/core/batocera-triggerhappy/triggerhappy.service similarity index 100% rename from package/core/batocera-triggerhappy/triggerhappy.service rename to package/batocera/core/batocera-triggerhappy/triggerhappy.service diff --git a/package/core/batocera-udev-rules/Config.in b/package/batocera/core/batocera-udev-rules/Config.in similarity index 100% rename from package/core/batocera-udev-rules/Config.in rename to package/batocera/core/batocera-udev-rules/Config.in diff --git a/package/core/batocera-udev-rules/S15virtualevents b/package/batocera/core/batocera-udev-rules/S15virtualevents similarity index 100% rename from package/core/batocera-udev-rules/S15virtualevents rename to package/batocera/core/batocera-udev-rules/S15virtualevents diff --git a/package/core/batocera-udev-rules/batocera-udev-rules.mk b/package/batocera/core/batocera-udev-rules/batocera-udev-rules.mk similarity index 65% rename from package/core/batocera-udev-rules/batocera-udev-rules.mk rename to package/batocera/core/batocera-udev-rules/batocera-udev-rules.mk index 0404d4a2585..5d7c85c4262 100644 --- a/package/core/batocera-udev-rules/batocera-udev-rules.mk +++ b/package/batocera/core/batocera-udev-rules/batocera-udev-rules.mk @@ -11,11 +11,11 @@ BATOCERA_UDEV_RULES_SOURCE= define BATOCERA_UDEV_RULES_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/etc/udev/rules.d mkdir -p $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-udev-rules/rules/*.rules $(TARGET_DIR)/etc/udev/rules.d/ - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-udev-rules/S15virtualevents $(TARGET_DIR)/etc/init.d/ + $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-udev-rules/rules/*.rules $(TARGET_DIR)/etc/udev/rules.d/ + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-udev-rules/S15virtualevents $(TARGET_DIR)/etc/init.d/ mkdir -p $(TARGET_DIR)/etc/usb_modeswitch.d - #$(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/core/batocera-udev-rules/usb_modeswitch.d/* $(TARGET_DIR)/etc/usb_modeswitch.d/ + #$(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-udev-rules/usb_modeswitch.d/* $(TARGET_DIR)/etc/usb_modeswitch.d/ # generate this file cause windows doesn't support file with ':' in git easyly (echo "# Logitech G920 Racing Wheel"; echo "DefaultVendor=046d"; echo "DefaultProduct=c261"; echo "MessageEndpoint=01"; echo "ResponseEndpoint=01"; echo "TargetClass=0x03"; echo 'MessageContent="0f00010142"') > $(TARGET_DIR)/etc/usb_modeswitch.d/046d:c261 diff --git a/package/core/batocera-udev-rules/rules/40-rtl8821cu.rules b/package/batocera/core/batocera-udev-rules/rules/40-rtl8821cu.rules similarity index 100% rename from package/core/batocera-udev-rules/rules/40-rtl8821cu.rules rename to package/batocera/core/batocera-udev-rules/rules/40-rtl8821cu.rules diff --git a/package/core/batocera-udev-rules/rules/71-rfkill.rules b/package/batocera/core/batocera-udev-rules/rules/71-rfkill.rules similarity index 100% rename from package/core/batocera-udev-rules/rules/71-rfkill.rules rename to package/batocera/core/batocera-udev-rules/rules/71-rfkill.rules diff --git a/package/core/batocera-udev-rules/rules/98-keyboards-exotics.rules b/package/batocera/core/batocera-udev-rules/rules/98-keyboards-exotics.rules similarity index 100% rename from package/core/batocera-udev-rules/rules/98-keyboards-exotics.rules rename to package/batocera/core/batocera-udev-rules/rules/98-keyboards-exotics.rules diff --git a/package/core/batocera-udev-rules/rules/99-atariclassic.rules b/package/batocera/core/batocera-udev-rules/rules/99-atariclassic.rules similarity index 100% rename from package/core/batocera-udev-rules/rules/99-atariclassic.rules rename to package/batocera/core/batocera-udev-rules/rules/99-atariclassic.rules diff --git a/package/core/batocera-udev-rules/rules/99-joysticks-exotics.rules b/package/batocera/core/batocera-udev-rules/rules/99-joysticks-exotics.rules similarity index 100% rename from package/core/batocera-udev-rules/rules/99-joysticks-exotics.rules rename to package/batocera/core/batocera-udev-rules/rules/99-joysticks-exotics.rules diff --git a/package/core/batocera-udev-rules/rules/99-n64adapter.rules b/package/batocera/core/batocera-udev-rules/rules/99-n64adapter.rules similarity index 100% rename from package/core/batocera-udev-rules/rules/99-n64adapter.rules rename to package/batocera/core/batocera-udev-rules/rules/99-n64adapter.rules diff --git a/package/core/batocera-udev-rules/rules/99-pedals.rules b/package/batocera/core/batocera-udev-rules/rules/99-pedals.rules similarity index 100% rename from package/core/batocera-udev-rules/rules/99-pedals.rules rename to package/batocera/core/batocera-udev-rules/rules/99-pedals.rules diff --git a/package/core/batocera-udev-rules/rules/99-stadia-controller.rules b/package/batocera/core/batocera-udev-rules/rules/99-stadia-controller.rules similarity index 100% rename from package/core/batocera-udev-rules/rules/99-stadia-controller.rules rename to package/batocera/core/batocera-udev-rules/rules/99-stadia-controller.rules diff --git a/package/core/batocera-udev-rules/rules/99-steam-controller.rules b/package/batocera/core/batocera-udev-rules/rules/99-steam-controller.rules similarity index 100% rename from package/core/batocera-udev-rules/rules/99-steam-controller.rules rename to package/batocera/core/batocera-udev-rules/rules/99-steam-controller.rules diff --git a/package/core/batocera-udev-rules/rules/99-wheels.rules b/package/batocera/core/batocera-udev-rules/rules/99-wheels.rules similarity index 100% rename from package/core/batocera-udev-rules/rules/99-wheels.rules rename to package/batocera/core/batocera-udev-rules/rules/99-wheels.rules diff --git a/package/database/influxdb/Config.in b/package/batocera/database/influxdb/Config.in similarity index 100% rename from package/database/influxdb/Config.in rename to package/batocera/database/influxdb/Config.in diff --git a/package/database/influxdb/influxdb.mk b/package/batocera/database/influxdb/influxdb.mk similarity index 100% rename from package/database/influxdb/influxdb.mk rename to package/batocera/database/influxdb/influxdb.mk diff --git a/package/emulationstation/README.md b/package/batocera/emulationstation/README.md similarity index 66% rename from package/emulationstation/README.md rename to package/batocera/emulationstation/README.md index 296f780d7eb..99d4bd52c48 100644 --- a/package/emulationstation/README.md +++ b/package/batocera/emulationstation/README.md @@ -1,5 +1,5 @@ ## Directory navigation - - `batocera-emulationstation` Build configuration and patches for [batocera-emulationstation](https://github.com/batocera-linux/batocera-emulationstation). Also contains [All the controller presets that ES automatically recognizes](https://github.com/batocera-linux/batocera.linux/blob/master/package/emulationstation/batocera-emulationstation/controllers/es_input.cfg) in [controllers](https://github.com/batocera-linux/batocera.linux/tree/master/package/emulationstation/batocera-emulationstation/controllers). + - `batocera-emulationstation` Build configuration and patches for [batocera-emulationstation](https://github.com/batocera-linux/batocera-emulationstation). Also contains [All the controller presets that ES automatically recognizes](https://github.com/batocera-linux/batocera.linux/blob/master/package/batocera/emulationstation/batocera-emulationstation/controllers/es_input.cfg) in [controllers](https://github.com/batocera-linux/batocera.linux/tree/master/package/batocera/emulationstation/batocera-emulationstation/controllers). - `batocera-es-system` Includes the YMLs which are used to generate `es_features.cfg`, `es_systems.cfg`, `es_settings.cfg`, etc. - `es-theme-carbon` Build configuration for Batocera's default theme, [Carbon](https://github.com/fabricecaruso/es-theme-carbon). diff --git a/package/emulationstation/batocera-emulationstation/Config.in b/package/batocera/emulationstation/batocera-emulationstation/Config.in similarity index 100% rename from package/emulationstation/batocera-emulationstation/Config.in rename to package/batocera/emulationstation/batocera-emulationstation/Config.in diff --git a/package/emulationstation/batocera-emulationstation/S31emulationstation b/package/batocera/emulationstation/batocera-emulationstation/S31emulationstation similarity index 100% rename from package/emulationstation/batocera-emulationstation/S31emulationstation rename to package/batocera/emulationstation/batocera-emulationstation/S31emulationstation diff --git a/package/emulationstation/batocera-emulationstation/batocera-emulationstation-battery-event.patch b/package/batocera/emulationstation/batocera-emulationstation/batocera-emulationstation-battery-event.patch similarity index 100% rename from package/emulationstation/batocera-emulationstation/batocera-emulationstation-battery-event.patch rename to package/batocera/emulationstation/batocera-emulationstation/batocera-emulationstation-battery-event.patch diff --git a/package/emulationstation/batocera-emulationstation/batocera-emulationstation-config-event-codes.patch b/package/batocera/emulationstation/batocera-emulationstation/batocera-emulationstation-config-event-codes.patch similarity index 100% rename from package/emulationstation/batocera-emulationstation/batocera-emulationstation-config-event-codes.patch rename to package/batocera/emulationstation/batocera-emulationstation/batocera-emulationstation-config-event-codes.patch diff --git a/package/emulationstation/batocera-emulationstation/batocera-emulationstation.mk b/package/batocera/emulationstation/batocera-emulationstation/batocera-emulationstation.mk similarity index 98% rename from package/emulationstation/batocera-emulationstation/batocera-emulationstation.mk rename to package/batocera/emulationstation/batocera-emulationstation/batocera-emulationstation.mk index 75b28f3899a..584bd95ebc0 100644 --- a/package/emulationstation/batocera-emulationstation/batocera-emulationstation.mk +++ b/package/batocera/emulationstation/batocera-emulationstation/batocera-emulationstation.mk @@ -64,7 +64,7 @@ endif BATOCERA_EMULATIONSTATION_CONF_OPTS += -DBATOCERA=ON BATOCERA_EMULATIONSTATION_SOURCE_PATH = \ - $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulationstation/batocera-emulationstation + $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulationstation/batocera-emulationstation BATOCERA_EMULATIONSTATION_KEY_SCREENSCRAPER_DEV_LOGIN=\ $(shell grep -E '^SCREENSCRAPER_DEV_LOGIN=' \ diff --git a/package/emulationstation/batocera-emulationstation/batocera-preupdate-gamelists-hook b/package/batocera/emulationstation/batocera-emulationstation/batocera-preupdate-gamelists-hook similarity index 100% rename from package/emulationstation/batocera-emulationstation/batocera-preupdate-gamelists-hook rename to package/batocera/emulationstation/batocera-emulationstation/batocera-preupdate-gamelists-hook diff --git a/package/emulationstation/batocera-emulationstation/controllers/es_input.cfg b/package/batocera/emulationstation/batocera-emulationstation/controllers/es_input.cfg similarity index 100% rename from package/emulationstation/batocera-emulationstation/controllers/es_input.cfg rename to package/batocera/emulationstation/batocera-emulationstation/controllers/es_input.cfg diff --git a/package/emulationstation/batocera-emulationstation/emulationstation-standalone b/package/batocera/emulationstation/batocera-emulationstation/emulationstation-standalone similarity index 100% rename from package/emulationstation/batocera-emulationstation/emulationstation-standalone rename to package/batocera/emulationstation/batocera-emulationstation/emulationstation-standalone diff --git a/package/emulationstation/batocera-emulationstation/keys.txt.sample b/package/batocera/emulationstation/batocera-emulationstation/keys.txt.sample similarity index 100% rename from package/emulationstation/batocera-emulationstation/keys.txt.sample rename to package/batocera/emulationstation/batocera-emulationstation/keys.txt.sample diff --git a/package/emulationstation/batocera-emulationstation/wayland/sway/04-sway.sh b/package/batocera/emulationstation/batocera-emulationstation/wayland/sway/04-sway.sh similarity index 100% rename from package/emulationstation/batocera-emulationstation/wayland/sway/04-sway.sh rename to package/batocera/emulationstation/batocera-emulationstation/wayland/sway/04-sway.sh diff --git a/package/emulationstation/batocera-emulationstation/wayland/sway/config b/package/batocera/emulationstation/batocera-emulationstation/wayland/sway/config similarity index 100% rename from package/emulationstation/batocera-emulationstation/wayland/sway/config rename to package/batocera/emulationstation/batocera-emulationstation/wayland/sway/config diff --git a/package/emulationstation/batocera-emulationstation/wayland/sway/sway-launch b/package/batocera/emulationstation/batocera-emulationstation/wayland/sway/sway-launch similarity index 100% rename from package/emulationstation/batocera-emulationstation/wayland/sway/sway-launch rename to package/batocera/emulationstation/batocera-emulationstation/wayland/sway/sway-launch diff --git a/package/emulationstation/batocera-emulationstation/xorg/xinitrc b/package/batocera/emulationstation/batocera-emulationstation/xorg/xinitrc similarity index 100% rename from package/emulationstation/batocera-emulationstation/xorg/xinitrc rename to package/batocera/emulationstation/batocera-emulationstation/xorg/xinitrc diff --git a/package/emulationstation/batocera-es-system/Config.in b/package/batocera/emulationstation/batocera-es-system/Config.in similarity index 100% rename from package/emulationstation/batocera-es-system/Config.in rename to package/batocera/emulationstation/batocera-es-system/Config.in diff --git a/package/batocera/emulationstation/batocera-es-system/README.md b/package/batocera/emulationstation/batocera-es-system/README.md new file mode 100644 index 00000000000..84262e313e8 --- /dev/null +++ b/package/batocera/emulationstation/batocera-es-system/README.md @@ -0,0 +1,43 @@ +## Directory navigation + + - `batocera-es-system.py` The Python script which generates `es_features.cfg` and `es_systems.cfg` based on the `es_features.yml` and `es_systems.yml` YML files. + - `es_systems.yml` The systems that ES recognizes and shows on the system list when the user has installed the appropriate ROMs. Contains some metadata about the system, such as full name and manufacture date. This is the file you'd want to edit if you want to put a comment in the generated roms//_info.txt file. + - `es_features.yml` The configuration file EmulationStation uses to show which options are available for each system (in “features”). Also includes the advanced per-system settings (in “cfeatures” as their own unique entries). Used in conjunction with the [config generators](https://github.com/batocera-linux/batocera.linux/tree/master/package/batocera/core/batocera-configgen/configgen/configgen/generators) to define new options. The user may override this with a custom file. + - `roms` REG-Linux's pre-bundled ROMs, and other necessary files for the ROMs directory. Follow the links to know more and support their authors. + + | ⌨ | ***Atari 2600*** | | | + | :---: | :---: | :--- | :--- | + | ☆ | ![Amoeba Jump](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/batocera/emulationstation/batocera-es-system/roms/atari2600/images/Amoeba-Jump-marquee.png) | Author: Dionoid | https://atariage.com/forums/topic/280211-amoeba-jump/ | + | | | | | + | ⌨ | ***Commodore 64*** | | | + | ☆ | ![Relentless 64](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/batocera/emulationstation/batocera-es-system/roms/c64/images/Relentless64-marquee.png) | Authors: Paul 'Axelay' Kooistra; Harris 'rexbeng' Kladis; Pierre 'Cyborgjeff' Martin | https://rgcddev.itch.io/relentless-64 | + | ★ | ![Showdown](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/batocera/emulationstation/batocera-es-system/roms/c64/images/Showdown-marquee.png) | Author: Henning Ludvigsen | https://www.badgerpunch.com/title/showdown/ | + | | | | | + | ⌨ | ***Game Boy Advance*** | | | + | ★ | ![Anguna - Warriors of Virtue](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/batocera/emulationstation/batocera-es-system/roms/gba/images/Anguna-marquee.png) | Author: Bite The Chili | http://www.tolberts.net/anguna/ | + | | | | | + | ⌨ | ***Game Boy Color*** | | | + | ☆ | ![Petris](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/batocera/emulationstation/batocera-es-system/roms/gbc/images/Petris-marquee.png) | Author: bbbbbr | https://bbbbbr.itch.io/petris | + | | | | | + | ⌨ | ***Master System*** | | | + | ☆ | ![Mai Nurse](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/batocera/emulationstation/batocera-es-system/roms/mastersystem/images/Mai-Nurse-marquee.png) | Author: lunoka | https://lunoka.itch.io/mai-nurse | + | | | | | + | ⌨ | ***Mega Drive / Genesis*** | | | + | ★ | ![Hayato's Journey](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/batocera/emulationstation/batocera-es-system/roms/megadrive/images/Hayato-Journey-marquee.png) | Author: Master Linkuei | https://master-linkuei.itch.io/hayatos-journey | + | ☆ | ![Old Towers](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/batocera/emulationstation/batocera-es-system/roms/megadrive/images/Old-Towers-marquee.png) | Author: Denis Grachev | https://retrosouls.itch.io/old-towers | + | | | | | + | ⌨ | ***Nintendo Entertainment System*** | | | + | ☆ | ![Alter Ego](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/batocera/emulationstation/batocera-es-system/roms/nes/images/Alter-Ego-marquee.png) | Author: Shiru | https://shiru.untergrund.net/ | + | | | | | + | ⌨ | ***Super Nintendo Entertainment System*** | | | + | ★ | ![Dottie Flowers](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/batocera/emulationstation/batocera-es-system/roms/snes/images/Dottie-Flowers-marquee.png) | Author: Goldlocke | https://goldlocke.itch.io/dottie-flowers | + | ☆ | ![Super Boss Gaiden](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/batocera/emulationstation/batocera-es-system/roms/snes/images/Super-Boss-Gaiden-marquee.png) | Authors: Dieter von Laser; Chrono Moogle | https://superbossgaiden.superfamicom.org/ | + | | | | | + | ⌨ | ***PC Engine*** | | | + | ★ | ![Dinoforce](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/batocera/emulationstation/batocera-es-system/roms/pcengine/images/Dinoforce-marquee.png) | Author: PCE Works | https://dinoforce.pceworks.net/ | + | | | | | + | ⌨ | ***Ports*** | | | + | ☆ | ![DOOM (shareware)](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/batocera/emulationstation/batocera-es-system/roms/prboom/images/doom1_shareware-marquee.png) | Author: id Software | https://prboom.sourceforge.net/ | + | ☆ | ![MrBoom](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/batocera/emulationstation/batocera-es-system/roms/mrboom/images/MrBoom-marquee.png) | Author: Remdy Software | https://github.com/Javanaise/mrboom-libretro | + | ★ | ![OD Commander](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/batocera/emulationstation/batocera-es-system/roms/odcommander/images/od-commander-marquee.png) | Author: glebm | https://github.com/od-contrib/commander | + | ☆ | ![SDLPoP](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/batocera/emulationstation/batocera-es-system/roms/sdlpop/images/sdlpop-marquee.png) | Author: NagyD | https://github.com/NagyD/SDLPoP | diff --git a/package/emulationstation/batocera-es-system/batocera-es-system.mk b/package/batocera/emulationstation/batocera-es-system/batocera-es-system.mk similarity index 53% rename from package/emulationstation/batocera-es-system/batocera-es-system.mk rename to package/batocera/emulationstation/batocera-es-system/batocera-es-system.mk index 8be12302c71..0fc1ecb3b8f 100644 --- a/package/emulationstation/batocera-es-system/batocera-es-system.mk +++ b/package/batocera/emulationstation/batocera-es-system/batocera-es-system.mk @@ -10,33 +10,33 @@ BATOCERA_ES_SYSTEM_VERSION=1.03 define BATOCERA_ES_SYSTEM_BUILD_CMDS $(HOST_DIR)/bin/python \ - $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulationstation/batocera-es-system/batocera-es-system.py \ - $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulationstation/batocera-es-system/es_systems.yml \ - $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulationstation/batocera-es-system/es_features.yml \ + $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulationstation/batocera-es-system/batocera-es-system.py \ + $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulationstation/batocera-es-system/es_systems.yml \ + $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulationstation/batocera-es-system/es_features.yml \ $(@D)/es_external_translations.h \ $(@D)/es_keys_translations.h \ - $(BR2_EXTERNAL_BATOCERA_PATH)/package \ - $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulationstation/batocera-es-system/locales/blacklisted-words.txt \ + $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera \ + $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulationstation/batocera-es-system/locales/blacklisted-words.txt \ $(CONFIG_DIR)/.config \ $(@D)/es_systems.cfg \ $(@D)/es_features.cfg \ $(STAGING_DIR)/usr/share/reglinux/configgen/configgen-defaults.yml \ $(STAGING_DIR)/usr/share/reglinux/configgen/configgen-defaults-arch.yml \ - $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulationstation/batocera-es-system/roms \ + $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulationstation/batocera-es-system/roms \ $(@D)/roms $(BATOCERA_SYSTEM_ARCH) # translations - mkdir -p $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulationstation/batocera-es-system/locales - (echo "$(@D)/es_external_translations.h"; echo "$(@D)/es_keys_translations.h") | xgettext --language=C --add-comments=TRANSLATION -f - -o $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulationstation/batocera-es-system/locales/batocera-es-system.pot --no-location --keyword=_ + mkdir -p $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulationstation/batocera-es-system/locales + (echo "$(@D)/es_external_translations.h"; echo "$(@D)/es_keys_translations.h") | xgettext --language=C --add-comments=TRANSLATION -f - -o $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulationstation/batocera-es-system/locales/batocera-es-system.pot --no-location --keyword=_ # remove the pot creation date always changing - sed -i '/^"POT-Creation-Date: /d' $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulationstation/batocera-es-system/locales/batocera-es-system.pot + sed -i '/^"POT-Creation-Date: /d' $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulationstation/batocera-es-system/locales/batocera-es-system.pot - for PO in $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulationstation/batocera-es-system/locales/*/batocera-es-system.po; do (msgmerge -U --no-fuzzy-matching $${PO} $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulationstation/batocera-es-system/locales/batocera-es-system.pot && printf "%s " $$(basename $$(dirname $${PO})) && LANG=C msgfmt -o /dev/null $${PO} --statistics) || exit 1; done + for PO in $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulationstation/batocera-es-system/locales/*/batocera-es-system.po; do (msgmerge -U --no-fuzzy-matching $${PO} $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulationstation/batocera-es-system/locales/batocera-es-system.pot && printf "%s " $$(basename $$(dirname $${PO})) && LANG=C msgfmt -o /dev/null $${PO} --statistics) || exit 1; done # install staging mkdir -p $(STAGING_DIR)/usr/share/batocera-es-system/locales cp $(@D)/es_external_translations.h $(STAGING_DIR)/usr/share/batocera-es-system/ cp $(@D)/es_keys_translations.h $(STAGING_DIR)/usr/share/batocera-es-system/ - cp -pr $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulationstation/batocera-es-system/locales $(STAGING_DIR)/usr/share/batocera-es-system + cp -pr $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulationstation/batocera-es-system/locales $(STAGING_DIR)/usr/share/batocera-es-system endef define BATOCERA_ES_SYSTEM_INSTALL_TARGET_CMDS diff --git a/package/emulationstation/batocera-es-system/batocera-es-system.py b/package/batocera/emulationstation/batocera-es-system/batocera-es-system.py similarity index 100% rename from package/emulationstation/batocera-es-system/batocera-es-system.py rename to package/batocera/emulationstation/batocera-es-system/batocera-es-system.py diff --git a/package/emulationstation/batocera-es-system/batocera-report-system.py b/package/batocera/emulationstation/batocera-es-system/batocera-report-system.py similarity index 100% rename from package/emulationstation/batocera-es-system/batocera-report-system.py rename to package/batocera/emulationstation/batocera-es-system/batocera-report-system.py diff --git a/package/emulationstation/batocera-es-system/batocera_systemsReport.html b/package/batocera/emulationstation/batocera-es-system/batocera_systemsReport.html similarity index 100% rename from package/emulationstation/batocera-es-system/batocera_systemsReport.html rename to package/batocera/emulationstation/batocera-es-system/batocera_systemsReport.html diff --git a/package/emulationstation/batocera-es-system/es_features.yml b/package/batocera/emulationstation/batocera-es-system/es_features.yml similarity index 100% rename from package/emulationstation/batocera-es-system/es_features.yml rename to package/batocera/emulationstation/batocera-es-system/es_features.yml diff --git a/package/emulationstation/batocera-es-system/es_systems.yml b/package/batocera/emulationstation/batocera-es-system/es_systems.yml similarity index 100% rename from package/emulationstation/batocera-es-system/es_systems.yml rename to package/batocera/emulationstation/batocera-es-system/es_systems.yml diff --git a/package/emulationstation/batocera-es-system/locales/ar/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/ar/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/ar/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/ar/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/batocera-es-system.pot b/package/batocera/emulationstation/batocera-es-system/locales/batocera-es-system.pot similarity index 100% rename from package/emulationstation/batocera-es-system/locales/batocera-es-system.pot rename to package/batocera/emulationstation/batocera-es-system/locales/batocera-es-system.pot diff --git a/package/emulationstation/batocera-es-system/locales/blacklisted-words.txt b/package/batocera/emulationstation/batocera-es-system/locales/blacklisted-words.txt similarity index 100% rename from package/emulationstation/batocera-es-system/locales/blacklisted-words.txt rename to package/batocera/emulationstation/batocera-es-system/locales/blacklisted-words.txt diff --git a/package/emulationstation/batocera-es-system/locales/ca/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/ca/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/ca/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/ca/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/cs_CZ/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/cs_CZ/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/cs_CZ/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/cs_CZ/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/de/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/de/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/de/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/de/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/en_GB/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/en_GB/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/en_GB/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/en_GB/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/es/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/es/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/es/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/es/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/eu_ES/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/eu_ES/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/eu_ES/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/eu_ES/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/fi_FI/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/fi_FI/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/fi_FI/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/fi_FI/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/fr/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/fr/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/fr/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/fr/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/gl_ES/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/gl_ES/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/gl_ES/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/gl_ES/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/hu/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/hu/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/hu/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/hu/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/id_ID/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/id_ID/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/id_ID/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/id_ID/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/it/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/it/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/it/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/it/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/ja_JP/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/ja_JP/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/ja_JP/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/ja_JP/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/ko/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/ko/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/ko/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/ko/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/nb_NO/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/nb_NO/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/nb_NO/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/nb_NO/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/nl/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/nl/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/nl/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/nl/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/pl/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/pl/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/pl/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/pl/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/pt_BR/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/pt_BR/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/pt_BR/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/pt_BR/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/pt_PT/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/pt_PT/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/pt_PT/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/pt_PT/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/ro_RO/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/ro_RO/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/ro_RO/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/ro_RO/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/ru_RU/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/ru_RU/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/ru_RU/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/ru_RU/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/sk_SK/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/sk_SK/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/sk_SK/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/sk_SK/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/sv_SE/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/sv_SE/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/sv_SE/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/sv_SE/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/tr/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/tr/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/tr/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/tr/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/uk_UA/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/uk_UA/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/uk_UA/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/uk_UA/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/vi_VN/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/vi_VN/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/vi_VN/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/vi_VN/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/zh_CN/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/zh_CN/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/zh_CN/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/zh_CN/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/locales/zh_TW/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/zh_TW/batocera-es-system.po similarity index 100% rename from package/emulationstation/batocera-es-system/locales/zh_TW/batocera-es-system.po rename to package/batocera/emulationstation/batocera-es-system/locales/zh_TW/batocera-es-system.po diff --git a/package/emulationstation/batocera-es-system/pygun/audio/gun.mp3 b/package/batocera/emulationstation/batocera-es-system/pygun/audio/gun.mp3 similarity index 100% rename from package/emulationstation/batocera-es-system/pygun/audio/gun.mp3 rename to package/batocera/emulationstation/batocera-es-system/pygun/audio/gun.mp3 diff --git a/package/emulationstation/batocera-es-system/pygun/audio/reload0.mp3 b/package/batocera/emulationstation/batocera-es-system/pygun/audio/reload0.mp3 similarity index 100% rename from package/emulationstation/batocera-es-system/pygun/audio/reload0.mp3 rename to package/batocera/emulationstation/batocera-es-system/pygun/audio/reload0.mp3 diff --git a/package/emulationstation/batocera-es-system/pygun/audio/reload1.mp3 b/package/batocera/emulationstation/batocera-es-system/pygun/audio/reload1.mp3 similarity index 100% rename from package/emulationstation/batocera-es-system/pygun/audio/reload1.mp3 rename to package/batocera/emulationstation/batocera-es-system/pygun/audio/reload1.mp3 diff --git a/package/emulationstation/batocera-es-system/pygun/images/readme.txt b/package/batocera/emulationstation/batocera-es-system/pygun/images/readme.txt similarity index 100% rename from package/emulationstation/batocera-es-system/pygun/images/readme.txt rename to package/batocera/emulationstation/batocera-es-system/pygun/images/readme.txt diff --git a/package/emulationstation/batocera-es-system/pygun/pygun.pygame b/package/batocera/emulationstation/batocera-es-system/pygun/pygun.pygame similarity index 100% rename from package/emulationstation/batocera-es-system/pygun/pygun.pygame rename to package/batocera/emulationstation/batocera-es-system/pygun/pygun.pygame diff --git a/package/emulationstation/batocera-es-system/pygun/pygun.pygame.keys b/package/batocera/emulationstation/batocera-es-system/pygun/pygun.pygame.keys similarity index 100% rename from package/emulationstation/batocera-es-system/pygun/pygun.pygame.keys rename to package/batocera/emulationstation/batocera-es-system/pygun/pygun.pygame.keys diff --git a/package/emulationstation/batocera-es-system/roms/atari2600/Amoeba Jump v1.3 NTSC.bin b/package/batocera/emulationstation/batocera-es-system/roms/atari2600/Amoeba Jump v1.3 NTSC.bin similarity index 100% rename from package/emulationstation/batocera-es-system/roms/atari2600/Amoeba Jump v1.3 NTSC.bin rename to package/batocera/emulationstation/batocera-es-system/roms/atari2600/Amoeba Jump v1.3 NTSC.bin diff --git a/package/emulationstation/batocera-es-system/roms/atari2600/gamelist.xml b/package/batocera/emulationstation/batocera-es-system/roms/atari2600/gamelist.xml similarity index 100% rename from package/emulationstation/batocera-es-system/roms/atari2600/gamelist.xml rename to package/batocera/emulationstation/batocera-es-system/roms/atari2600/gamelist.xml diff --git a/package/emulationstation/batocera-es-system/roms/atari2600/images/Amoeba-Jump-image.png b/package/batocera/emulationstation/batocera-es-system/roms/atari2600/images/Amoeba-Jump-image.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/atari2600/images/Amoeba-Jump-image.png rename to package/batocera/emulationstation/batocera-es-system/roms/atari2600/images/Amoeba-Jump-image.png diff --git a/package/emulationstation/batocera-es-system/roms/atari2600/images/Amoeba-Jump-marquee.png b/package/batocera/emulationstation/batocera-es-system/roms/atari2600/images/Amoeba-Jump-marquee.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/atari2600/images/Amoeba-Jump-marquee.png rename to package/batocera/emulationstation/batocera-es-system/roms/atari2600/images/Amoeba-Jump-marquee.png diff --git a/package/emulationstation/batocera-es-system/roms/atari2600/images/Amoeba-Jump-thumb.png b/package/batocera/emulationstation/batocera-es-system/roms/atari2600/images/Amoeba-Jump-thumb.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/atari2600/images/Amoeba-Jump-thumb.png rename to package/batocera/emulationstation/batocera-es-system/roms/atari2600/images/Amoeba-Jump-thumb.png diff --git a/package/emulationstation/batocera-es-system/roms/atari2600/videos/Amoeba.Jump-video.mp4 b/package/batocera/emulationstation/batocera-es-system/roms/atari2600/videos/Amoeba.Jump-video.mp4 similarity index 100% rename from package/emulationstation/batocera-es-system/roms/atari2600/videos/Amoeba.Jump-video.mp4 rename to package/batocera/emulationstation/batocera-es-system/roms/atari2600/videos/Amoeba.Jump-video.mp4 diff --git a/package/emulationstation/batocera-es-system/roms/c64/Relentless64.d64 b/package/batocera/emulationstation/batocera-es-system/roms/c64/Relentless64.d64 similarity index 100% rename from package/emulationstation/batocera-es-system/roms/c64/Relentless64.d64 rename to package/batocera/emulationstation/batocera-es-system/roms/c64/Relentless64.d64 diff --git a/package/emulationstation/batocera-es-system/roms/c64/Showdown.d64 b/package/batocera/emulationstation/batocera-es-system/roms/c64/Showdown.d64 similarity index 100% rename from package/emulationstation/batocera-es-system/roms/c64/Showdown.d64 rename to package/batocera/emulationstation/batocera-es-system/roms/c64/Showdown.d64 diff --git a/package/emulationstation/batocera-es-system/roms/c64/gamelist.xml b/package/batocera/emulationstation/batocera-es-system/roms/c64/gamelist.xml similarity index 100% rename from package/emulationstation/batocera-es-system/roms/c64/gamelist.xml rename to package/batocera/emulationstation/batocera-es-system/roms/c64/gamelist.xml diff --git a/package/emulationstation/batocera-es-system/roms/c64/images/Relentless64-image.png b/package/batocera/emulationstation/batocera-es-system/roms/c64/images/Relentless64-image.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/c64/images/Relentless64-image.png rename to package/batocera/emulationstation/batocera-es-system/roms/c64/images/Relentless64-image.png diff --git a/package/emulationstation/batocera-es-system/roms/c64/images/Relentless64-marquee.png b/package/batocera/emulationstation/batocera-es-system/roms/c64/images/Relentless64-marquee.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/c64/images/Relentless64-marquee.png rename to package/batocera/emulationstation/batocera-es-system/roms/c64/images/Relentless64-marquee.png diff --git a/package/emulationstation/batocera-es-system/roms/c64/images/Relentless64-thumb.png b/package/batocera/emulationstation/batocera-es-system/roms/c64/images/Relentless64-thumb.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/c64/images/Relentless64-thumb.png rename to package/batocera/emulationstation/batocera-es-system/roms/c64/images/Relentless64-thumb.png diff --git a/package/emulationstation/batocera-es-system/roms/c64/images/Showdown-image.png b/package/batocera/emulationstation/batocera-es-system/roms/c64/images/Showdown-image.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/c64/images/Showdown-image.png rename to package/batocera/emulationstation/batocera-es-system/roms/c64/images/Showdown-image.png diff --git a/package/emulationstation/batocera-es-system/roms/c64/images/Showdown-marquee.png b/package/batocera/emulationstation/batocera-es-system/roms/c64/images/Showdown-marquee.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/c64/images/Showdown-marquee.png rename to package/batocera/emulationstation/batocera-es-system/roms/c64/images/Showdown-marquee.png diff --git a/package/emulationstation/batocera-es-system/roms/c64/images/Showdown-thumb.png b/package/batocera/emulationstation/batocera-es-system/roms/c64/images/Showdown-thumb.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/c64/images/Showdown-thumb.png rename to package/batocera/emulationstation/batocera-es-system/roms/c64/images/Showdown-thumb.png diff --git a/package/emulationstation/batocera-es-system/roms/c64/videos/Relentless64-video.mp4 b/package/batocera/emulationstation/batocera-es-system/roms/c64/videos/Relentless64-video.mp4 similarity index 100% rename from package/emulationstation/batocera-es-system/roms/c64/videos/Relentless64-video.mp4 rename to package/batocera/emulationstation/batocera-es-system/roms/c64/videos/Relentless64-video.mp4 diff --git a/package/emulationstation/batocera-es-system/roms/c64/videos/Showdown-video.mp4 b/package/batocera/emulationstation/batocera-es-system/roms/c64/videos/Showdown-video.mp4 similarity index 100% rename from package/emulationstation/batocera-es-system/roms/c64/videos/Showdown-video.mp4 rename to package/batocera/emulationstation/batocera-es-system/roms/c64/videos/Showdown-video.mp4 diff --git a/package/emulationstation/batocera-es-system/roms/cannonball/Cannonball.cannonball.disabled b/package/batocera/emulationstation/batocera-es-system/roms/cannonball/Cannonball.cannonball.disabled similarity index 100% rename from package/emulationstation/batocera-es-system/roms/cannonball/Cannonball.cannonball.disabled rename to package/batocera/emulationstation/batocera-es-system/roms/cannonball/Cannonball.cannonball.disabled diff --git a/package/emulationstation/batocera-es-system/roms/cannonball/gamelist.xml b/package/batocera/emulationstation/batocera-es-system/roms/cannonball/gamelist.xml similarity index 100% rename from package/emulationstation/batocera-es-system/roms/cannonball/gamelist.xml rename to package/batocera/emulationstation/batocera-es-system/roms/cannonball/gamelist.xml diff --git a/package/emulationstation/batocera-es-system/roms/cannonball/images/Cannonball-image.png b/package/batocera/emulationstation/batocera-es-system/roms/cannonball/images/Cannonball-image.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/cannonball/images/Cannonball-image.png rename to package/batocera/emulationstation/batocera-es-system/roms/cannonball/images/Cannonball-image.png diff --git a/package/emulationstation/batocera-es-system/roms/cannonball/images/Cannonball-marquee.png b/package/batocera/emulationstation/batocera-es-system/roms/cannonball/images/Cannonball-marquee.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/cannonball/images/Cannonball-marquee.png rename to package/batocera/emulationstation/batocera-es-system/roms/cannonball/images/Cannonball-marquee.png diff --git a/package/emulationstation/batocera-es-system/roms/cannonball/images/Cannonball-thumb.png b/package/batocera/emulationstation/batocera-es-system/roms/cannonball/images/Cannonball-thumb.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/cannonball/images/Cannonball-thumb.png rename to package/batocera/emulationstation/batocera-es-system/roms/cannonball/images/Cannonball-thumb.png diff --git a/package/emulationstation/batocera-es-system/roms/cannonball/videos/Cannonball-video.mp4 b/package/batocera/emulationstation/batocera-es-system/roms/cannonball/videos/Cannonball-video.mp4 similarity index 100% rename from package/emulationstation/batocera-es-system/roms/cannonball/videos/Cannonball-video.mp4 rename to package/batocera/emulationstation/batocera-es-system/roms/cannonball/videos/Cannonball-video.mp4 diff --git a/package/emulationstation/batocera-es-system/roms/devilutionx/gamelist.xml b/package/batocera/emulationstation/batocera-es-system/roms/devilutionx/gamelist.xml similarity index 100% rename from package/emulationstation/batocera-es-system/roms/devilutionx/gamelist.xml rename to package/batocera/emulationstation/batocera-es-system/roms/devilutionx/gamelist.xml diff --git a/package/emulationstation/batocera-es-system/roms/devilutionx/images/devilutionx-image.png b/package/batocera/emulationstation/batocera-es-system/roms/devilutionx/images/devilutionx-image.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/devilutionx/images/devilutionx-image.png rename to package/batocera/emulationstation/batocera-es-system/roms/devilutionx/images/devilutionx-image.png diff --git a/package/emulationstation/batocera-es-system/roms/gba/Anguna.gba b/package/batocera/emulationstation/batocera-es-system/roms/gba/Anguna.gba similarity index 100% rename from package/emulationstation/batocera-es-system/roms/gba/Anguna.gba rename to package/batocera/emulationstation/batocera-es-system/roms/gba/Anguna.gba diff --git a/package/emulationstation/batocera-es-system/roms/gba/gamelist.xml b/package/batocera/emulationstation/batocera-es-system/roms/gba/gamelist.xml similarity index 100% rename from package/emulationstation/batocera-es-system/roms/gba/gamelist.xml rename to package/batocera/emulationstation/batocera-es-system/roms/gba/gamelist.xml diff --git a/package/emulationstation/batocera-es-system/roms/gba/images/Anguna-image.png b/package/batocera/emulationstation/batocera-es-system/roms/gba/images/Anguna-image.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/gba/images/Anguna-image.png rename to package/batocera/emulationstation/batocera-es-system/roms/gba/images/Anguna-image.png diff --git a/package/emulationstation/batocera-es-system/roms/gba/images/Anguna-marquee.png b/package/batocera/emulationstation/batocera-es-system/roms/gba/images/Anguna-marquee.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/gba/images/Anguna-marquee.png rename to package/batocera/emulationstation/batocera-es-system/roms/gba/images/Anguna-marquee.png diff --git a/package/emulationstation/batocera-es-system/roms/gba/images/Anguna-thumb.png b/package/batocera/emulationstation/batocera-es-system/roms/gba/images/Anguna-thumb.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/gba/images/Anguna-thumb.png rename to package/batocera/emulationstation/batocera-es-system/roms/gba/images/Anguna-thumb.png diff --git a/package/emulationstation/batocera-es-system/roms/gba/videos/Anguna-video.mp4 b/package/batocera/emulationstation/batocera-es-system/roms/gba/videos/Anguna-video.mp4 similarity index 100% rename from package/emulationstation/batocera-es-system/roms/gba/videos/Anguna-video.mp4 rename to package/batocera/emulationstation/batocera-es-system/roms/gba/videos/Anguna-video.mp4 diff --git a/package/emulationstation/batocera-es-system/roms/gbc/Petris.gbc b/package/batocera/emulationstation/batocera-es-system/roms/gbc/Petris.gbc similarity index 100% rename from package/emulationstation/batocera-es-system/roms/gbc/Petris.gbc rename to package/batocera/emulationstation/batocera-es-system/roms/gbc/Petris.gbc diff --git a/package/emulationstation/batocera-es-system/roms/gbc/gamelist.xml b/package/batocera/emulationstation/batocera-es-system/roms/gbc/gamelist.xml similarity index 100% rename from package/emulationstation/batocera-es-system/roms/gbc/gamelist.xml rename to package/batocera/emulationstation/batocera-es-system/roms/gbc/gamelist.xml diff --git a/package/emulationstation/batocera-es-system/roms/gbc/images/Petris-image.png b/package/batocera/emulationstation/batocera-es-system/roms/gbc/images/Petris-image.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/gbc/images/Petris-image.png rename to package/batocera/emulationstation/batocera-es-system/roms/gbc/images/Petris-image.png diff --git a/package/emulationstation/batocera-es-system/roms/gbc/images/Petris-marquee.png b/package/batocera/emulationstation/batocera-es-system/roms/gbc/images/Petris-marquee.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/gbc/images/Petris-marquee.png rename to package/batocera/emulationstation/batocera-es-system/roms/gbc/images/Petris-marquee.png diff --git a/package/emulationstation/batocera-es-system/roms/gbc/images/Petris-thumb.png b/package/batocera/emulationstation/batocera-es-system/roms/gbc/images/Petris-thumb.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/gbc/images/Petris-thumb.png rename to package/batocera/emulationstation/batocera-es-system/roms/gbc/images/Petris-thumb.png diff --git a/package/emulationstation/batocera-es-system/roms/gbc/videos/Petris-video.mp4 b/package/batocera/emulationstation/batocera-es-system/roms/gbc/videos/Petris-video.mp4 similarity index 100% rename from package/emulationstation/batocera-es-system/roms/gbc/videos/Petris-video.mp4 rename to package/batocera/emulationstation/batocera-es-system/roms/gbc/videos/Petris-video.mp4 diff --git a/package/emulationstation/batocera-es-system/roms/mame/mame2003/cfg/.keep b/package/batocera/emulationstation/batocera-es-system/roms/mame/mame2003/cfg/.keep similarity index 100% rename from package/emulationstation/batocera-es-system/roms/mame/mame2003/cfg/.keep rename to package/batocera/emulationstation/batocera-es-system/roms/mame/mame2003/cfg/.keep diff --git a/package/emulationstation/batocera-es-system/roms/mame/mame2003/diff/.keep b/package/batocera/emulationstation/batocera-es-system/roms/mame/mame2003/diff/.keep similarity index 100% rename from package/emulationstation/batocera-es-system/roms/mame/mame2003/diff/.keep rename to package/batocera/emulationstation/batocera-es-system/roms/mame/mame2003/diff/.keep diff --git a/package/emulationstation/batocera-es-system/roms/mame/mame2003/hi/.keep b/package/batocera/emulationstation/batocera-es-system/roms/mame/mame2003/hi/.keep similarity index 100% rename from package/emulationstation/batocera-es-system/roms/mame/mame2003/hi/.keep rename to package/batocera/emulationstation/batocera-es-system/roms/mame/mame2003/hi/.keep diff --git a/package/emulationstation/batocera-es-system/roms/mame/mame2003/inp/.keep b/package/batocera/emulationstation/batocera-es-system/roms/mame/mame2003/inp/.keep similarity index 100% rename from package/emulationstation/batocera-es-system/roms/mame/mame2003/inp/.keep rename to package/batocera/emulationstation/batocera-es-system/roms/mame/mame2003/inp/.keep diff --git a/package/emulationstation/batocera-es-system/roms/mame/mame2003/memcard/.keep b/package/batocera/emulationstation/batocera-es-system/roms/mame/mame2003/memcard/.keep similarity index 100% rename from package/emulationstation/batocera-es-system/roms/mame/mame2003/memcard/.keep rename to package/batocera/emulationstation/batocera-es-system/roms/mame/mame2003/memcard/.keep diff --git a/package/emulationstation/batocera-es-system/roms/mame/mame2003/nvram/.keep b/package/batocera/emulationstation/batocera-es-system/roms/mame/mame2003/nvram/.keep similarity index 100% rename from package/emulationstation/batocera-es-system/roms/mame/mame2003/nvram/.keep rename to package/batocera/emulationstation/batocera-es-system/roms/mame/mame2003/nvram/.keep diff --git a/package/emulationstation/batocera-es-system/roms/mame/mame2003/snap/.keep b/package/batocera/emulationstation/batocera-es-system/roms/mame/mame2003/snap/.keep similarity index 100% rename from package/emulationstation/batocera-es-system/roms/mame/mame2003/snap/.keep rename to package/batocera/emulationstation/batocera-es-system/roms/mame/mame2003/snap/.keep diff --git a/package/emulationstation/batocera-es-system/roms/mastersystem/Mai Nurse (v1.00).sms b/package/batocera/emulationstation/batocera-es-system/roms/mastersystem/Mai Nurse (v1.00).sms similarity index 100% rename from package/emulationstation/batocera-es-system/roms/mastersystem/Mai Nurse (v1.00).sms rename to package/batocera/emulationstation/batocera-es-system/roms/mastersystem/Mai Nurse (v1.00).sms diff --git a/package/emulationstation/batocera-es-system/roms/mastersystem/gamelist.xml b/package/batocera/emulationstation/batocera-es-system/roms/mastersystem/gamelist.xml similarity index 100% rename from package/emulationstation/batocera-es-system/roms/mastersystem/gamelist.xml rename to package/batocera/emulationstation/batocera-es-system/roms/mastersystem/gamelist.xml diff --git a/package/emulationstation/batocera-es-system/roms/mastersystem/images/Mai-Nurse-image.png b/package/batocera/emulationstation/batocera-es-system/roms/mastersystem/images/Mai-Nurse-image.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/mastersystem/images/Mai-Nurse-image.png rename to package/batocera/emulationstation/batocera-es-system/roms/mastersystem/images/Mai-Nurse-image.png diff --git a/package/emulationstation/batocera-es-system/roms/mastersystem/images/Mai-Nurse-marquee.png b/package/batocera/emulationstation/batocera-es-system/roms/mastersystem/images/Mai-Nurse-marquee.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/mastersystem/images/Mai-Nurse-marquee.png rename to package/batocera/emulationstation/batocera-es-system/roms/mastersystem/images/Mai-Nurse-marquee.png diff --git a/package/emulationstation/batocera-es-system/roms/mastersystem/images/Mai-Nurse-thumb.png b/package/batocera/emulationstation/batocera-es-system/roms/mastersystem/images/Mai-Nurse-thumb.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/mastersystem/images/Mai-Nurse-thumb.png rename to package/batocera/emulationstation/batocera-es-system/roms/mastersystem/images/Mai-Nurse-thumb.png diff --git a/package/emulationstation/batocera-es-system/roms/mastersystem/videos/Mai-Nurse-video.mp4 b/package/batocera/emulationstation/batocera-es-system/roms/mastersystem/videos/Mai-Nurse-video.mp4 similarity index 100% rename from package/emulationstation/batocera-es-system/roms/mastersystem/videos/Mai-Nurse-video.mp4 rename to package/batocera/emulationstation/batocera-es-system/roms/mastersystem/videos/Mai-Nurse-video.mp4 diff --git a/package/emulationstation/batocera-es-system/roms/megadrive/Hayato's Journey v1_0.bin b/package/batocera/emulationstation/batocera-es-system/roms/megadrive/Hayato's Journey v1_0.bin similarity index 100% rename from package/emulationstation/batocera-es-system/roms/megadrive/Hayato's Journey v1_0.bin rename to package/batocera/emulationstation/batocera-es-system/roms/megadrive/Hayato's Journey v1_0.bin diff --git a/package/emulationstation/batocera-es-system/roms/megadrive/Old-Towers.bin b/package/batocera/emulationstation/batocera-es-system/roms/megadrive/Old-Towers.bin similarity index 100% rename from package/emulationstation/batocera-es-system/roms/megadrive/Old-Towers.bin rename to package/batocera/emulationstation/batocera-es-system/roms/megadrive/Old-Towers.bin diff --git a/package/emulationstation/batocera-es-system/roms/megadrive/gamelist.xml b/package/batocera/emulationstation/batocera-es-system/roms/megadrive/gamelist.xml similarity index 100% rename from package/emulationstation/batocera-es-system/roms/megadrive/gamelist.xml rename to package/batocera/emulationstation/batocera-es-system/roms/megadrive/gamelist.xml diff --git a/package/emulationstation/batocera-es-system/roms/megadrive/images/Hayato-Journey-image.png b/package/batocera/emulationstation/batocera-es-system/roms/megadrive/images/Hayato-Journey-image.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/megadrive/images/Hayato-Journey-image.png rename to package/batocera/emulationstation/batocera-es-system/roms/megadrive/images/Hayato-Journey-image.png diff --git a/package/emulationstation/batocera-es-system/roms/megadrive/images/Hayato-Journey-marquee.png b/package/batocera/emulationstation/batocera-es-system/roms/megadrive/images/Hayato-Journey-marquee.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/megadrive/images/Hayato-Journey-marquee.png rename to package/batocera/emulationstation/batocera-es-system/roms/megadrive/images/Hayato-Journey-marquee.png diff --git a/package/emulationstation/batocera-es-system/roms/megadrive/images/Hayato-Journey-thumb.png b/package/batocera/emulationstation/batocera-es-system/roms/megadrive/images/Hayato-Journey-thumb.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/megadrive/images/Hayato-Journey-thumb.png rename to package/batocera/emulationstation/batocera-es-system/roms/megadrive/images/Hayato-Journey-thumb.png diff --git a/package/emulationstation/batocera-es-system/roms/megadrive/images/Old-Towers-image.png b/package/batocera/emulationstation/batocera-es-system/roms/megadrive/images/Old-Towers-image.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/megadrive/images/Old-Towers-image.png rename to package/batocera/emulationstation/batocera-es-system/roms/megadrive/images/Old-Towers-image.png diff --git a/package/emulationstation/batocera-es-system/roms/megadrive/images/Old-Towers-marquee.png b/package/batocera/emulationstation/batocera-es-system/roms/megadrive/images/Old-Towers-marquee.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/megadrive/images/Old-Towers-marquee.png rename to package/batocera/emulationstation/batocera-es-system/roms/megadrive/images/Old-Towers-marquee.png diff --git a/package/emulationstation/batocera-es-system/roms/megadrive/images/Old-Towers-thumb.png b/package/batocera/emulationstation/batocera-es-system/roms/megadrive/images/Old-Towers-thumb.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/megadrive/images/Old-Towers-thumb.png rename to package/batocera/emulationstation/batocera-es-system/roms/megadrive/images/Old-Towers-thumb.png diff --git a/package/emulationstation/batocera-es-system/roms/megadrive/videos/Hayato-Journey-video.mp4 b/package/batocera/emulationstation/batocera-es-system/roms/megadrive/videos/Hayato-Journey-video.mp4 similarity index 100% rename from package/emulationstation/batocera-es-system/roms/megadrive/videos/Hayato-Journey-video.mp4 rename to package/batocera/emulationstation/batocera-es-system/roms/megadrive/videos/Hayato-Journey-video.mp4 diff --git a/package/emulationstation/batocera-es-system/roms/megadrive/videos/Old-Towers-video.mp4 b/package/batocera/emulationstation/batocera-es-system/roms/megadrive/videos/Old-Towers-video.mp4 similarity index 100% rename from package/emulationstation/batocera-es-system/roms/megadrive/videos/Old-Towers-video.mp4 rename to package/batocera/emulationstation/batocera-es-system/roms/megadrive/videos/Old-Towers-video.mp4 diff --git a/package/emulationstation/batocera-es-system/roms/model2/_info.txt b/package/batocera/emulationstation/batocera-es-system/roms/model2/_info.txt similarity index 100% rename from package/emulationstation/batocera-es-system/roms/model2/_info.txt rename to package/batocera/emulationstation/batocera-es-system/roms/model2/_info.txt diff --git a/package/emulationstation/batocera-es-system/roms/model3/_info.txt b/package/batocera/emulationstation/batocera-es-system/roms/model3/_info.txt similarity index 100% rename from package/emulationstation/batocera-es-system/roms/model3/_info.txt rename to package/batocera/emulationstation/batocera-es-system/roms/model3/_info.txt diff --git a/package/emulationstation/batocera-es-system/roms/moonlight/.keep b/package/batocera/emulationstation/batocera-es-system/roms/moonlight/.keep similarity index 100% rename from package/emulationstation/batocera-es-system/roms/moonlight/.keep rename to package/batocera/emulationstation/batocera-es-system/roms/moonlight/.keep diff --git a/package/emulationstation/batocera-es-system/roms/mrboom/MrBoom.libretro b/package/batocera/emulationstation/batocera-es-system/roms/mrboom/MrBoom.libretro similarity index 100% rename from package/emulationstation/batocera-es-system/roms/mrboom/MrBoom.libretro rename to package/batocera/emulationstation/batocera-es-system/roms/mrboom/MrBoom.libretro diff --git a/package/emulationstation/batocera-es-system/roms/mrboom/gamelist.xml b/package/batocera/emulationstation/batocera-es-system/roms/mrboom/gamelist.xml similarity index 100% rename from package/emulationstation/batocera-es-system/roms/mrboom/gamelist.xml rename to package/batocera/emulationstation/batocera-es-system/roms/mrboom/gamelist.xml diff --git a/package/emulationstation/batocera-es-system/roms/mrboom/images/MrBoom-image.png b/package/batocera/emulationstation/batocera-es-system/roms/mrboom/images/MrBoom-image.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/mrboom/images/MrBoom-image.png rename to package/batocera/emulationstation/batocera-es-system/roms/mrboom/images/MrBoom-image.png diff --git a/package/emulationstation/batocera-es-system/roms/mrboom/images/MrBoom-marquee.png b/package/batocera/emulationstation/batocera-es-system/roms/mrboom/images/MrBoom-marquee.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/mrboom/images/MrBoom-marquee.png rename to package/batocera/emulationstation/batocera-es-system/roms/mrboom/images/MrBoom-marquee.png diff --git a/package/emulationstation/batocera-es-system/roms/mrboom/images/MrBoom-thumb.png b/package/batocera/emulationstation/batocera-es-system/roms/mrboom/images/MrBoom-thumb.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/mrboom/images/MrBoom-thumb.png rename to package/batocera/emulationstation/batocera-es-system/roms/mrboom/images/MrBoom-thumb.png diff --git a/package/emulationstation/batocera-es-system/roms/mrboom/videos/MrBoom-video.mp4 b/package/batocera/emulationstation/batocera-es-system/roms/mrboom/videos/MrBoom-video.mp4 similarity index 100% rename from package/emulationstation/batocera-es-system/roms/mrboom/videos/MrBoom-video.mp4 rename to package/batocera/emulationstation/batocera-es-system/roms/mrboom/videos/MrBoom-video.mp4 diff --git a/package/emulationstation/batocera-es-system/roms/nes/Alter Ego.nes b/package/batocera/emulationstation/batocera-es-system/roms/nes/Alter Ego.nes similarity index 100% rename from package/emulationstation/batocera-es-system/roms/nes/Alter Ego.nes rename to package/batocera/emulationstation/batocera-es-system/roms/nes/Alter Ego.nes diff --git a/package/emulationstation/batocera-es-system/roms/nes/gamelist.xml b/package/batocera/emulationstation/batocera-es-system/roms/nes/gamelist.xml similarity index 100% rename from package/emulationstation/batocera-es-system/roms/nes/gamelist.xml rename to package/batocera/emulationstation/batocera-es-system/roms/nes/gamelist.xml diff --git a/package/emulationstation/batocera-es-system/roms/nes/images/Alter-Ego-image.png b/package/batocera/emulationstation/batocera-es-system/roms/nes/images/Alter-Ego-image.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/nes/images/Alter-Ego-image.png rename to package/batocera/emulationstation/batocera-es-system/roms/nes/images/Alter-Ego-image.png diff --git a/package/emulationstation/batocera-es-system/roms/nes/images/Alter-Ego-marquee.png b/package/batocera/emulationstation/batocera-es-system/roms/nes/images/Alter-Ego-marquee.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/nes/images/Alter-Ego-marquee.png rename to package/batocera/emulationstation/batocera-es-system/roms/nes/images/Alter-Ego-marquee.png diff --git a/package/emulationstation/batocera-es-system/roms/nes/images/Alter-Ego-thumb.png b/package/batocera/emulationstation/batocera-es-system/roms/nes/images/Alter-Ego-thumb.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/nes/images/Alter-Ego-thumb.png rename to package/batocera/emulationstation/batocera-es-system/roms/nes/images/Alter-Ego-thumb.png diff --git a/package/emulationstation/batocera-es-system/roms/nes/manuals/Alter-Ego-manual.pdf b/package/batocera/emulationstation/batocera-es-system/roms/nes/manuals/Alter-Ego-manual.pdf similarity index 100% rename from package/emulationstation/batocera-es-system/roms/nes/manuals/Alter-Ego-manual.pdf rename to package/batocera/emulationstation/batocera-es-system/roms/nes/manuals/Alter-Ego-manual.pdf diff --git a/package/emulationstation/batocera-es-system/roms/nes/videos/Alter-Ego-video.mp4 b/package/batocera/emulationstation/batocera-es-system/roms/nes/videos/Alter-Ego-video.mp4 similarity index 100% rename from package/emulationstation/batocera-es-system/roms/nes/videos/Alter-Ego-video.mp4 rename to package/batocera/emulationstation/batocera-es-system/roms/nes/videos/Alter-Ego-video.mp4 diff --git a/package/emulationstation/batocera-es-system/roms/odcommander/gamelist.xml b/package/batocera/emulationstation/batocera-es-system/roms/odcommander/gamelist.xml similarity index 100% rename from package/emulationstation/batocera-es-system/roms/odcommander/gamelist.xml rename to package/batocera/emulationstation/batocera-es-system/roms/odcommander/gamelist.xml diff --git a/package/emulationstation/batocera-es-system/roms/odcommander/images/od-commander-image.png b/package/batocera/emulationstation/batocera-es-system/roms/odcommander/images/od-commander-image.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/odcommander/images/od-commander-image.png rename to package/batocera/emulationstation/batocera-es-system/roms/odcommander/images/od-commander-image.png diff --git a/package/emulationstation/batocera-es-system/roms/odcommander/images/od-commander-marquee.png b/package/batocera/emulationstation/batocera-es-system/roms/odcommander/images/od-commander-marquee.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/odcommander/images/od-commander-marquee.png rename to package/batocera/emulationstation/batocera-es-system/roms/odcommander/images/od-commander-marquee.png diff --git a/package/emulationstation/batocera-es-system/roms/odcommander/od-commander.odc b/package/batocera/emulationstation/batocera-es-system/roms/odcommander/od-commander.odc similarity index 100% rename from package/emulationstation/batocera-es-system/roms/odcommander/od-commander.odc rename to package/batocera/emulationstation/batocera-es-system/roms/odcommander/od-commander.odc diff --git a/package/emulationstation/batocera-es-system/roms/pcengine/Dinoforce.pce b/package/batocera/emulationstation/batocera-es-system/roms/pcengine/Dinoforce.pce similarity index 100% rename from package/emulationstation/batocera-es-system/roms/pcengine/Dinoforce.pce rename to package/batocera/emulationstation/batocera-es-system/roms/pcengine/Dinoforce.pce diff --git a/package/emulationstation/batocera-es-system/roms/pcengine/gamelist.xml b/package/batocera/emulationstation/batocera-es-system/roms/pcengine/gamelist.xml similarity index 100% rename from package/emulationstation/batocera-es-system/roms/pcengine/gamelist.xml rename to package/batocera/emulationstation/batocera-es-system/roms/pcengine/gamelist.xml diff --git a/package/emulationstation/batocera-es-system/roms/pcengine/images/Dinoforce-image.png b/package/batocera/emulationstation/batocera-es-system/roms/pcengine/images/Dinoforce-image.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/pcengine/images/Dinoforce-image.png rename to package/batocera/emulationstation/batocera-es-system/roms/pcengine/images/Dinoforce-image.png diff --git a/package/emulationstation/batocera-es-system/roms/pcengine/images/Dinoforce-marquee.png b/package/batocera/emulationstation/batocera-es-system/roms/pcengine/images/Dinoforce-marquee.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/pcengine/images/Dinoforce-marquee.png rename to package/batocera/emulationstation/batocera-es-system/roms/pcengine/images/Dinoforce-marquee.png diff --git a/package/emulationstation/batocera-es-system/roms/pcengine/images/Dinoforce-thumb.png b/package/batocera/emulationstation/batocera-es-system/roms/pcengine/images/Dinoforce-thumb.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/pcengine/images/Dinoforce-thumb.png rename to package/batocera/emulationstation/batocera-es-system/roms/pcengine/images/Dinoforce-thumb.png diff --git a/package/emulationstation/batocera-es-system/roms/pcengine/videos/Dinoforce-video.mp4 b/package/batocera/emulationstation/batocera-es-system/roms/pcengine/videos/Dinoforce-video.mp4 similarity index 100% rename from package/emulationstation/batocera-es-system/roms/pcengine/videos/Dinoforce-video.mp4 rename to package/batocera/emulationstation/batocera-es-system/roms/pcengine/videos/Dinoforce-video.mp4 diff --git a/package/emulationstation/batocera-es-system/roms/prboom/doom1_shareware.wad b/package/batocera/emulationstation/batocera-es-system/roms/prboom/doom1_shareware.wad similarity index 100% rename from package/emulationstation/batocera-es-system/roms/prboom/doom1_shareware.wad rename to package/batocera/emulationstation/batocera-es-system/roms/prboom/doom1_shareware.wad diff --git a/package/emulationstation/batocera-es-system/roms/prboom/doom1_shareware_license.txt b/package/batocera/emulationstation/batocera-es-system/roms/prboom/doom1_shareware_license.txt similarity index 100% rename from package/emulationstation/batocera-es-system/roms/prboom/doom1_shareware_license.txt rename to package/batocera/emulationstation/batocera-es-system/roms/prboom/doom1_shareware_license.txt diff --git a/package/emulationstation/batocera-es-system/roms/prboom/game-musics/_info.txt b/package/batocera/emulationstation/batocera-es-system/roms/prboom/game-musics/_info.txt similarity index 100% rename from package/emulationstation/batocera-es-system/roms/prboom/game-musics/_info.txt rename to package/batocera/emulationstation/batocera-es-system/roms/prboom/game-musics/_info.txt diff --git a/package/emulationstation/batocera-es-system/roms/prboom/gamelist.xml b/package/batocera/emulationstation/batocera-es-system/roms/prboom/gamelist.xml similarity index 100% rename from package/emulationstation/batocera-es-system/roms/prboom/gamelist.xml rename to package/batocera/emulationstation/batocera-es-system/roms/prboom/gamelist.xml diff --git a/package/emulationstation/batocera-es-system/roms/prboom/images/doom1_shareware-image.png b/package/batocera/emulationstation/batocera-es-system/roms/prboom/images/doom1_shareware-image.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/prboom/images/doom1_shareware-image.png rename to package/batocera/emulationstation/batocera-es-system/roms/prboom/images/doom1_shareware-image.png diff --git a/package/emulationstation/batocera-es-system/roms/prboom/images/doom1_shareware-marquee.png b/package/batocera/emulationstation/batocera-es-system/roms/prboom/images/doom1_shareware-marquee.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/prboom/images/doom1_shareware-marquee.png rename to package/batocera/emulationstation/batocera-es-system/roms/prboom/images/doom1_shareware-marquee.png diff --git a/package/emulationstation/batocera-es-system/roms/prboom/images/doom1_shareware-thumb.png b/package/batocera/emulationstation/batocera-es-system/roms/prboom/images/doom1_shareware-thumb.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/prboom/images/doom1_shareware-thumb.png rename to package/batocera/emulationstation/batocera-es-system/roms/prboom/images/doom1_shareware-thumb.png diff --git a/package/emulationstation/batocera-es-system/roms/prboom/prboom.wad b/package/batocera/emulationstation/batocera-es-system/roms/prboom/prboom.wad similarity index 100% rename from package/emulationstation/batocera-es-system/roms/prboom/prboom.wad rename to package/batocera/emulationstation/batocera-es-system/roms/prboom/prboom.wad diff --git a/package/emulationstation/batocera-es-system/roms/prboom/videos/doom1_shareware-video.mp4 b/package/batocera/emulationstation/batocera-es-system/roms/prboom/videos/doom1_shareware-video.mp4 similarity index 100% rename from package/emulationstation/batocera-es-system/roms/prboom/videos/doom1_shareware-video.mp4 rename to package/batocera/emulationstation/batocera-es-system/roms/prboom/videos/doom1_shareware-video.mp4 diff --git a/package/emulationstation/batocera-es-system/roms/pygame/.gitkeep b/package/batocera/emulationstation/batocera-es-system/roms/pygame/.gitkeep similarity index 100% rename from package/emulationstation/batocera-es-system/roms/pygame/.gitkeep rename to package/batocera/emulationstation/batocera-es-system/roms/pygame/.gitkeep diff --git a/package/emulationstation/batocera-es-system/roms/sdlpop/gamelist.xml b/package/batocera/emulationstation/batocera-es-system/roms/sdlpop/gamelist.xml similarity index 100% rename from package/emulationstation/batocera-es-system/roms/sdlpop/gamelist.xml rename to package/batocera/emulationstation/batocera-es-system/roms/sdlpop/gamelist.xml diff --git a/package/emulationstation/batocera-es-system/roms/sdlpop/images/sdlpop-image.png b/package/batocera/emulationstation/batocera-es-system/roms/sdlpop/images/sdlpop-image.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/sdlpop/images/sdlpop-image.png rename to package/batocera/emulationstation/batocera-es-system/roms/sdlpop/images/sdlpop-image.png diff --git a/package/emulationstation/batocera-es-system/roms/sdlpop/images/sdlpop-marquee.png b/package/batocera/emulationstation/batocera-es-system/roms/sdlpop/images/sdlpop-marquee.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/sdlpop/images/sdlpop-marquee.png rename to package/batocera/emulationstation/batocera-es-system/roms/sdlpop/images/sdlpop-marquee.png diff --git a/package/emulationstation/batocera-es-system/roms/sdlpop/images/sdlpop-thumb.png b/package/batocera/emulationstation/batocera-es-system/roms/sdlpop/images/sdlpop-thumb.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/sdlpop/images/sdlpop-thumb.png rename to package/batocera/emulationstation/batocera-es-system/roms/sdlpop/images/sdlpop-thumb.png diff --git a/package/emulationstation/batocera-es-system/roms/sdlpop/sdlpop.sdlpop b/package/batocera/emulationstation/batocera-es-system/roms/sdlpop/sdlpop.sdlpop similarity index 100% rename from package/emulationstation/batocera-es-system/roms/sdlpop/sdlpop.sdlpop rename to package/batocera/emulationstation/batocera-es-system/roms/sdlpop/sdlpop.sdlpop diff --git a/package/emulationstation/batocera-es-system/roms/sdlpop/videos/sdlpop-video.mp4 b/package/batocera/emulationstation/batocera-es-system/roms/sdlpop/videos/sdlpop-video.mp4 similarity index 100% rename from package/emulationstation/batocera-es-system/roms/sdlpop/videos/sdlpop-video.mp4 rename to package/batocera/emulationstation/batocera-es-system/roms/sdlpop/videos/sdlpop-video.mp4 diff --git a/package/emulationstation/batocera-es-system/roms/snes/Dottie Flowers (v1.1).sfc b/package/batocera/emulationstation/batocera-es-system/roms/snes/Dottie Flowers (v1.1).sfc similarity index 100% rename from package/emulationstation/batocera-es-system/roms/snes/Dottie Flowers (v1.1).sfc rename to package/batocera/emulationstation/batocera-es-system/roms/snes/Dottie Flowers (v1.1).sfc diff --git a/package/emulationstation/batocera-es-system/roms/snes/Super Boss Gaiden (v1.2).sfc b/package/batocera/emulationstation/batocera-es-system/roms/snes/Super Boss Gaiden (v1.2).sfc similarity index 100% rename from package/emulationstation/batocera-es-system/roms/snes/Super Boss Gaiden (v1.2).sfc rename to package/batocera/emulationstation/batocera-es-system/roms/snes/Super Boss Gaiden (v1.2).sfc diff --git a/package/emulationstation/batocera-es-system/roms/snes/gamelist.xml b/package/batocera/emulationstation/batocera-es-system/roms/snes/gamelist.xml similarity index 100% rename from package/emulationstation/batocera-es-system/roms/snes/gamelist.xml rename to package/batocera/emulationstation/batocera-es-system/roms/snes/gamelist.xml diff --git a/package/emulationstation/batocera-es-system/roms/snes/images/Dottie-Flowers-image.png b/package/batocera/emulationstation/batocera-es-system/roms/snes/images/Dottie-Flowers-image.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/snes/images/Dottie-Flowers-image.png rename to package/batocera/emulationstation/batocera-es-system/roms/snes/images/Dottie-Flowers-image.png diff --git a/package/emulationstation/batocera-es-system/roms/snes/images/Dottie-Flowers-marquee.png b/package/batocera/emulationstation/batocera-es-system/roms/snes/images/Dottie-Flowers-marquee.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/snes/images/Dottie-Flowers-marquee.png rename to package/batocera/emulationstation/batocera-es-system/roms/snes/images/Dottie-Flowers-marquee.png diff --git a/package/emulationstation/batocera-es-system/roms/snes/images/Dottie-Flowers-thumb.png b/package/batocera/emulationstation/batocera-es-system/roms/snes/images/Dottie-Flowers-thumb.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/snes/images/Dottie-Flowers-thumb.png rename to package/batocera/emulationstation/batocera-es-system/roms/snes/images/Dottie-Flowers-thumb.png diff --git a/package/emulationstation/batocera-es-system/roms/snes/images/Super-Boss-Gaiden-image.png b/package/batocera/emulationstation/batocera-es-system/roms/snes/images/Super-Boss-Gaiden-image.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/snes/images/Super-Boss-Gaiden-image.png rename to package/batocera/emulationstation/batocera-es-system/roms/snes/images/Super-Boss-Gaiden-image.png diff --git a/package/emulationstation/batocera-es-system/roms/snes/images/Super-Boss-Gaiden-marquee.png b/package/batocera/emulationstation/batocera-es-system/roms/snes/images/Super-Boss-Gaiden-marquee.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/snes/images/Super-Boss-Gaiden-marquee.png rename to package/batocera/emulationstation/batocera-es-system/roms/snes/images/Super-Boss-Gaiden-marquee.png diff --git a/package/emulationstation/batocera-es-system/roms/snes/images/Super-Boss-Gaiden-thumb.png b/package/batocera/emulationstation/batocera-es-system/roms/snes/images/Super-Boss-Gaiden-thumb.png similarity index 100% rename from package/emulationstation/batocera-es-system/roms/snes/images/Super-Boss-Gaiden-thumb.png rename to package/batocera/emulationstation/batocera-es-system/roms/snes/images/Super-Boss-Gaiden-thumb.png diff --git a/package/emulationstation/batocera-es-system/roms/snes/manuals/Super-Boss-Gaiden-manual.pdf b/package/batocera/emulationstation/batocera-es-system/roms/snes/manuals/Super-Boss-Gaiden-manual.pdf similarity index 100% rename from package/emulationstation/batocera-es-system/roms/snes/manuals/Super-Boss-Gaiden-manual.pdf rename to package/batocera/emulationstation/batocera-es-system/roms/snes/manuals/Super-Boss-Gaiden-manual.pdf diff --git a/package/emulationstation/batocera-es-system/roms/snes/videos/Dottie-Flowers-video.mp4 b/package/batocera/emulationstation/batocera-es-system/roms/snes/videos/Dottie-Flowers-video.mp4 similarity index 100% rename from package/emulationstation/batocera-es-system/roms/snes/videos/Dottie-Flowers-video.mp4 rename to package/batocera/emulationstation/batocera-es-system/roms/snes/videos/Dottie-Flowers-video.mp4 diff --git a/package/emulationstation/batocera-es-system/roms/snes/videos/Super-Boss-Gaiden-video.mp4 b/package/batocera/emulationstation/batocera-es-system/roms/snes/videos/Super-Boss-Gaiden-video.mp4 similarity index 100% rename from package/emulationstation/batocera-es-system/roms/snes/videos/Super-Boss-Gaiden-video.mp4 rename to package/batocera/emulationstation/batocera-es-system/roms/snes/videos/Super-Boss-Gaiden-video.mp4 diff --git a/package/emulationstation/batocera-es-system/roms/sonicretro/_info.txt b/package/batocera/emulationstation/batocera-es-system/roms/sonicretro/_info.txt similarity index 100% rename from package/emulationstation/batocera-es-system/roms/sonicretro/_info.txt rename to package/batocera/emulationstation/batocera-es-system/roms/sonicretro/_info.txt diff --git a/package/emulationstation/batocera-es-system/roms/xash3d_fwgs/gamelist.xml b/package/batocera/emulationstation/batocera-es-system/roms/xash3d_fwgs/gamelist.xml similarity index 100% rename from package/emulationstation/batocera-es-system/roms/xash3d_fwgs/gamelist.xml rename to package/batocera/emulationstation/batocera-es-system/roms/xash3d_fwgs/gamelist.xml diff --git a/package/emulationstation/batocera-es-system/roms/xash3d_fwgs/images/README.md b/package/batocera/emulationstation/batocera-es-system/roms/xash3d_fwgs/images/README.md similarity index 100% rename from package/emulationstation/batocera-es-system/roms/xash3d_fwgs/images/README.md rename to package/batocera/emulationstation/batocera-es-system/roms/xash3d_fwgs/images/README.md diff --git a/package/emulationstation/batocera-es-system/roms/xash3d_fwgs/images/cstrike.jpg b/package/batocera/emulationstation/batocera-es-system/roms/xash3d_fwgs/images/cstrike.jpg similarity index 100% rename from package/emulationstation/batocera-es-system/roms/xash3d_fwgs/images/cstrike.jpg rename to package/batocera/emulationstation/batocera-es-system/roms/xash3d_fwgs/images/cstrike.jpg diff --git a/package/emulationstation/batocera-es-system/roms/xash3d_fwgs/images/dmc.jpg b/package/batocera/emulationstation/batocera-es-system/roms/xash3d_fwgs/images/dmc.jpg similarity index 100% rename from package/emulationstation/batocera-es-system/roms/xash3d_fwgs/images/dmc.jpg rename to package/batocera/emulationstation/batocera-es-system/roms/xash3d_fwgs/images/dmc.jpg diff --git a/package/emulationstation/batocera-es-system/roms/xash3d_fwgs/images/half-life.jpg b/package/batocera/emulationstation/batocera-es-system/roms/xash3d_fwgs/images/half-life.jpg similarity index 100% rename from package/emulationstation/batocera-es-system/roms/xash3d_fwgs/images/half-life.jpg rename to package/batocera/emulationstation/batocera-es-system/roms/xash3d_fwgs/images/half-life.jpg diff --git a/package/emulationstation/batocera-es-system/roms/xash3d_fwgs/images/half-life_blue-shift.jpg b/package/batocera/emulationstation/batocera-es-system/roms/xash3d_fwgs/images/half-life_blue-shift.jpg similarity index 100% rename from package/emulationstation/batocera-es-system/roms/xash3d_fwgs/images/half-life_blue-shift.jpg rename to package/batocera/emulationstation/batocera-es-system/roms/xash3d_fwgs/images/half-life_blue-shift.jpg diff --git a/package/emulationstation/batocera-es-system/roms/xash3d_fwgs/images/half-life_opposing-force.jpg b/package/batocera/emulationstation/batocera-es-system/roms/xash3d_fwgs/images/half-life_opposing-force.jpg similarity index 100% rename from package/emulationstation/batocera-es-system/roms/xash3d_fwgs/images/half-life_opposing-force.jpg rename to package/batocera/emulationstation/batocera-es-system/roms/xash3d_fwgs/images/half-life_opposing-force.jpg diff --git a/package/emulationstation/batocera-es-system/systems-explanations.yml b/package/batocera/emulationstation/batocera-es-system/systems-explanations.yml similarity index 100% rename from package/emulationstation/batocera-es-system/systems-explanations.yml rename to package/batocera/emulationstation/batocera-es-system/systems-explanations.yml diff --git a/package/emulationstation/es-background-musics/Config.in b/package/batocera/emulationstation/es-background-musics/Config.in similarity index 100% rename from package/emulationstation/es-background-musics/Config.in rename to package/batocera/emulationstation/es-background-musics/Config.in diff --git a/package/emulationstation/es-background-musics/es-background-musics.mk b/package/batocera/emulationstation/es-background-musics/es-background-musics.mk similarity index 75% rename from package/emulationstation/es-background-musics/es-background-musics.mk rename to package/batocera/emulationstation/es-background-musics/es-background-musics.mk index 1088d2431f7..8fc85426693 100644 --- a/package/emulationstation/es-background-musics/es-background-musics.mk +++ b/package/batocera/emulationstation/es-background-musics/es-background-musics.mk @@ -11,7 +11,7 @@ ES_BACKGROUND_MUSICS_SOURCE= define ES_BACKGROUND_MUSICS_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/share/reglinux/music - cp -R $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulationstation/es-background-musics/music/* $(TARGET_DIR)/usr/share/reglinux/music/ + cp -R $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulationstation/es-background-musics/music/* $(TARGET_DIR)/usr/share/reglinux/music/ endef $(eval $(generic-package)) diff --git a/package/emulationstation/es-background-musics/music/bolt-action-licence-vol-4.md b/package/batocera/emulationstation/es-background-musics/music/bolt-action-licence-vol-4.md similarity index 100% rename from package/emulationstation/es-background-musics/music/bolt-action-licence-vol-4.md rename to package/batocera/emulationstation/es-background-musics/music/bolt-action-licence-vol-4.md diff --git a/package/emulationstation/es-background-musics/music/drozerix_-_bubble_machine.xm b/package/batocera/emulationstation/es-background-musics/music/drozerix_-_bubble_machine.xm similarity index 100% rename from package/emulationstation/es-background-musics/music/drozerix_-_bubble_machine.xm rename to package/batocera/emulationstation/es-background-musics/music/drozerix_-_bubble_machine.xm diff --git a/package/emulationstation/es-background-musics/music/drozerix_-_computer_fuck!.xm b/package/batocera/emulationstation/es-background-musics/music/drozerix_-_computer_fuck!.xm similarity index 100% rename from package/emulationstation/es-background-musics/music/drozerix_-_computer_fuck!.xm rename to package/batocera/emulationstation/es-background-musics/music/drozerix_-_computer_fuck!.xm diff --git a/package/emulationstation/es-background-musics/music/drozerix_-_crush.xm b/package/batocera/emulationstation/es-background-musics/music/drozerix_-_crush.xm similarity index 100% rename from package/emulationstation/es-background-musics/music/drozerix_-_crush.xm rename to package/batocera/emulationstation/es-background-musics/music/drozerix_-_crush.xm diff --git a/package/emulationstation/es-background-musics/music/drozerix_-_digital_rendezvous.xm b/package/batocera/emulationstation/es-background-musics/music/drozerix_-_digital_rendezvous.xm similarity index 100% rename from package/emulationstation/es-background-musics/music/drozerix_-_digital_rendezvous.xm rename to package/batocera/emulationstation/es-background-musics/music/drozerix_-_digital_rendezvous.xm diff --git a/package/emulationstation/es-background-musics/music/drozerix_-_poppy_flower_girls.xm b/package/batocera/emulationstation/es-background-musics/music/drozerix_-_poppy_flower_girls.xm similarity index 100% rename from package/emulationstation/es-background-musics/music/drozerix_-_poppy_flower_girls.xm rename to package/batocera/emulationstation/es-background-musics/music/drozerix_-_poppy_flower_girls.xm diff --git a/package/emulationstation/es-background-musics/music/girl_from_mars.xm b/package/batocera/emulationstation/es-background-musics/music/girl_from_mars.xm similarity index 100% rename from package/emulationstation/es-background-musics/music/girl_from_mars.xm rename to package/batocera/emulationstation/es-background-musics/music/girl_from_mars.xm diff --git a/package/emulationstation/es-background-musics/music/key_generators.xm b/package/batocera/emulationstation/es-background-musics/music/key_generators.xm similarity index 100% rename from package/emulationstation/es-background-musics/music/key_generators.xm rename to package/batocera/emulationstation/es-background-musics/music/key_generators.xm diff --git a/package/emulationstation/es-background-musics/music/keygen_9000.xm b/package/batocera/emulationstation/es-background-musics/music/keygen_9000.xm similarity index 100% rename from package/emulationstation/es-background-musics/music/keygen_9000.xm rename to package/batocera/emulationstation/es-background-musics/music/keygen_9000.xm diff --git a/package/emulationstation/es-background-musics/music/licence.md b/package/batocera/emulationstation/es-background-musics/music/licence.md similarity index 100% rename from package/emulationstation/es-background-musics/music/licence.md rename to package/batocera/emulationstation/es-background-musics/music/licence.md diff --git a/package/emulationstation/es-background-musics/music/nihilore-licence.md b/package/batocera/emulationstation/es-background-musics/music/nihilore-licence.md similarity index 100% rename from package/emulationstation/es-background-musics/music/nihilore-licence.md rename to package/batocera/emulationstation/es-background-musics/music/nihilore-licence.md diff --git a/package/emulationstation/es-background-musics/music/sexxy_bit_2!!.xm b/package/batocera/emulationstation/es-background-musics/music/sexxy_bit_2!!.xm similarity index 100% rename from package/emulationstation/es-background-musics/music/sexxy_bit_2!!.xm rename to package/batocera/emulationstation/es-background-musics/music/sexxy_bit_2!!.xm diff --git a/package/emulationstation/es-background-musics/music/the_dim_dungeon.xm b/package/batocera/emulationstation/es-background-musics/music/the_dim_dungeon.xm similarity index 100% rename from package/emulationstation/es-background-musics/music/the_dim_dungeon.xm rename to package/batocera/emulationstation/es-background-musics/music/the_dim_dungeon.xm diff --git a/package/emulationstation/es-background-musics/music/the_dim_dungeon_2.xm b/package/batocera/emulationstation/es-background-musics/music/the_dim_dungeon_2.xm similarity index 100% rename from package/emulationstation/es-background-musics/music/the_dim_dungeon_2.xm rename to package/batocera/emulationstation/es-background-musics/music/the_dim_dungeon_2.xm diff --git a/package/emulationstation/es-background-musics/music/wrath_of_the_djinn.xm b/package/batocera/emulationstation/es-background-musics/music/wrath_of_the_djinn.xm similarity index 100% rename from package/emulationstation/es-background-musics/music/wrath_of_the_djinn.xm rename to package/batocera/emulationstation/es-background-musics/music/wrath_of_the_djinn.xm diff --git a/package/emulationstation/es-theme-carbon/Config.in b/package/batocera/emulationstation/es-theme-carbon/Config.in similarity index 100% rename from package/emulationstation/es-theme-carbon/Config.in rename to package/batocera/emulationstation/es-theme-carbon/Config.in diff --git a/package/emulationstation/es-theme-carbon/es-theme-carbon.mk b/package/batocera/emulationstation/es-theme-carbon/es-theme-carbon.mk similarity index 100% rename from package/emulationstation/es-theme-carbon/es-theme-carbon.mk rename to package/batocera/emulationstation/es-theme-carbon/es-theme-carbon.mk diff --git a/package/emulators/amiberry/000-amiberry-path.patch b/package/batocera/emulators/amiberry/000-amiberry-path.patch similarity index 100% rename from package/emulators/amiberry/000-amiberry-path.patch rename to package/batocera/emulators/amiberry/000-amiberry-path.patch diff --git a/package/emulators/amiberry/001-default_fullscreen.patch b/package/batocera/emulators/amiberry/001-default_fullscreen.patch similarity index 100% rename from package/emulators/amiberry/001-default_fullscreen.patch rename to package/batocera/emulators/amiberry/001-default_fullscreen.patch diff --git a/package/emulators/amiberry/Config.in b/package/batocera/emulators/amiberry/Config.in similarity index 100% rename from package/emulators/amiberry/Config.in rename to package/batocera/emulators/amiberry/Config.in diff --git a/package/emulators/amiberry/amiberry.mk b/package/batocera/emulators/amiberry/amiberry.mk similarity index 86% rename from package/emulators/amiberry/amiberry.mk rename to package/batocera/emulators/amiberry/amiberry.mk index ba8408a3fb8..a9fbd07ca3d 100644 --- a/package/emulators/amiberry/amiberry.mk +++ b/package/batocera/emulators/amiberry/amiberry.mk @@ -45,11 +45,11 @@ endef define AMIBERRY_EVMAP mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp -prn $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/amiberry/controllers/amiga500.amiberry.keys \ + cp -prn $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/amiberry/controllers/amiga500.amiberry.keys \ $(TARGET_DIR)/usr/share/evmapy - cp -prn $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/amiberry/controllers/amiga1200.amiberry.keys \ + cp -prn $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/amiberry/controllers/amiga1200.amiberry.keys \ $(TARGET_DIR)/usr/share/evmapy - cp -prn $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/amiberry/controllers/amigacd32.amiberry.keys \ + cp -prn $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/amiberry/controllers/amigacd32.amiberry.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/emulators/amiberry/controllers/amiga1200.amiberry.keys b/package/batocera/emulators/amiberry/controllers/amiga1200.amiberry.keys similarity index 100% rename from package/emulators/amiberry/controllers/amiga1200.amiberry.keys rename to package/batocera/emulators/amiberry/controllers/amiga1200.amiberry.keys diff --git a/package/emulators/amiberry/controllers/amiga500.amiberry.keys b/package/batocera/emulators/amiberry/controllers/amiga500.amiberry.keys similarity index 100% rename from package/emulators/amiberry/controllers/amiga500.amiberry.keys rename to package/batocera/emulators/amiberry/controllers/amiga500.amiberry.keys diff --git a/package/emulators/amiberry/controllers/amigacd32.amiberry.keys b/package/batocera/emulators/amiberry/controllers/amigacd32.amiberry.keys similarity index 100% rename from package/emulators/amiberry/controllers/amigacd32.amiberry.keys rename to package/batocera/emulators/amiberry/controllers/amigacd32.amiberry.keys diff --git a/package/emulators/bigpemu/Config.in b/package/batocera/emulators/bigpemu/Config.in similarity index 100% rename from package/emulators/bigpemu/Config.in rename to package/batocera/emulators/bigpemu/Config.in diff --git a/package/emulators/bigpemu/bigpemu.mk b/package/batocera/emulators/bigpemu/bigpemu.mk similarity index 85% rename from package/emulators/bigpemu/bigpemu.mk rename to package/batocera/emulators/bigpemu/bigpemu.mk index 6a6445885ff..b69618916dd 100644 --- a/package/emulators/bigpemu/bigpemu.mk +++ b/package/batocera/emulators/bigpemu/bigpemu.mk @@ -13,7 +13,7 @@ define BIGPEMU_INSTALL_TARGET_CMDS cp -pr $(@D)/* $(TARGET_DIR)/usr/bigpemu/ # evmap config mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/bigpemu/jaguar.bigpemu.keys \ + cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/bigpemu/jaguar.bigpemu.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/emulators/bigpemu/jaguar.bigpemu.keys b/package/batocera/emulators/bigpemu/jaguar.bigpemu.keys similarity index 100% rename from package/emulators/bigpemu/jaguar.bigpemu.keys rename to package/batocera/emulators/bigpemu/jaguar.bigpemu.keys diff --git a/package/emulators/citra/3ds.citra.keys b/package/batocera/emulators/citra/3ds.citra.keys similarity index 100% rename from package/emulators/citra/3ds.citra.keys rename to package/batocera/emulators/citra/3ds.citra.keys diff --git a/package/emulators/citra/Config.in b/package/batocera/emulators/citra/Config.in similarity index 100% rename from package/emulators/citra/Config.in rename to package/batocera/emulators/citra/Config.in diff --git a/package/emulators/citra/citra.mk b/package/batocera/emulators/citra/citra.mk similarity index 95% rename from package/emulators/citra/citra.mk rename to package/batocera/emulators/citra/citra.mk index 7101f984bc6..865c6e4b5fc 100644 --- a/package/emulators/citra/citra.mk +++ b/package/batocera/emulators/citra/citra.mk @@ -54,7 +54,7 @@ endef define CITRA_EVMAP mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp -prn $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/citra/3ds.citra.keys \ + cp -prn $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/citra/3ds.citra.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/emulators/demul/Config.in b/package/batocera/emulators/demul/Config.in similarity index 100% rename from package/emulators/demul/Config.in rename to package/batocera/emulators/demul/Config.in diff --git a/package/emulators/demul/cave3rd.demul.keys b/package/batocera/emulators/demul/cave3rd.demul.keys similarity index 100% rename from package/emulators/demul/cave3rd.demul.keys rename to package/batocera/emulators/demul/cave3rd.demul.keys diff --git a/package/emulators/demul/demul.mk b/package/batocera/emulators/demul/demul.mk similarity index 71% rename from package/emulators/demul/demul.mk rename to package/batocera/emulators/demul/demul.mk index e3d6a09c327..6be0c26ede5 100644 --- a/package/emulators/demul/demul.mk +++ b/package/batocera/emulators/demul/demul.mk @@ -20,12 +20,12 @@ define DEMUL_INSTALL_TARGET_CMDS cp -pr $(@D) $(TARGET_DIR)/usr/demul # copy english faq & evmap config - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/demul/faq_en.txt $(TARGET_DIR)/usr/demul/ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/demul/faq_en.txt $(TARGET_DIR)/usr/demul/ mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/demul/*.keys $(TARGET_DIR)/usr/share/evmapy + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/demul/*.keys $(TARGET_DIR)/usr/share/evmapy # copy modified pad ini file for 2 players - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/demul/padDemul.ini $(TARGET_DIR)/usr/demul/ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/demul/padDemul.ini $(TARGET_DIR)/usr/demul/ endef $(eval $(generic-package)) diff --git a/package/emulators/demul/dreamcast.demul.keys b/package/batocera/emulators/demul/dreamcast.demul.keys similarity index 100% rename from package/emulators/demul/dreamcast.demul.keys rename to package/batocera/emulators/demul/dreamcast.demul.keys diff --git a/package/emulators/demul/faq_en.txt b/package/batocera/emulators/demul/faq_en.txt similarity index 100% rename from package/emulators/demul/faq_en.txt rename to package/batocera/emulators/demul/faq_en.txt diff --git a/package/emulators/demul/gaelco.demul.keys b/package/batocera/emulators/demul/gaelco.demul.keys similarity index 100% rename from package/emulators/demul/gaelco.demul.keys rename to package/batocera/emulators/demul/gaelco.demul.keys diff --git a/package/emulators/demul/hikaru.demul.keys b/package/batocera/emulators/demul/hikaru.demul.keys similarity index 100% rename from package/emulators/demul/hikaru.demul.keys rename to package/batocera/emulators/demul/hikaru.demul.keys diff --git a/package/emulators/demul/naomi.demul.keys b/package/batocera/emulators/demul/naomi.demul.keys similarity index 100% rename from package/emulators/demul/naomi.demul.keys rename to package/batocera/emulators/demul/naomi.demul.keys diff --git a/package/emulators/demul/naomi2.demul.keys b/package/batocera/emulators/demul/naomi2.demul.keys similarity index 100% rename from package/emulators/demul/naomi2.demul.keys rename to package/batocera/emulators/demul/naomi2.demul.keys diff --git a/package/emulators/demul/padDemul.ini b/package/batocera/emulators/demul/padDemul.ini similarity index 100% rename from package/emulators/demul/padDemul.ini rename to package/batocera/emulators/demul/padDemul.ini diff --git a/package/emulators/dolphin-triforce/Config.in b/package/batocera/emulators/dolphin-triforce/Config.in similarity index 100% rename from package/emulators/dolphin-triforce/Config.in rename to package/batocera/emulators/dolphin-triforce/Config.in diff --git a/package/emulators/dolphin-triforce/dolphin-triforce.AppImage b/package/batocera/emulators/dolphin-triforce/dolphin-triforce.AppImage similarity index 100% rename from package/emulators/dolphin-triforce/dolphin-triforce.AppImage rename to package/batocera/emulators/dolphin-triforce/dolphin-triforce.AppImage diff --git a/package/emulators/dolphin-triforce/dolphin-triforce.mk b/package/batocera/emulators/dolphin-triforce/dolphin-triforce.mk similarity index 76% rename from package/emulators/dolphin-triforce/dolphin-triforce.mk rename to package/batocera/emulators/dolphin-triforce/dolphin-triforce.mk index 10b812d614c..0ba077ec513 100644 --- a/package/emulators/dolphin-triforce/dolphin-triforce.mk +++ b/package/batocera/emulators/dolphin-triforce/dolphin-triforce.mk @@ -7,7 +7,7 @@ # Site https://dolphin-emu.org/download/list/Triforce/1/ # Source https://github.com/EIGHTFINITE/dolphin-triforce # Dolphin version: 4.0-315 -DOLPHIN_TRIFORCE_SOURCE = +DOLPHIN_TRIFORCE_SOURCE = DOLPHIN_TRIFORCE_VERSION = 1.0.0-001 DOLPHIN_TRIFORCE_LICENSE = GPLv2+ @@ -18,14 +18,14 @@ endif # Includes custom game configs required to successfully launch and play them. define DOLPHIN_TRIFORCE_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/bin - $(INSTALL) -D -m 0555 "$(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/dolphin-triforce/dolphin-triforce.AppImage" "${TARGET_DIR}/usr/bin/dolphin-triforce" + $(INSTALL) -D -m 0555 "$(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/dolphin-triforce/dolphin-triforce.AppImage" "${TARGET_DIR}/usr/bin/dolphin-triforce" endef # Hotkeys (non-functional at the moment) define DOLPHIN_TRIFORCE_EVMAP mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp -prn $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/dolphin-triforce/triforce.dolphin_triforce.keys \ + cp -prn $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/dolphin-triforce/triforce.dolphin_triforce.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/emulators/dolphin-triforce/triforce.dolphin_triforce.keys b/package/batocera/emulators/dolphin-triforce/triforce.dolphin_triforce.keys similarity index 100% rename from package/emulators/dolphin-triforce/triforce.dolphin_triforce.keys rename to package/batocera/emulators/dolphin-triforce/triforce.dolphin_triforce.keys diff --git a/package/emulators/dosbox-staging/000-no_wrap.patch b/package/batocera/emulators/dosbox-staging/000-no_wrap.patch similarity index 100% rename from package/emulators/dosbox-staging/000-no_wrap.patch rename to package/batocera/emulators/dosbox-staging/000-no_wrap.patch diff --git a/package/emulators/dosbox-staging/001-disable-pagesize-testing.patch b/package/batocera/emulators/dosbox-staging/001-disable-pagesize-testing.patch similarity index 100% rename from package/emulators/dosbox-staging/001-disable-pagesize-testing.patch rename to package/batocera/emulators/dosbox-staging/001-disable-pagesize-testing.patch diff --git a/package/emulators/dosbox-staging/002-disable-neon-sse2-ssse3-testing.patch b/package/batocera/emulators/dosbox-staging/002-disable-neon-sse2-ssse3-testing.patch similarity index 100% rename from package/emulators/dosbox-staging/002-disable-neon-sse2-ssse3-testing.patch rename to package/batocera/emulators/dosbox-staging/002-disable-neon-sse2-ssse3-testing.patch diff --git a/package/emulators/dosbox-staging/Config.in b/package/batocera/emulators/dosbox-staging/Config.in similarity index 100% rename from package/emulators/dosbox-staging/Config.in rename to package/batocera/emulators/dosbox-staging/Config.in diff --git a/package/emulators/dosbox-staging/dosbox-staging.mk b/package/batocera/emulators/dosbox-staging/dosbox-staging.mk similarity index 100% rename from package/emulators/dosbox-staging/dosbox-staging.mk rename to package/batocera/emulators/dosbox-staging/dosbox-staging.mk diff --git a/package/emulators/dosbox-x/000-arm_configure.patch b/package/batocera/emulators/dosbox-x/000-arm_configure.patch similarity index 100% rename from package/emulators/dosbox-x/000-arm_configure.patch rename to package/batocera/emulators/dosbox-x/000-arm_configure.patch diff --git a/package/emulators/dosbox-x/001-sdl-config.patch b/package/batocera/emulators/dosbox-x/001-sdl-config.patch similarity index 100% rename from package/emulators/dosbox-x/001-sdl-config.patch rename to package/batocera/emulators/dosbox-x/001-sdl-config.patch diff --git a/package/emulators/dosbox-x/002-map_mouse.patch b/package/batocera/emulators/dosbox-x/002-map_mouse.patch similarity index 100% rename from package/emulators/dosbox-x/002-map_mouse.patch rename to package/batocera/emulators/dosbox-x/002-map_mouse.patch diff --git a/package/emulators/dosbox-x/003-dosboxconf.patch b/package/batocera/emulators/dosbox-x/003-dosboxconf.patch similarity index 100% rename from package/emulators/dosbox-x/003-dosboxconf.patch rename to package/batocera/emulators/dosbox-x/003-dosboxconf.patch diff --git a/package/emulators/dosbox-x/004-arrach-MT32.patch b/package/batocera/emulators/dosbox-x/004-arrach-MT32.patch similarity index 100% rename from package/emulators/dosbox-x/004-arrach-MT32.patch rename to package/batocera/emulators/dosbox-x/004-arrach-MT32.patch diff --git a/package/emulators/dosbox-x/Config.in b/package/batocera/emulators/dosbox-x/Config.in similarity index 100% rename from package/emulators/dosbox-x/Config.in rename to package/batocera/emulators/dosbox-x/Config.in diff --git a/package/emulators/dosbox-x/dos.dosbox-x.keys b/package/batocera/emulators/dosbox-x/dos.dosbox-x.keys similarity index 100% rename from package/emulators/dosbox-x/dos.dosbox-x.keys rename to package/batocera/emulators/dosbox-x/dos.dosbox-x.keys diff --git a/package/emulators/dosbox-x/dosbox-x.mk b/package/batocera/emulators/dosbox-x/dosbox-x.mk similarity index 100% rename from package/emulators/dosbox-x/dosbox-x.mk rename to package/batocera/emulators/dosbox-x/dosbox-x.mk diff --git a/package/emulators/drastic/Config.in b/package/batocera/emulators/drastic/Config.in similarity index 100% rename from package/emulators/drastic/Config.in rename to package/batocera/emulators/drastic/Config.in diff --git a/package/emulators/drastic/controllers/nds.drastic.keys b/package/batocera/emulators/drastic/controllers/nds.drastic.keys similarity index 100% rename from package/emulators/drastic/controllers/nds.drastic.keys rename to package/batocera/emulators/drastic/controllers/nds.drastic.keys diff --git a/package/emulators/drastic/drastic.hash b/package/batocera/emulators/drastic/drastic.hash similarity index 100% rename from package/emulators/drastic/drastic.hash rename to package/batocera/emulators/drastic/drastic.hash diff --git a/package/emulators/drastic/drastic.mk b/package/batocera/emulators/drastic/drastic.mk similarity index 88% rename from package/emulators/drastic/drastic.mk rename to package/batocera/emulators/drastic/drastic.mk index d88c6936177..b9688a156e1 100644 --- a/package/emulators/drastic/drastic.mk +++ b/package/batocera/emulators/drastic/drastic.mk @@ -31,7 +31,7 @@ define DRASTIC_INSTALL_TARGET_CMDS cp -pr $(@D)/target/drastic $(TARGET_DIR)/usr/share/drastic # evmap config - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/drastic/controllers/nds.drastic.keys $(TARGET_DIR)/usr/share/evmapy + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/drastic/controllers/nds.drastic.keys $(TARGET_DIR)/usr/share/evmapy endef $(eval $(generic-package)) diff --git a/package/emulators/duckstation-legacy/000-fix-cmake.patch b/package/batocera/emulators/duckstation-legacy/000-fix-cmake.patch similarity index 100% rename from package/emulators/duckstation-legacy/000-fix-cmake.patch rename to package/batocera/emulators/duckstation-legacy/000-fix-cmake.patch diff --git a/package/emulators/duckstation-legacy/001-path-program.patch b/package/batocera/emulators/duckstation-legacy/001-path-program.patch similarity index 100% rename from package/emulators/duckstation-legacy/001-path-program.patch rename to package/batocera/emulators/duckstation-legacy/001-path-program.patch diff --git a/package/emulators/duckstation-legacy/002-path-getdirectory.patch b/package/batocera/emulators/duckstation-legacy/002-path-getdirectory.patch similarity index 100% rename from package/emulators/duckstation-legacy/002-path-getdirectory.patch rename to package/batocera/emulators/duckstation-legacy/002-path-getdirectory.patch diff --git a/package/emulators/duckstation-legacy/003-path-language.patch b/package/batocera/emulators/duckstation-legacy/003-path-language.patch similarity index 100% rename from package/emulators/duckstation-legacy/003-path-language.patch rename to package/batocera/emulators/duckstation-legacy/003-path-language.patch diff --git a/package/emulators/duckstation-legacy/004-adjust-paths.patch b/package/batocera/emulators/duckstation-legacy/004-adjust-paths.patch similarity index 100% rename from package/emulators/duckstation-legacy/004-adjust-paths.patch rename to package/batocera/emulators/duckstation-legacy/004-adjust-paths.patch diff --git a/package/emulators/duckstation-legacy/005-drm-resolution.patch b/package/batocera/emulators/duckstation-legacy/005-drm-resolution.patch similarity index 100% rename from package/emulators/duckstation-legacy/005-drm-resolution.patch rename to package/batocera/emulators/duckstation-legacy/005-drm-resolution.patch diff --git a/package/emulators/duckstation-legacy/006-wayland-fullscreen.patch b/package/batocera/emulators/duckstation-legacy/006-wayland-fullscreen.patch similarity index 100% rename from package/emulators/duckstation-legacy/006-wayland-fullscreen.patch rename to package/batocera/emulators/duckstation-legacy/006-wayland-fullscreen.patch diff --git a/package/emulators/duckstation-legacy/007-drm-conn.patch b/package/batocera/emulators/duckstation-legacy/007-drm-conn.patch similarity index 100% rename from package/emulators/duckstation-legacy/007-drm-conn.patch rename to package/batocera/emulators/duckstation-legacy/007-drm-conn.patch diff --git a/package/emulators/duckstation-legacy/008-fix-evdev.patch b/package/batocera/emulators/duckstation-legacy/008-fix-evdev.patch similarity index 100% rename from package/emulators/duckstation-legacy/008-fix-evdev.patch rename to package/batocera/emulators/duckstation-legacy/008-fix-evdev.patch diff --git a/package/emulators/duckstation-legacy/Config.in b/package/batocera/emulators/duckstation-legacy/Config.in similarity index 100% rename from package/emulators/duckstation-legacy/Config.in rename to package/batocera/emulators/duckstation-legacy/Config.in diff --git a/package/emulators/duckstation-legacy/duckstation-legacy.mk b/package/batocera/emulators/duckstation-legacy/duckstation-legacy.mk similarity index 96% rename from package/emulators/duckstation-legacy/duckstation-legacy.mk rename to package/batocera/emulators/duckstation-legacy/duckstation-legacy.mk index 665786f88cb..89964b7f86b 100644 --- a/package/emulators/duckstation-legacy/duckstation-legacy.mk +++ b/package/batocera/emulators/duckstation-legacy/duckstation-legacy.mk @@ -73,7 +73,7 @@ define DUCKSTATION_LEGACY_INSTALL_TARGET_CMDS rm -f $(TARGET_DIR)/usr/share/duckstation/resources/gamecontrollerdb.txt mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/duckstation-legacy/psx.duckstation.keys \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/duckstation-legacy/psx.duckstation.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/emulators/duckstation-legacy/psx.duckstation.keys b/package/batocera/emulators/duckstation-legacy/psx.duckstation.keys similarity index 100% rename from package/emulators/duckstation-legacy/psx.duckstation.keys rename to package/batocera/emulators/duckstation-legacy/psx.duckstation.keys diff --git a/package/emulators/easyrpg/easyrpg-player/Config.in b/package/batocera/emulators/easyrpg/easyrpg-player/Config.in similarity index 100% rename from package/emulators/easyrpg/easyrpg-player/Config.in rename to package/batocera/emulators/easyrpg/easyrpg-player/Config.in diff --git a/package/emulators/easyrpg/easyrpg-player/easyrpg-player.mk b/package/batocera/emulators/easyrpg/easyrpg-player/easyrpg-player.mk similarity index 91% rename from package/emulators/easyrpg/easyrpg-player/easyrpg-player.mk rename to package/batocera/emulators/easyrpg/easyrpg-player/easyrpg-player.mk index 890980bc44e..66fbf38af9b 100644 --- a/package/emulators/easyrpg/easyrpg-player/easyrpg-player.mk +++ b/package/batocera/emulators/easyrpg/easyrpg-player/easyrpg-player.mk @@ -27,7 +27,7 @@ EASYRPG_PLAYER_CONF_ENV += LDFLAGS=-lpthread define EASYRPG_PLAYER_EVMAPY mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/easyrpg/easyrpg-player/easyrpg.easyrpg.keys \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/easyrpg/easyrpg-player/easyrpg.easyrpg.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/emulators/easyrpg/easyrpg-player/easyrpg.easyrpg.keys b/package/batocera/emulators/easyrpg/easyrpg-player/easyrpg.easyrpg.keys similarity index 100% rename from package/emulators/easyrpg/easyrpg-player/easyrpg.easyrpg.keys rename to package/batocera/emulators/easyrpg/easyrpg-player/easyrpg.easyrpg.keys diff --git a/package/emulators/easyrpg/liblcf/Config.in b/package/batocera/emulators/easyrpg/liblcf/Config.in similarity index 100% rename from package/emulators/easyrpg/liblcf/Config.in rename to package/batocera/emulators/easyrpg/liblcf/Config.in diff --git a/package/emulators/easyrpg/liblcf/liblcf.mk b/package/batocera/emulators/easyrpg/liblcf/liblcf.mk similarity index 100% rename from package/emulators/easyrpg/liblcf/liblcf.mk rename to package/batocera/emulators/easyrpg/liblcf/liblcf.mk diff --git a/package/emulators/flycast/000-makefile-additions.patch b/package/batocera/emulators/flycast/000-makefile-additions.patch similarity index 100% rename from package/emulators/flycast/000-makefile-additions.patch rename to package/batocera/emulators/flycast/000-makefile-additions.patch diff --git a/package/emulators/flycast/Config.in b/package/batocera/emulators/flycast/Config.in similarity index 100% rename from package/emulators/flycast/Config.in rename to package/batocera/emulators/flycast/Config.in diff --git a/package/emulators/flycast/atomiswave.flycast.keys b/package/batocera/emulators/flycast/atomiswave.flycast.keys similarity index 100% rename from package/emulators/flycast/atomiswave.flycast.keys rename to package/batocera/emulators/flycast/atomiswave.flycast.keys diff --git a/package/emulators/flycast/dreamcast.flycast.keys b/package/batocera/emulators/flycast/dreamcast.flycast.keys similarity index 100% rename from package/emulators/flycast/dreamcast.flycast.keys rename to package/batocera/emulators/flycast/dreamcast.flycast.keys diff --git a/package/emulators/flycast/flycast.mk b/package/batocera/emulators/flycast/flycast.mk similarity index 94% rename from package/emulators/flycast/flycast.mk rename to package/batocera/emulators/flycast/flycast.mk index 61594c1e2e9..2dda88a98e1 100644 --- a/package/emulators/flycast/flycast.mk +++ b/package/batocera/emulators/flycast/flycast.mk @@ -56,7 +56,7 @@ define FLYCAST_INSTALL_TARGET_CMDS $(INSTALL) -D $(@D)/buildroot-build/flycast $(TARGET_DIR)/usr/bin/flycast # evmapy files mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/flycast/*.keys $(TARGET_DIR)/usr/share/evmapy + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/flycast/*.keys $(TARGET_DIR)/usr/share/evmapy endef $(eval $(cmake-package)) diff --git a/package/emulators/flycast/naomi.flycast.keys b/package/batocera/emulators/flycast/naomi.flycast.keys similarity index 100% rename from package/emulators/flycast/naomi.flycast.keys rename to package/batocera/emulators/flycast/naomi.flycast.keys diff --git a/package/emulators/flycast/naomi2.flycast.keys b/package/batocera/emulators/flycast/naomi2.flycast.keys similarity index 100% rename from package/emulators/flycast/naomi2.flycast.keys rename to package/batocera/emulators/flycast/naomi2.flycast.keys diff --git a/package/emulators/fpinball/Config.in b/package/batocera/emulators/fpinball/Config.in similarity index 100% rename from package/emulators/fpinball/Config.in rename to package/batocera/emulators/fpinball/Config.in diff --git a/package/emulators/fpinball/fpinball.hash b/package/batocera/emulators/fpinball/fpinball.hash similarity index 100% rename from package/emulators/fpinball/fpinball.hash rename to package/batocera/emulators/fpinball/fpinball.hash diff --git a/package/emulators/fpinball/fpinball.keys b/package/batocera/emulators/fpinball/fpinball.keys similarity index 100% rename from package/emulators/fpinball/fpinball.keys rename to package/batocera/emulators/fpinball/fpinball.keys diff --git a/package/emulators/fpinball/fpinball.mk b/package/batocera/emulators/fpinball/fpinball.mk similarity index 91% rename from package/emulators/fpinball/fpinball.mk rename to package/batocera/emulators/fpinball/fpinball.mk index 8d4b4248323..63f79cc2529 100644 --- a/package/emulators/fpinball/fpinball.mk +++ b/package/batocera/emulators/fpinball/fpinball.mk @@ -25,7 +25,7 @@ define FPINBALL_INSTALL_TARGET_CMDS #evmap config mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp -prn $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/fpinball/fpinball.keys \ + cp -prn $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/fpinball/fpinball.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/emulators/fsuae/001-fsuae-static.patch b/package/batocera/emulators/fsuae/001-fsuae-static.patch similarity index 100% rename from package/emulators/fsuae/001-fsuae-static.patch rename to package/batocera/emulators/fsuae/001-fsuae-static.patch diff --git a/package/emulators/fsuae/002-fsuae-gen.patch b/package/batocera/emulators/fsuae/002-fsuae-gen.patch similarity index 100% rename from package/emulators/fsuae/002-fsuae-gen.patch rename to package/batocera/emulators/fsuae/002-fsuae-gen.patch diff --git a/package/emulators/fsuae/003-fsuae-joystick-guid.patch b/package/batocera/emulators/fsuae/003-fsuae-joystick-guid.patch similarity index 100% rename from package/emulators/fsuae/003-fsuae-joystick-guid.patch rename to package/batocera/emulators/fsuae/003-fsuae-joystick-guid.patch diff --git a/package/emulators/fsuae/004-plugin-dir.patch b/package/batocera/emulators/fsuae/004-plugin-dir.patch similarity index 100% rename from package/emulators/fsuae/004-plugin-dir.patch rename to package/batocera/emulators/fsuae/004-plugin-dir.patch diff --git a/package/emulators/fsuae/Config.in b/package/batocera/emulators/fsuae/Config.in similarity index 100% rename from package/emulators/fsuae/Config.in rename to package/batocera/emulators/fsuae/Config.in diff --git a/package/emulators/fsuae/amiga1200.fsuae.keys b/package/batocera/emulators/fsuae/amiga1200.fsuae.keys similarity index 100% rename from package/emulators/fsuae/amiga1200.fsuae.keys rename to package/batocera/emulators/fsuae/amiga1200.fsuae.keys diff --git a/package/emulators/fsuae/amiga500.fsuae.keys b/package/batocera/emulators/fsuae/amiga500.fsuae.keys similarity index 100% rename from package/emulators/fsuae/amiga500.fsuae.keys rename to package/batocera/emulators/fsuae/amiga500.fsuae.keys diff --git a/package/emulators/fsuae/amigacd32.fsuae.keys b/package/batocera/emulators/fsuae/amigacd32.fsuae.keys similarity index 100% rename from package/emulators/fsuae/amigacd32.fsuae.keys rename to package/batocera/emulators/fsuae/amigacd32.fsuae.keys diff --git a/package/emulators/fsuae/amigacdtv.fsuae.keys b/package/batocera/emulators/fsuae/amigacdtv.fsuae.keys similarity index 100% rename from package/emulators/fsuae/amigacdtv.fsuae.keys rename to package/batocera/emulators/fsuae/amigacdtv.fsuae.keys diff --git a/package/emulators/fsuae/fsuae.mk b/package/batocera/emulators/fsuae/fsuae.mk similarity index 91% rename from package/emulators/fsuae/fsuae.mk rename to package/batocera/emulators/fsuae/fsuae.mk index 2a1d0e3efca..8c3e9c8c42c 100644 --- a/package/emulators/fsuae/fsuae.mk +++ b/package/batocera/emulators/fsuae/fsuae.mk @@ -20,7 +20,7 @@ FSUAE_PRE_CONFIGURE_HOOKS += FSUAE_HOOK_BOOTSTRAP define FSUAE_INSTALL_EVMAPY mkdir -p $(TARGET_DIR)/usr/share/evmapy $(INSTALL) -D -m 0644 \ - $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/fsuae/*.keys \ + $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/fsuae/*.keys \ $(TARGET_DIR)/usr/share/evmapy/ endef diff --git a/package/emulators/gsplus/001-paths.patch b/package/batocera/emulators/gsplus/001-paths.patch similarity index 100% rename from package/emulators/gsplus/001-paths.patch rename to package/batocera/emulators/gsplus/001-paths.patch diff --git a/package/emulators/gsplus/Config.in b/package/batocera/emulators/gsplus/Config.in similarity index 100% rename from package/emulators/gsplus/Config.in rename to package/batocera/emulators/gsplus/Config.in diff --git a/package/emulators/gsplus/apple2gs.gsplus.keys b/package/batocera/emulators/gsplus/apple2gs.gsplus.keys similarity index 100% rename from package/emulators/gsplus/apple2gs.gsplus.keys rename to package/batocera/emulators/gsplus/apple2gs.gsplus.keys diff --git a/package/emulators/gsplus/gsplus.mk b/package/batocera/emulators/gsplus/gsplus.mk similarity index 85% rename from package/emulators/gsplus/gsplus.mk rename to package/batocera/emulators/gsplus/gsplus.mk index 771785fe422..77fcdfcfdba 100644 --- a/package/emulators/gsplus/gsplus.mk +++ b/package/batocera/emulators/gsplus/gsplus.mk @@ -13,7 +13,7 @@ define GSPLUS_INSTALL_TARGET_CMDS $(INSTALL) -D $(@D)/bin/GSplus $(TARGET_DIR)/usr/bin/ $(INSTALL) -D $(@D)/bin/libx_readline.so $(TARGET_DIR)/usr/lib/ mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/gsplus/apple2gs.gsplus.keys $(TARGET_DIR)/usr/share/evmapy/ + cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/gsplus/apple2gs.gsplus.keys $(TARGET_DIR)/usr/share/evmapy/ cd $(TARGET_DIR)/usr/share/evmapy && ln -sf apple2gs.gsplus.keys apple2.gsplus.keys endef diff --git a/package/emulators/hatari/001-tospath.patch b/package/batocera/emulators/hatari/001-tospath.patch similarity index 100% rename from package/emulators/hatari/001-tospath.patch rename to package/batocera/emulators/hatari/001-tospath.patch diff --git a/package/emulators/hatari/002-configpath.patch b/package/batocera/emulators/hatari/002-configpath.patch similarity index 100% rename from package/emulators/hatari/002-configpath.patch rename to package/batocera/emulators/hatari/002-configpath.patch diff --git a/package/emulators/hatari/Config.in b/package/batocera/emulators/hatari/Config.in similarity index 100% rename from package/emulators/hatari/Config.in rename to package/batocera/emulators/hatari/Config.in diff --git a/package/emulators/hatari/atarist.hatari.keys b/package/batocera/emulators/hatari/atarist.hatari.keys similarity index 100% rename from package/emulators/hatari/atarist.hatari.keys rename to package/batocera/emulators/hatari/atarist.hatari.keys diff --git a/package/emulators/hatari/hatari.mk b/package/batocera/emulators/hatari/hatari.mk similarity index 91% rename from package/emulators/hatari/hatari.mk rename to package/batocera/emulators/hatari/hatari.mk index 5b543476d1c..38823b8ccfe 100644 --- a/package/emulators/hatari/hatari.mk +++ b/package/batocera/emulators/hatari/hatari.mk @@ -23,7 +23,7 @@ endef define HATARI_INSTALL_EVMAPY mkdir -p $(TARGET_DIR)/usr/share/evmapy $(INSTALL) -D -m 0644 \ - $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/hatari/atarist.hatari.keys \ + $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/hatari/atarist.hatari.keys \ $(TARGET_DIR)/usr/share/evmapy/atarist.hatari.keys endef diff --git a/package/emulators/hypseus-singe/001-git-fix.patch b/package/batocera/emulators/hypseus-singe/001-git-fix.patch similarity index 100% rename from package/emulators/hypseus-singe/001-git-fix.patch rename to package/batocera/emulators/hypseus-singe/001-git-fix.patch diff --git a/package/emulators/hypseus-singe/002-mpeg2.patch b/package/batocera/emulators/hypseus-singe/002-mpeg2.patch similarity index 100% rename from package/emulators/hypseus-singe/002-mpeg2.patch rename to package/batocera/emulators/hypseus-singe/002-mpeg2.patch diff --git a/package/emulators/hypseus-singe/003-romdir.patch b/package/batocera/emulators/hypseus-singe/003-romdir.patch similarity index 100% rename from package/emulators/hypseus-singe/003-romdir.patch rename to package/batocera/emulators/hypseus-singe/003-romdir.patch diff --git a/package/emulators/hypseus-singe/004-fix-singe.patch b/package/batocera/emulators/hypseus-singe/004-fix-singe.patch similarity index 100% rename from package/emulators/hypseus-singe/004-fix-singe.patch rename to package/batocera/emulators/hypseus-singe/004-fix-singe.patch diff --git a/package/emulators/hypseus-singe/005-hyseus-udev-proper-gun-detection.patch b/package/batocera/emulators/hypseus-singe/005-hyseus-udev-proper-gun-detection.patch similarity index 100% rename from package/emulators/hypseus-singe/005-hyseus-udev-proper-gun-detection.patch rename to package/batocera/emulators/hypseus-singe/005-hyseus-udev-proper-gun-detection.patch diff --git a/package/emulators/hypseus-singe/006-render-sinden-last.patch b/package/batocera/emulators/hypseus-singe/006-render-sinden-last.patch similarity index 100% rename from package/emulators/hypseus-singe/006-render-sinden-last.patch rename to package/batocera/emulators/hypseus-singe/006-render-sinden-last.patch diff --git a/package/emulators/hypseus-singe/007-udev-event-no-read-if-no-sdlevent.patch b/package/batocera/emulators/hypseus-singe/007-udev-event-no-read-if-no-sdlevent.patch similarity index 100% rename from package/emulators/hypseus-singe/007-udev-event-no-read-if-no-sdlevent.patch rename to package/batocera/emulators/hypseus-singe/007-udev-event-no-read-if-no-sdlevent.patch diff --git a/package/emulators/hypseus-singe/008-vldpGetScale.patch b/package/batocera/emulators/hypseus-singe/008-vldpGetScale.patch similarity index 100% rename from package/emulators/hypseus-singe/008-vldpGetScale.patch rename to package/batocera/emulators/hypseus-singe/008-vldpGetScale.patch diff --git a/package/emulators/hypseus-singe/Config.in b/package/batocera/emulators/hypseus-singe/Config.in similarity index 100% rename from package/emulators/hypseus-singe/Config.in rename to package/batocera/emulators/hypseus-singe/Config.in diff --git a/package/emulators/hypseus-singe/daphne.hypseus-singe.keys b/package/batocera/emulators/hypseus-singe/daphne.hypseus-singe.keys similarity index 100% rename from package/emulators/hypseus-singe/daphne.hypseus-singe.keys rename to package/batocera/emulators/hypseus-singe/daphne.hypseus-singe.keys diff --git a/package/emulators/hypseus-singe/hypseus-singe.hash b/package/batocera/emulators/hypseus-singe/hypseus-singe.hash similarity index 100% rename from package/emulators/hypseus-singe/hypseus-singe.hash rename to package/batocera/emulators/hypseus-singe/hypseus-singe.hash diff --git a/package/emulators/hypseus-singe/hypseus-singe.mk b/package/batocera/emulators/hypseus-singe/hypseus-singe.mk similarity index 92% rename from package/emulators/hypseus-singe/hypseus-singe.mk rename to package/batocera/emulators/hypseus-singe/hypseus-singe.mk index 93faf493bba..dfed5960d49 100644 --- a/package/emulators/hypseus-singe/hypseus-singe.mk +++ b/package/batocera/emulators/hypseus-singe/hypseus-singe.mk @@ -25,7 +25,7 @@ define HYPSEUS_SINGE_INSTALL_TARGET_CMDS #evmap config mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/hypseus-singe/*.keys \ + cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/hypseus-singe/*.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/emulators/hypseus-singe/singe.hypseus-singe.keys b/package/batocera/emulators/hypseus-singe/singe.hypseus-singe.keys similarity index 100% rename from package/emulators/hypseus-singe/singe.hypseus-singe.keys rename to package/batocera/emulators/hypseus-singe/singe.hypseus-singe.keys diff --git a/package/emulators/ikemen/Config.in b/package/batocera/emulators/ikemen/Config.in similarity index 100% rename from package/emulators/ikemen/Config.in rename to package/batocera/emulators/ikemen/Config.in diff --git a/package/emulators/ikemen/ikemen.keys b/package/batocera/emulators/ikemen/ikemen.keys similarity index 100% rename from package/emulators/ikemen/ikemen.keys rename to package/batocera/emulators/ikemen/ikemen.keys diff --git a/package/emulators/ikemen/ikemen.mk b/package/batocera/emulators/ikemen/ikemen.mk similarity index 93% rename from package/emulators/ikemen/ikemen.mk rename to package/batocera/emulators/ikemen/ikemen.mk index b0dcd45ccb2..a7d6002c578 100644 --- a/package/emulators/ikemen/ikemen.mk +++ b/package/batocera/emulators/ikemen/ikemen.mk @@ -32,7 +32,7 @@ define IKEMEN_INSTALL_TARGET_CMDS $(INSTALL) -D $(@D)/bin/Ikemen_GO_Linux $(TARGET_DIR)/usr/bin/ikemen # evmapy mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/ikemen/ikemen.keys \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/ikemen/ikemen.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/emulators/lexaloffle-pico8/Config.in b/package/batocera/emulators/lexaloffle-pico8/Config.in similarity index 100% rename from package/emulators/lexaloffle-pico8/Config.in rename to package/batocera/emulators/lexaloffle-pico8/Config.in diff --git a/package/emulators/lexaloffle-pico8/lexaloffle-pico8.mk b/package/batocera/emulators/lexaloffle-pico8/lexaloffle-pico8.mk similarity index 73% rename from package/emulators/lexaloffle-pico8/lexaloffle-pico8.mk rename to package/batocera/emulators/lexaloffle-pico8/lexaloffle-pico8.mk index 7c6d4e767f6..73c315c69eb 100644 --- a/package/emulators/lexaloffle-pico8/lexaloffle-pico8.mk +++ b/package/batocera/emulators/lexaloffle-pico8/lexaloffle-pico8.mk @@ -1,15 +1,15 @@ ################################################################################ # -# Pico-8 official virtuel console (needs the binary, not part of Batocera) +# Pico-8 official virtuel console (needs the binary, not part of Batocera) # ################################################################################ LEXALOFFLE_PICO8_VERSION = 0.1 LEXALOFFLE_PICO8_LICENSE = proprietary-commercial -LEXALOFFLE_PICO8_SOURCE = +LEXALOFFLE_PICO8_SOURCE = define LEXALOFFLE_PICO8_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/lexaloffle-pico8/pico8.keys $(TARGET_DIR)/usr/share/evmapy + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/lexaloffle-pico8/pico8.keys $(TARGET_DIR)/usr/share/evmapy endef $(eval $(generic-package)) diff --git a/package/emulators/lexaloffle-pico8/pico8.keys b/package/batocera/emulators/lexaloffle-pico8/pico8.keys similarity index 100% rename from package/emulators/lexaloffle-pico8/pico8.keys rename to package/batocera/emulators/lexaloffle-pico8/pico8.keys diff --git a/package/emulators/lexaloffle-voxatron/Config.in b/package/batocera/emulators/lexaloffle-voxatron/Config.in similarity index 100% rename from package/emulators/lexaloffle-voxatron/Config.in rename to package/batocera/emulators/lexaloffle-voxatron/Config.in diff --git a/package/emulators/lexaloffle-voxatron/lexaloffle-voxatron.mk b/package/batocera/emulators/lexaloffle-voxatron/lexaloffle-voxatron.mk similarity index 72% rename from package/emulators/lexaloffle-voxatron/lexaloffle-voxatron.mk rename to package/batocera/emulators/lexaloffle-voxatron/lexaloffle-voxatron.mk index db5293b70f2..bce2dbc5e68 100644 --- a/package/emulators/lexaloffle-voxatron/lexaloffle-voxatron.mk +++ b/package/batocera/emulators/lexaloffle-voxatron/lexaloffle-voxatron.mk @@ -1,15 +1,15 @@ ################################################################################ # -# Voxatron official virtuel console (needs the binary, not part of Batocera) +# Voxatron official virtuel console (needs the binary, not part of Batocera) # ################################################################################ LEXALOFFLE_VOXATRON_VERSION = 0.1 LEXALOFFLE_VOXATRON_LICENSE = proprietary-commercial -LEXALOFFLE_VOXATRON_SOURCE = +LEXALOFFLE_VOXATRON_SOURCE = define LEXALOFFLE_VOXATRON_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/lexaloffle-voxatron/voxatron.keys $(TARGET_DIR)/usr/share/evmapy + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/lexaloffle-voxatron/voxatron.keys $(TARGET_DIR)/usr/share/evmapy endef $(eval $(generic-package)) diff --git a/package/emulators/lexaloffle-voxatron/voxatron.keys b/package/batocera/emulators/lexaloffle-voxatron/voxatron.keys similarity index 100% rename from package/emulators/lexaloffle-voxatron/voxatron.keys rename to package/batocera/emulators/lexaloffle-voxatron/voxatron.keys diff --git a/package/emulators/lightspark/Config.in b/package/batocera/emulators/lightspark/Config.in similarity index 100% rename from package/emulators/lightspark/Config.in rename to package/batocera/emulators/lightspark/Config.in diff --git a/package/emulators/lightspark/flash.lightspark.keys b/package/batocera/emulators/lightspark/flash.lightspark.keys similarity index 100% rename from package/emulators/lightspark/flash.lightspark.keys rename to package/batocera/emulators/lightspark/flash.lightspark.keys diff --git a/package/emulators/lightspark/lightspark.mk b/package/batocera/emulators/lightspark/lightspark.mk similarity index 90% rename from package/emulators/lightspark/lightspark.mk rename to package/batocera/emulators/lightspark/lightspark.mk index 4808cae3567..bc1414238bc 100644 --- a/package/emulators/lightspark/lightspark.mk +++ b/package/batocera/emulators/lightspark/lightspark.mk @@ -29,7 +29,7 @@ define LIGHTSPARK_INSTALL_TARGET_CMDS # evmap config mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/lightspark/flash.lightspark.keys $(TARGET_DIR)/usr/share/evmapy + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/lightspark/flash.lightspark.keys $(TARGET_DIR)/usr/share/evmapy endef $(eval $(cmake-package)) diff --git a/package/emulators/lime3ds/001-fix-dynarmic-warnings-as-errors.patch b/package/batocera/emulators/lime3ds/001-fix-dynarmic-warnings-as-errors.patch similarity index 100% rename from package/emulators/lime3ds/001-fix-dynarmic-warnings-as-errors.patch rename to package/batocera/emulators/lime3ds/001-fix-dynarmic-warnings-as-errors.patch diff --git a/package/emulators/lime3ds/003-hack-cmake-no-warnings-as-errors.patch b/package/batocera/emulators/lime3ds/003-hack-cmake-no-warnings-as-errors.patch similarity index 100% rename from package/emulators/lime3ds/003-hack-cmake-no-warnings-as-errors.patch rename to package/batocera/emulators/lime3ds/003-hack-cmake-no-warnings-as-errors.patch diff --git a/package/emulators/lime3ds/3ds.lime3ds.keys b/package/batocera/emulators/lime3ds/3ds.lime3ds.keys similarity index 100% rename from package/emulators/lime3ds/3ds.lime3ds.keys rename to package/batocera/emulators/lime3ds/3ds.lime3ds.keys diff --git a/package/emulators/lime3ds/Config.in b/package/batocera/emulators/lime3ds/Config.in similarity index 100% rename from package/emulators/lime3ds/Config.in rename to package/batocera/emulators/lime3ds/Config.in diff --git a/package/emulators/lime3ds/lime3ds.mk b/package/batocera/emulators/lime3ds/lime3ds.mk similarity index 95% rename from package/emulators/lime3ds/lime3ds.mk rename to package/batocera/emulators/lime3ds/lime3ds.mk index c8fef49ff6a..5b0e2e6f4fc 100644 --- a/package/emulators/lime3ds/lime3ds.mk +++ b/package/batocera/emulators/lime3ds/lime3ds.mk @@ -53,7 +53,7 @@ endef define LIME3DS_EVMAP mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp -prn $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/lime3ds/3ds.lime3ds.keys \ + cp -prn $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/lime3ds/3ds.lime3ds.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/emulators/mame/001-mame-cross-compilation.patch b/package/batocera/emulators/mame/001-mame-cross-compilation.patch similarity index 100% rename from package/emulators/mame/001-mame-cross-compilation.patch rename to package/batocera/emulators/mame/001-mame-cross-compilation.patch diff --git a/package/emulators/mame/002-mame-no-nag-screens.patch b/package/batocera/emulators/mame/002-mame-no-nag-screens.patch similarity index 100% rename from package/emulators/mame/002-mame-no-nag-screens.patch rename to package/batocera/emulators/mame/002-mame-no-nag-screens.patch diff --git a/package/emulators/mame/003-vgmplay-layout-fix.patch b/package/batocera/emulators/mame/003-vgmplay-layout-fix.patch similarity index 100% rename from package/emulators/mame/003-vgmplay-layout-fix.patch rename to package/batocera/emulators/mame/003-vgmplay-layout-fix.patch diff --git a/package/emulators/mame/004-atom-hashfile-additions.patch b/package/batocera/emulators/mame/004-atom-hashfile-additions.patch similarity index 100% rename from package/emulators/mame/004-atom-hashfile-additions.patch rename to package/batocera/emulators/mame/004-atom-hashfile-additions.patch diff --git a/package/emulators/mame/005-lightgun-udev-driver.patch b/package/batocera/emulators/mame/005-lightgun-udev-driver.patch similarity index 100% rename from package/emulators/mame/005-lightgun-udev-driver.patch rename to package/batocera/emulators/mame/005-lightgun-udev-driver.patch diff --git a/package/emulators/mame/006-fix-sliver.patch b/package/batocera/emulators/mame/006-fix-sliver.patch similarity index 100% rename from package/emulators/mame/006-fix-sliver.patch rename to package/batocera/emulators/mame/006-fix-sliver.patch diff --git a/package/emulators/mame/007-nopch.patch b/package/batocera/emulators/mame/007-nopch.patch similarity index 100% rename from package/emulators/mame/007-nopch.patch rename to package/batocera/emulators/mame/007-nopch.patch diff --git a/package/emulators/mame/008-default-gun-config.patch b/package/batocera/emulators/mame/008-default-gun-config.patch similarity index 100% rename from package/emulators/mame/008-default-gun-config.patch rename to package/batocera/emulators/mame/008-default-gun-config.patch diff --git a/package/emulators/mame/009-flto-auto-genie.patch b/package/batocera/emulators/mame/009-flto-auto-genie.patch similarity index 100% rename from package/emulators/mame/009-flto-auto-genie.patch rename to package/batocera/emulators/mame/009-flto-auto-genie.patch diff --git a/package/emulators/mame/010-mame-cv1k.patch b/package/batocera/emulators/mame/010-mame-cv1k.patch similarity index 100% rename from package/emulators/mame/010-mame-cv1k.patch rename to package/batocera/emulators/mame/010-mame-cv1k.patch diff --git a/package/emulators/mame/010-mame-cv1k.patch.disabled b/package/batocera/emulators/mame/010-mame-cv1k.patch.disabled similarity index 100% rename from package/emulators/mame/010-mame-cv1k.patch.disabled rename to package/batocera/emulators/mame/010-mame-cv1k.patch.disabled diff --git a/package/emulators/mame/Config.in b/package/batocera/emulators/mame/Config.in similarity index 100% rename from package/emulators/mame/Config.in rename to package/batocera/emulators/mame/Config.in diff --git a/package/emulators/mame/arcade.flt b/package/batocera/emulators/mame/arcade.flt similarity index 100% rename from package/emulators/mame/arcade.flt rename to package/batocera/emulators/mame/arcade.flt diff --git a/package/emulators/mame/autoload/coco_cass_autoload.csv b/package/batocera/emulators/mame/autoload/coco_cass_autoload.csv similarity index 100% rename from package/emulators/mame/autoload/coco_cass_autoload.csv rename to package/batocera/emulators/mame/autoload/coco_cass_autoload.csv diff --git a/package/emulators/mame/autoload/coco_flop_autoload.csv b/package/batocera/emulators/mame/autoload/coco_flop_autoload.csv similarity index 100% rename from package/emulators/mame/autoload/coco_flop_autoload.csv rename to package/batocera/emulators/mame/autoload/coco_flop_autoload.csv diff --git a/package/emulators/mame/blank.fmtowns b/package/batocera/emulators/mame/blank.fmtowns similarity index 100% rename from package/emulators/mame/blank.fmtowns rename to package/batocera/emulators/mame/blank.fmtowns diff --git a/package/emulators/mame/coindrop/LICENSE.md b/package/batocera/emulators/mame/coindrop/LICENSE.md similarity index 100% rename from package/emulators/mame/coindrop/LICENSE.md rename to package/batocera/emulators/mame/coindrop/LICENSE.md diff --git a/package/emulators/mame/coindrop/README.md b/package/batocera/emulators/mame/coindrop/README.md similarity index 100% rename from package/emulators/mame/coindrop/README.md rename to package/batocera/emulators/mame/coindrop/README.md diff --git a/package/emulators/mame/coindrop/init.lua b/package/batocera/emulators/mame/coindrop/init.lua similarity index 100% rename from package/emulators/mame/coindrop/init.lua rename to package/batocera/emulators/mame/coindrop/init.lua diff --git a/package/emulators/mame/coindrop/plugin.json b/package/batocera/emulators/mame/coindrop/plugin.json similarity index 100% rename from package/emulators/mame/coindrop/plugin.json rename to package/batocera/emulators/mame/coindrop/plugin.json diff --git a/package/emulators/mame/coindrop/sounds/coin1.wav b/package/batocera/emulators/mame/coindrop/sounds/coin1.wav similarity index 100% rename from package/emulators/mame/coindrop/sounds/coin1.wav rename to package/batocera/emulators/mame/coindrop/sounds/coin1.wav diff --git a/package/emulators/mame/coindrop/sounds/coin2.wav b/package/batocera/emulators/mame/coindrop/sounds/coin2.wav similarity index 100% rename from package/emulators/mame/coindrop/sounds/coin2.wav rename to package/batocera/emulators/mame/coindrop/sounds/coin2.wav diff --git a/package/emulators/mame/coindrop/sounds/coin3.wav b/package/batocera/emulators/mame/coindrop/sounds/coin3.wav similarity index 100% rename from package/emulators/mame/coindrop/sounds/coin3.wav rename to package/batocera/emulators/mame/coindrop/sounds/coin3.wav diff --git a/package/emulators/mame/coindrop/sounds/silent.wav b/package/batocera/emulators/mame/coindrop/sounds/silent.wav similarity index 100% rename from package/emulators/mame/coindrop/sounds/silent.wav rename to package/batocera/emulators/mame/coindrop/sounds/silent.wav diff --git a/package/emulators/mame/crt-geom-deluxe-composite.json b/package/batocera/emulators/mame/crt-geom-deluxe-composite.json similarity index 100% rename from package/emulators/mame/crt-geom-deluxe-composite.json rename to package/batocera/emulators/mame/crt-geom-deluxe-composite.json diff --git a/package/emulators/mame/crt-geom-deluxe-rgb.json b/package/batocera/emulators/mame/crt-geom-deluxe-rgb.json similarity index 100% rename from package/emulators/mame/crt-geom-deluxe-rgb.json rename to package/batocera/emulators/mame/crt-geom-deluxe-rgb.json diff --git a/package/emulators/mame/dats/command.dat b/package/batocera/emulators/mame/dats/command.dat similarity index 100% rename from package/emulators/mame/dats/command.dat rename to package/batocera/emulators/mame/dats/command.dat diff --git a/package/emulators/mame/dats/gameinit.dat b/package/batocera/emulators/mame/dats/gameinit.dat similarity index 100% rename from package/emulators/mame/dats/gameinit.dat rename to package/batocera/emulators/mame/dats/gameinit.dat diff --git a/package/emulators/mame/history/history.xml.gz b/package/batocera/emulators/mame/history/history.xml.gz similarity index 100% rename from package/emulators/mame/history/history.xml.gz rename to package/batocera/emulators/mame/history/history.xml.gz diff --git a/package/emulators/mame/mame.flt b/package/batocera/emulators/mame/mame.flt similarity index 100% rename from package/emulators/mame/mame.flt rename to package/batocera/emulators/mame/mame.flt diff --git a/package/emulators/mame/mame.mame.keys b/package/batocera/emulators/mame/mame.mame.keys similarity index 100% rename from package/emulators/mame/mame.mame.keys rename to package/batocera/emulators/mame/mame.mame.keys diff --git a/package/emulators/mame/mame.mk b/package/batocera/emulators/mame/mame.mk similarity index 55% rename from package/emulators/mame/mame.mk rename to package/batocera/emulators/mame/mame.mk index 3962593c9e5..9b5e3d70ce2 100644 --- a/package/emulators/mame/mame.mk +++ b/package/batocera/emulators/mame/mame.mk @@ -18,8 +18,8 @@ MAME_SUBTARGET=mame MAME_SUFFIX= define MAME_COPY_FILES - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/arcade.flt $(@D)/src/mame/ - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mess.flt $(@D)/src/mame/ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/arcade.flt $(@D)/src/mame/ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mess.flt $(@D)/src/mame/ endef MAME_PRE_CONFIGURE_HOOKS += MAME_COPY_FILES @@ -131,7 +131,7 @@ define MAME_BUILD_CMDS cat $(@D)/build/skel.list | while read file ; do sed -i '/MACHINE_IS_SKELETON/d' $$file ; done rm $(@D)/build/skel.list # Remove reference to skeleton drivers in mame.lst - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.flt $(@D)/mame.flt + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.flt $(@D)/mame.flt cat $(@D)/mame.flt | while read file ; do sed -i /$$file/d $(@D)/src/mame/mame.lst ; done # Compile emulation target (MAME) @@ -230,75 +230,75 @@ define MAME_INSTALL_TARGET_CMDS rm -Rf $(TARGET_DIR)/usr/bin/mame/bgfx/shaders/dx11/ # Copy extra bgfx shaders - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/crt-geom-deluxe-rgb.json $(TARGET_DIR)/usr/bin/mame/bgfx/chains - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/crt-geom-deluxe-composite.json $(TARGET_DIR)/usr/bin/mame/bgfx/chains + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/crt-geom-deluxe-rgb.json $(TARGET_DIR)/usr/bin/mame/bgfx/chains + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/crt-geom-deluxe-composite.json $(TARGET_DIR)/usr/bin/mame/bgfx/chains # Copy blank disk image(s) mkdir -p $(TARGET_DIR)/usr/share/mame - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/blank.fmtowns $(TARGET_DIR)/usr/share/mame/blank.fmtowns + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/blank.fmtowns $(TARGET_DIR)/usr/share/mame/blank.fmtowns # Copy coin drop plugin - cp -R -u $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/coindrop $(TARGET_DIR)/usr/bin/mame/plugins + cp -R -u $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/coindrop $(TARGET_DIR)/usr/bin/mame/plugins # Copy data plugin information mkdir -p $(TARGET_DIR)/usr/bin/mame/dats - cp -R $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/dats $(TARGET_DIR)/usr/bin/mame/dats/ + cp -R $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/dats $(TARGET_DIR)/usr/bin/mame/dats/ mkdir -p $(TARGET_DIR)/usr/bin/mame/history - gunzip -c $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/history/history.xml.gz > $(TARGET_DIR)/usr/bin/mame/history/history.xml + gunzip -c $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/history/history.xml.gz > $(TARGET_DIR)/usr/bin/mame/history/history.xml # gameStop script when exiting a rotated screen mkdir -p $(TARGET_DIR)/usr/share/reglinux/configgen/scripts - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/rotation_fix.sh $(TARGET_DIR)/usr/share/reglinux/configgen/scripts/rotation_fix.sh + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/rotation_fix.sh $(TARGET_DIR)/usr/share/reglinux/configgen/scripts/rotation_fix.sh # Copy user -autoboot_command overrides (batocera.linux/batocera.linux#11706) mkdir -p $(MAME_CONF_INIT)/autoload - cp -R $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/autoload $(MAME_CONF_INIT) + cp -R $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/autoload $(MAME_CONF_INIT) endef define MAME_EVMAPY mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/adam.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/advision.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/apfm1000.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/apple2.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/apple2gs.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/arcadia.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/archimedes.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/astrocde.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/atom.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/bbc.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/camplynx.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/cdi.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/coco.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/crvision.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/electron.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/fm7.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/fmtowns.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/gamate.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/gameandwatch.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/gamecom.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/gamepock.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/gmaster.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/gp32.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/lcdgames.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/laser310.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/macintosh.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/megaduck.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/neogeo.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/pdp1.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/plugnplay.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/pv1000.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/socrates.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/supracan.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/ti99.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/tutor.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/vc4000.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/vectrex.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/vgmplay.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/vsmile.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/xegs.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/adam.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/advision.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/apfm1000.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/apple2.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/apple2gs.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/arcadia.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/archimedes.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/astrocde.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/atom.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/bbc.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/camplynx.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/cdi.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/coco.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/crvision.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/electron.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/fm7.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/fmtowns.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/gamate.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/gameandwatch.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/gamecom.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/gamepock.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/gmaster.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/gp32.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/lcdgames.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/laser310.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/macintosh.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/megaduck.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/neogeo.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/pdp1.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/plugnplay.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/pv1000.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/socrates.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/supracan.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/ti99.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/tutor.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/vc4000.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/vectrex.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/vgmplay.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/vsmile.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/xegs.mame.keys endef MAME_POST_INSTALL_TARGET_HOOKS += MAME_EVMAPY diff --git a/package/emulators/mame/mess.flt b/package/batocera/emulators/mame/mess.flt similarity index 100% rename from package/emulators/mame/mess.flt rename to package/batocera/emulators/mame/mess.flt diff --git a/package/emulators/mame/rotation_fix.sh b/package/batocera/emulators/mame/rotation_fix.sh similarity index 100% rename from package/emulators/mame/rotation_fix.sh rename to package/batocera/emulators/mame/rotation_fix.sh diff --git a/package/emulators/model2emu/001-inifile.patch b/package/batocera/emulators/model2emu/001-inifile.patch similarity index 100% rename from package/emulators/model2emu/001-inifile.patch rename to package/batocera/emulators/model2emu/001-inifile.patch diff --git a/package/emulators/model2emu/Config.in b/package/batocera/emulators/model2emu/Config.in similarity index 100% rename from package/emulators/model2emu/Config.in rename to package/batocera/emulators/model2emu/Config.in diff --git a/package/emulators/model2emu/model2.hash b/package/batocera/emulators/model2emu/model2.hash similarity index 100% rename from package/emulators/model2emu/model2.hash rename to package/batocera/emulators/model2emu/model2.hash diff --git a/package/emulators/model2emu/model2.mk b/package/batocera/emulators/model2emu/model2.mk similarity index 92% rename from package/emulators/model2emu/model2.mk rename to package/batocera/emulators/model2emu/model2.mk index 907747f0852..f65cbc8a9ef 100644 --- a/package/emulators/model2emu/model2.mk +++ b/package/batocera/emulators/model2emu/model2.mk @@ -10,7 +10,7 @@ MODEL2EMU_SOURCE = m2emulator.zip # source location updated since previous website is now unavailable MODEL2EMU_SITE = https://github.com/batocera-linux/model2emu/raw/main -MODEL2EMU_EXTRAS = $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/model2emu +MODEL2EMU_EXTRAS = $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/model2emu define MODEL2EMU_EXTRACT_CMDS mkdir -p $(@D) && cd $(@D) && unzip -x \ diff --git a/package/emulators/model2emu/model2.model2emu.keys b/package/batocera/emulators/model2emu/model2.model2emu.keys similarity index 100% rename from package/emulators/model2emu/model2.model2emu.keys rename to package/batocera/emulators/model2emu/model2.model2emu.keys diff --git a/package/emulators/model2emu/model2scripts.zip b/package/batocera/emulators/model2emu/model2scripts.zip similarity index 100% rename from package/emulators/model2emu/model2scripts.zip rename to package/batocera/emulators/model2emu/model2scripts.zip diff --git a/package/emulators/model2emu/sindenborderscripts.zip b/package/batocera/emulators/model2emu/sindenborderscripts.zip similarity index 100% rename from package/emulators/model2emu/sindenborderscripts.zip rename to package/batocera/emulators/model2emu/sindenborderscripts.zip diff --git a/package/emulators/moonlight-embedded/002-include-drm_fourcc.patch b/package/batocera/emulators/moonlight-embedded/002-include-drm_fourcc.patch similarity index 100% rename from package/emulators/moonlight-embedded/002-include-drm_fourcc.patch rename to package/batocera/emulators/moonlight-embedded/002-include-drm_fourcc.patch diff --git a/package/emulators/moonlight-embedded/Config.in b/package/batocera/emulators/moonlight-embedded/Config.in similarity index 100% rename from package/emulators/moonlight-embedded/Config.in rename to package/batocera/emulators/moonlight-embedded/Config.in diff --git a/package/emulators/moonlight-embedded/batocera-moonlight b/package/batocera/emulators/moonlight-embedded/batocera-moonlight similarity index 100% rename from package/emulators/moonlight-embedded/batocera-moonlight rename to package/batocera/emulators/moonlight-embedded/batocera-moonlight diff --git a/package/emulators/moonlight-embedded/moonlight-embedded.mk b/package/batocera/emulators/moonlight-embedded/moonlight-embedded.mk similarity index 81% rename from package/emulators/moonlight-embedded/moonlight-embedded.mk rename to package/batocera/emulators/moonlight-embedded/moonlight-embedded.mk index a0ad0671129..e1ed415ed91 100644 --- a/package/emulators/moonlight-embedded/moonlight-embedded.mk +++ b/package/batocera/emulators/moonlight-embedded/moonlight-embedded.mk @@ -31,12 +31,12 @@ endif define MOONLIGHT_EMBEDDED_INSTALL_SCRIPTS mkdir -p $(TARGET_DIR)/usr/share/evmapy mkdir -p $(TARGET_DIR)/usr/share/moonlight-embedded - cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/moonlight-embedded/moonlight.moonlight.keys \ + cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/moonlight-embedded/moonlight.moonlight.keys \ $(TARGET_DIR)/usr/share/evmapy - cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/moonlight-embedded/moonlight.conf \ + cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/moonlight-embedded/moonlight.conf \ $(TARGET_DIR)/usr/share/moonlight-embedded/ install -m 0755 \ - $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/moonlight-embedded/batocera-moonlight \ + $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/moonlight-embedded/batocera-moonlight \ $(TARGET_DIR)/usr/bin/ endef diff --git a/package/emulators/moonlight-embedded/moonlight.conf b/package/batocera/emulators/moonlight-embedded/moonlight.conf similarity index 100% rename from package/emulators/moonlight-embedded/moonlight.conf rename to package/batocera/emulators/moonlight-embedded/moonlight.conf diff --git a/package/emulators/moonlight-embedded/moonlight.moonlight.keys b/package/batocera/emulators/moonlight-embedded/moonlight.moonlight.keys similarity index 100% rename from package/emulators/moonlight-embedded/moonlight.moonlight.keys rename to package/batocera/emulators/moonlight-embedded/moonlight.moonlight.keys diff --git a/package/emulators/openbor/openbor4432/0001-Fix-anim_list-and-model_cache-definitions.patch b/package/batocera/emulators/openbor/openbor4432/0001-Fix-anim_list-and-model_cache-definitions.patch similarity index 100% rename from package/emulators/openbor/openbor4432/0001-Fix-anim_list-and-model_cache-definitions.patch rename to package/batocera/emulators/openbor/openbor4432/0001-Fix-anim_list-and-model_cache-definitions.patch diff --git a/package/emulators/openbor/openbor4432/001-x86_64.patch b/package/batocera/emulators/openbor/openbor4432/001-x86_64.patch similarity index 100% rename from package/emulators/openbor/openbor4432/001-x86_64.patch rename to package/batocera/emulators/openbor/openbor4432/001-x86_64.patch diff --git a/package/emulators/openbor/openbor4432/002-fixkeys.patch b/package/batocera/emulators/openbor/openbor4432/002-fixkeys.patch similarity index 100% rename from package/emulators/openbor/openbor4432/002-fixkeys.patch rename to package/batocera/emulators/openbor/openbor4432/002-fixkeys.patch diff --git a/package/emulators/openbor/openbor4432/003-arm.patch b/package/batocera/emulators/openbor/openbor4432/003-arm.patch similarity index 100% rename from package/emulators/openbor/openbor4432/003-arm.patch rename to package/batocera/emulators/openbor/openbor4432/003-arm.patch diff --git a/package/emulators/openbor/openbor4432/004-gccoptions.patch b/package/batocera/emulators/openbor/openbor4432/004-gccoptions.patch similarity index 100% rename from package/emulators/openbor/openbor4432/004-gccoptions.patch rename to package/batocera/emulators/openbor/openbor4432/004-gccoptions.patch diff --git a/package/emulators/openbor/openbor4432/005-sdl2gfx.patch b/package/batocera/emulators/openbor/openbor4432/005-sdl2gfx.patch similarity index 100% rename from package/emulators/openbor/openbor4432/005-sdl2gfx.patch rename to package/batocera/emulators/openbor/openbor4432/005-sdl2gfx.patch diff --git a/package/emulators/openbor/openbor4432/006-axismanagement.patch b/package/batocera/emulators/openbor/openbor4432/006-axismanagement.patch similarity index 100% rename from package/emulators/openbor/openbor4432/006-axismanagement.patch rename to package/batocera/emulators/openbor/openbor4432/006-axismanagement.patch diff --git a/package/emulators/openbor/openbor4432/007-fix-pad-axis-combos-player-running.patch b/package/batocera/emulators/openbor/openbor4432/007-fix-pad-axis-combos-player-running.patch similarity index 100% rename from package/emulators/openbor/openbor4432/007-fix-pad-axis-combos-player-running.patch rename to package/batocera/emulators/openbor/openbor4432/007-fix-pad-axis-combos-player-running.patch diff --git a/package/emulators/openbor/openbor4432/Config.in b/package/batocera/emulators/openbor/openbor4432/Config.in similarity index 100% rename from package/emulators/openbor/openbor4432/Config.in rename to package/batocera/emulators/openbor/openbor4432/Config.in diff --git a/package/emulators/openbor/openbor4432/openbor4432.mk b/package/batocera/emulators/openbor/openbor4432/openbor4432.mk similarity index 100% rename from package/emulators/openbor/openbor4432/openbor4432.mk rename to package/batocera/emulators/openbor/openbor4432/openbor4432.mk diff --git a/package/emulators/openbor/openbor6330/0001-Fix-anim_list-and-model_cache-definitions.patch b/package/batocera/emulators/openbor/openbor6330/0001-Fix-anim_list-and-model_cache-definitions.patch similarity index 100% rename from package/emulators/openbor/openbor6330/0001-Fix-anim_list-and-model_cache-definitions.patch rename to package/batocera/emulators/openbor/openbor6330/0001-Fix-anim_list-and-model_cache-definitions.patch diff --git a/package/emulators/openbor/openbor6330/001-x86_64.patch b/package/batocera/emulators/openbor/openbor6330/001-x86_64.patch similarity index 100% rename from package/emulators/openbor/openbor6330/001-x86_64.patch rename to package/batocera/emulators/openbor/openbor6330/001-x86_64.patch diff --git a/package/emulators/openbor/openbor6330/002-fixkeys.patch b/package/batocera/emulators/openbor/openbor6330/002-fixkeys.patch similarity index 100% rename from package/emulators/openbor/openbor6330/002-fixkeys.patch rename to package/batocera/emulators/openbor/openbor6330/002-fixkeys.patch diff --git a/package/emulators/openbor/openbor6330/003-arm.patch b/package/batocera/emulators/openbor/openbor6330/003-arm.patch similarity index 100% rename from package/emulators/openbor/openbor6330/003-arm.patch rename to package/batocera/emulators/openbor/openbor6330/003-arm.patch diff --git a/package/emulators/openbor/openbor6330/004-warnings.patch b/package/batocera/emulators/openbor/openbor6330/004-warnings.patch similarity index 100% rename from package/emulators/openbor/openbor6330/004-warnings.patch rename to package/batocera/emulators/openbor/openbor6330/004-warnings.patch diff --git a/package/emulators/openbor/openbor6330/005-axismanagement.patch b/package/batocera/emulators/openbor/openbor6330/005-axismanagement.patch similarity index 100% rename from package/emulators/openbor/openbor6330/005-axismanagement.patch rename to package/batocera/emulators/openbor/openbor6330/005-axismanagement.patch diff --git a/package/emulators/openbor/openbor6330/006-fix-pad-axis-combos-player-running.patch b/package/batocera/emulators/openbor/openbor6330/006-fix-pad-axis-combos-player-running.patch similarity index 100% rename from package/emulators/openbor/openbor6330/006-fix-pad-axis-combos-player-running.patch rename to package/batocera/emulators/openbor/openbor6330/006-fix-pad-axis-combos-player-running.patch diff --git a/package/emulators/openbor/openbor6330/998-openbor-c.patch b/package/batocera/emulators/openbor/openbor6330/998-openbor-c.patch similarity index 100% rename from package/emulators/openbor/openbor6330/998-openbor-c.patch rename to package/batocera/emulators/openbor/openbor6330/998-openbor-c.patch diff --git a/package/emulators/openbor/openbor6330/998-openbor-h.patch b/package/batocera/emulators/openbor/openbor6330/998-openbor-h.patch similarity index 100% rename from package/emulators/openbor/openbor6330/998-openbor-h.patch rename to package/batocera/emulators/openbor/openbor6330/998-openbor-h.patch diff --git a/package/emulators/openbor/openbor6330/999-openbor-h.patch b/package/batocera/emulators/openbor/openbor6330/999-openbor-h.patch similarity index 100% rename from package/emulators/openbor/openbor6330/999-openbor-h.patch rename to package/batocera/emulators/openbor/openbor6330/999-openbor-h.patch diff --git a/package/emulators/openbor/openbor6330/Config.in b/package/batocera/emulators/openbor/openbor6330/Config.in similarity index 100% rename from package/emulators/openbor/openbor6330/Config.in rename to package/batocera/emulators/openbor/openbor6330/Config.in diff --git a/package/emulators/openbor/openbor6330/openbor6330.hash b/package/batocera/emulators/openbor/openbor6330/openbor6330.hash similarity index 100% rename from package/emulators/openbor/openbor6330/openbor6330.hash rename to package/batocera/emulators/openbor/openbor6330/openbor6330.hash diff --git a/package/emulators/openbor/openbor6330/openbor6330.mk b/package/batocera/emulators/openbor/openbor6330/openbor6330.mk similarity index 100% rename from package/emulators/openbor/openbor6330/openbor6330.mk rename to package/batocera/emulators/openbor/openbor6330/openbor6330.mk diff --git a/package/emulators/openbor/openbor6412/0001-Fix-anim_list-and-model_cache-definitions.patch b/package/batocera/emulators/openbor/openbor6412/0001-Fix-anim_list-and-model_cache-definitions.patch similarity index 100% rename from package/emulators/openbor/openbor6412/0001-Fix-anim_list-and-model_cache-definitions.patch rename to package/batocera/emulators/openbor/openbor6412/0001-Fix-anim_list-and-model_cache-definitions.patch diff --git a/package/emulators/openbor/openbor6412/001-x86_64.patch b/package/batocera/emulators/openbor/openbor6412/001-x86_64.patch similarity index 100% rename from package/emulators/openbor/openbor6412/001-x86_64.patch rename to package/batocera/emulators/openbor/openbor6412/001-x86_64.patch diff --git a/package/emulators/openbor/openbor6412/002-fixkeys.patch b/package/batocera/emulators/openbor/openbor6412/002-fixkeys.patch similarity index 100% rename from package/emulators/openbor/openbor6412/002-fixkeys.patch rename to package/batocera/emulators/openbor/openbor6412/002-fixkeys.patch diff --git a/package/emulators/openbor/openbor6412/003-arm.patch b/package/batocera/emulators/openbor/openbor6412/003-arm.patch similarity index 100% rename from package/emulators/openbor/openbor6412/003-arm.patch rename to package/batocera/emulators/openbor/openbor6412/003-arm.patch diff --git a/package/emulators/openbor/openbor6412/004-warnings.patch b/package/batocera/emulators/openbor/openbor6412/004-warnings.patch similarity index 100% rename from package/emulators/openbor/openbor6412/004-warnings.patch rename to package/batocera/emulators/openbor/openbor6412/004-warnings.patch diff --git a/package/emulators/openbor/openbor6412/005-axismanagement.patch b/package/batocera/emulators/openbor/openbor6412/005-axismanagement.patch similarity index 100% rename from package/emulators/openbor/openbor6412/005-axismanagement.patch rename to package/batocera/emulators/openbor/openbor6412/005-axismanagement.patch diff --git a/package/emulators/openbor/openbor6412/006-fix-pad-axis-combos-player-running.patch b/package/batocera/emulators/openbor/openbor6412/006-fix-pad-axis-combos-player-running.patch similarity index 100% rename from package/emulators/openbor/openbor6412/006-fix-pad-axis-combos-player-running.patch rename to package/batocera/emulators/openbor/openbor6412/006-fix-pad-axis-combos-player-running.patch diff --git a/package/emulators/openbor/openbor6412/100-openbor-c.patch b/package/batocera/emulators/openbor/openbor6412/100-openbor-c.patch similarity index 100% rename from package/emulators/openbor/openbor6412/100-openbor-c.patch rename to package/batocera/emulators/openbor/openbor6412/100-openbor-c.patch diff --git a/package/emulators/openbor/openbor6412/100-openbor-h.patch b/package/batocera/emulators/openbor/openbor6412/100-openbor-h.patch similarity index 100% rename from package/emulators/openbor/openbor6412/100-openbor-h.patch rename to package/batocera/emulators/openbor/openbor6412/100-openbor-h.patch diff --git a/package/emulators/openbor/openbor6412/101-openbor-c-savedata-fullscreen.patch b/package/batocera/emulators/openbor/openbor6412/101-openbor-c-savedata-fullscreen.patch similarity index 100% rename from package/emulators/openbor/openbor6412/101-openbor-c-savedata-fullscreen.patch rename to package/batocera/emulators/openbor/openbor6412/101-openbor-c-savedata-fullscreen.patch diff --git a/package/emulators/openbor/openbor6412/101-openbor-h.patch b/package/batocera/emulators/openbor/openbor6412/101-openbor-h.patch similarity index 100% rename from package/emulators/openbor/openbor6412/101-openbor-h.patch rename to package/batocera/emulators/openbor/openbor6412/101-openbor-h.patch diff --git a/package/emulators/openbor/openbor6412/Config.in b/package/batocera/emulators/openbor/openbor6412/Config.in similarity index 100% rename from package/emulators/openbor/openbor6412/Config.in rename to package/batocera/emulators/openbor/openbor6412/Config.in diff --git a/package/emulators/openbor/openbor6412/openbor6412.mk b/package/batocera/emulators/openbor/openbor6412/openbor6412.mk similarity index 100% rename from package/emulators/openbor/openbor6412/openbor6412.mk rename to package/batocera/emulators/openbor/openbor6412/openbor6412.mk diff --git a/package/emulators/openbor/openbor6510/0001-Fix-anim_list-and-model_cache-definitions.patch b/package/batocera/emulators/openbor/openbor6510/0001-Fix-anim_list-and-model_cache-definitions.patch similarity index 100% rename from package/emulators/openbor/openbor6510/0001-Fix-anim_list-and-model_cache-definitions.patch rename to package/batocera/emulators/openbor/openbor6510/0001-Fix-anim_list-and-model_cache-definitions.patch diff --git a/package/emulators/openbor/openbor6510/001-x86_64.patch b/package/batocera/emulators/openbor/openbor6510/001-x86_64.patch similarity index 100% rename from package/emulators/openbor/openbor6510/001-x86_64.patch rename to package/batocera/emulators/openbor/openbor6510/001-x86_64.patch diff --git a/package/emulators/openbor/openbor6510/002-fixkeys.patch b/package/batocera/emulators/openbor/openbor6510/002-fixkeys.patch similarity index 100% rename from package/emulators/openbor/openbor6510/002-fixkeys.patch rename to package/batocera/emulators/openbor/openbor6510/002-fixkeys.patch diff --git a/package/emulators/openbor/openbor6510/003-arm.patch b/package/batocera/emulators/openbor/openbor6510/003-arm.patch similarity index 100% rename from package/emulators/openbor/openbor6510/003-arm.patch rename to package/batocera/emulators/openbor/openbor6510/003-arm.patch diff --git a/package/emulators/openbor/openbor6510/004-warnings.patch b/package/batocera/emulators/openbor/openbor6510/004-warnings.patch similarity index 100% rename from package/emulators/openbor/openbor6510/004-warnings.patch rename to package/batocera/emulators/openbor/openbor6510/004-warnings.patch diff --git a/package/emulators/openbor/openbor6510/005-axismanagement.patch b/package/batocera/emulators/openbor/openbor6510/005-axismanagement.patch similarity index 100% rename from package/emulators/openbor/openbor6510/005-axismanagement.patch rename to package/batocera/emulators/openbor/openbor6510/005-axismanagement.patch diff --git a/package/emulators/openbor/openbor6510/006-fix-pad-axis-combos-player-running.patch b/package/batocera/emulators/openbor/openbor6510/006-fix-pad-axis-combos-player-running.patch similarity index 100% rename from package/emulators/openbor/openbor6510/006-fix-pad-axis-combos-player-running.patch rename to package/batocera/emulators/openbor/openbor6510/006-fix-pad-axis-combos-player-running.patch diff --git a/package/emulators/openbor/openbor6510/100-openbor-c.patch b/package/batocera/emulators/openbor/openbor6510/100-openbor-c.patch similarity index 100% rename from package/emulators/openbor/openbor6510/100-openbor-c.patch rename to package/batocera/emulators/openbor/openbor6510/100-openbor-c.patch diff --git a/package/emulators/openbor/openbor6510/100-openbor-h.patch b/package/batocera/emulators/openbor/openbor6510/100-openbor-h.patch similarity index 100% rename from package/emulators/openbor/openbor6510/100-openbor-h.patch rename to package/batocera/emulators/openbor/openbor6510/100-openbor-h.patch diff --git a/package/emulators/openbor/openbor6510/101-openbor-c-savedata-fullscreen.patch b/package/batocera/emulators/openbor/openbor6510/101-openbor-c-savedata-fullscreen.patch similarity index 100% rename from package/emulators/openbor/openbor6510/101-openbor-c-savedata-fullscreen.patch rename to package/batocera/emulators/openbor/openbor6510/101-openbor-c-savedata-fullscreen.patch diff --git a/package/emulators/openbor/openbor6510/101-openbor-h.patch b/package/batocera/emulators/openbor/openbor6510/101-openbor-h.patch similarity index 100% rename from package/emulators/openbor/openbor6510/101-openbor-h.patch rename to package/batocera/emulators/openbor/openbor6510/101-openbor-h.patch diff --git a/package/emulators/openbor/openbor6510/Config.in b/package/batocera/emulators/openbor/openbor6510/Config.in similarity index 100% rename from package/emulators/openbor/openbor6510/Config.in rename to package/batocera/emulators/openbor/openbor6510/Config.in diff --git a/package/emulators/openbor/openbor6510/openbor6510.hash b/package/batocera/emulators/openbor/openbor6510/openbor6510.hash similarity index 100% rename from package/emulators/openbor/openbor6510/openbor6510.hash rename to package/batocera/emulators/openbor/openbor6510/openbor6510.hash diff --git a/package/emulators/openbor/openbor6510/openbor6510.mk b/package/batocera/emulators/openbor/openbor6510/openbor6510.mk similarity index 100% rename from package/emulators/openbor/openbor6510/openbor6510.mk rename to package/batocera/emulators/openbor/openbor6510/openbor6510.mk diff --git a/package/emulators/openbor/openbor7142/001-x86_64.patch b/package/batocera/emulators/openbor/openbor7142/001-x86_64.patch similarity index 100% rename from package/emulators/openbor/openbor7142/001-x86_64.patch rename to package/batocera/emulators/openbor/openbor7142/001-x86_64.patch diff --git a/package/emulators/openbor/openbor7142/002-parsableconfigkeys.patch b/package/batocera/emulators/openbor/openbor7142/002-parsableconfigkeys.patch similarity index 100% rename from package/emulators/openbor/openbor7142/002-parsableconfigkeys.patch rename to package/batocera/emulators/openbor/openbor7142/002-parsableconfigkeys.patch diff --git a/package/emulators/openbor/openbor7142/003-arm.patch b/package/batocera/emulators/openbor/openbor7142/003-arm.patch similarity index 100% rename from package/emulators/openbor/openbor7142/003-arm.patch rename to package/batocera/emulators/openbor/openbor7142/003-arm.patch diff --git a/package/emulators/openbor/openbor7142/004-warnings.patch b/package/batocera/emulators/openbor/openbor7142/004-warnings.patch similarity index 100% rename from package/emulators/openbor/openbor7142/004-warnings.patch rename to package/batocera/emulators/openbor/openbor7142/004-warnings.patch diff --git a/package/emulators/openbor/openbor7142/006-fix-pad-axis-combos-player-running.patch b/package/batocera/emulators/openbor/openbor7142/006-fix-pad-axis-combos-player-running.patch similarity index 100% rename from package/emulators/openbor/openbor7142/006-fix-pad-axis-combos-player-running.patch rename to package/batocera/emulators/openbor/openbor7142/006-fix-pad-axis-combos-player-running.patch diff --git a/package/emulators/openbor/openbor7142/007-version.patch b/package/batocera/emulators/openbor/openbor7142/007-version.patch similarity index 100% rename from package/emulators/openbor/openbor7142/007-version.patch rename to package/batocera/emulators/openbor/openbor7142/007-version.patch diff --git a/package/emulators/openbor/openbor7142/008-vsync.patch b/package/batocera/emulators/openbor/openbor7142/008-vsync.patch similarity index 100% rename from package/emulators/openbor/openbor7142/008-vsync.patch rename to package/batocera/emulators/openbor/openbor7142/008-vsync.patch diff --git a/package/emulators/openbor/openbor7142/009-sdlpads.patch b/package/batocera/emulators/openbor/openbor7142/009-sdlpads.patch similarity index 100% rename from package/emulators/openbor/openbor7142/009-sdlpads.patch rename to package/batocera/emulators/openbor/openbor7142/009-sdlpads.patch diff --git a/package/emulators/openbor/openbor7142/010-sdlaxespads.patch b/package/batocera/emulators/openbor/openbor7142/010-sdlaxespads.patch similarity index 100% rename from package/emulators/openbor/openbor7142/010-sdlaxespads.patch rename to package/batocera/emulators/openbor/openbor7142/010-sdlaxespads.patch diff --git a/package/emulators/openbor/openbor7142/Config.in b/package/batocera/emulators/openbor/openbor7142/Config.in similarity index 100% rename from package/emulators/openbor/openbor7142/Config.in rename to package/batocera/emulators/openbor/openbor7142/Config.in diff --git a/package/emulators/openbor/openbor7142/defaults-fullscreen.patch b/package/batocera/emulators/openbor/openbor7142/defaults-fullscreen.patch similarity index 100% rename from package/emulators/openbor/openbor7142/defaults-fullscreen.patch rename to package/batocera/emulators/openbor/openbor7142/defaults-fullscreen.patch diff --git a/package/emulators/openbor/openbor7142/openbor7142.hash b/package/batocera/emulators/openbor/openbor7142/openbor7142.hash similarity index 100% rename from package/emulators/openbor/openbor7142/openbor7142.hash rename to package/batocera/emulators/openbor/openbor7142/openbor7142.hash diff --git a/package/emulators/openbor/openbor7142/openbor7142.mk b/package/batocera/emulators/openbor/openbor7142/openbor7142.mk similarity index 100% rename from package/emulators/openbor/openbor7142/openbor7142.mk rename to package/batocera/emulators/openbor/openbor7142/openbor7142.mk diff --git a/package/emulators/openbor/openbor7530/001-fix-makefile.patch b/package/batocera/emulators/openbor/openbor7530/001-fix-makefile.patch similarity index 100% rename from package/emulators/openbor/openbor7530/001-fix-makefile.patch rename to package/batocera/emulators/openbor/openbor7530/001-fix-makefile.patch diff --git a/package/emulators/openbor/openbor7530/002-adjust-paths.patch b/package/batocera/emulators/openbor/openbor7530/002-adjust-paths.patch similarity index 100% rename from package/emulators/openbor/openbor7530/002-adjust-paths.patch rename to package/batocera/emulators/openbor/openbor7530/002-adjust-paths.patch diff --git a/package/emulators/openbor/openbor7530/003-version.patch b/package/batocera/emulators/openbor/openbor7530/003-version.patch similarity index 100% rename from package/emulators/openbor/openbor7530/003-version.patch rename to package/batocera/emulators/openbor/openbor7530/003-version.patch diff --git a/package/emulators/openbor/openbor7530/004-parsable-config-keys.patch b/package/batocera/emulators/openbor/openbor7530/004-parsable-config-keys.patch similarity index 100% rename from package/emulators/openbor/openbor7530/004-parsable-config-keys.patch rename to package/batocera/emulators/openbor/openbor7530/004-parsable-config-keys.patch diff --git a/package/emulators/openbor/openbor7530/005-hotkey-exit.patch b/package/batocera/emulators/openbor/openbor7530/005-hotkey-exit.patch similarity index 100% rename from package/emulators/openbor/openbor7530/005-hotkey-exit.patch rename to package/batocera/emulators/openbor/openbor7530/005-hotkey-exit.patch diff --git a/package/emulators/openbor/openbor7530/Config.in b/package/batocera/emulators/openbor/openbor7530/Config.in similarity index 100% rename from package/emulators/openbor/openbor7530/Config.in rename to package/batocera/emulators/openbor/openbor7530/Config.in diff --git a/package/emulators/openbor/openbor7530/openbor7530.mk b/package/batocera/emulators/openbor/openbor7530/openbor7530.mk similarity index 100% rename from package/emulators/openbor/openbor7530/openbor7530.mk rename to package/batocera/emulators/openbor/openbor7530/openbor7530.mk diff --git a/package/emulators/openmsx/001-user-dir.patch b/package/batocera/emulators/openmsx/001-user-dir.patch similarity index 100% rename from package/emulators/openmsx/001-user-dir.patch rename to package/batocera/emulators/openmsx/001-user-dir.patch diff --git a/package/emulators/openmsx/002-filepool.patch b/package/batocera/emulators/openmsx/002-filepool.patch similarity index 100% rename from package/emulators/openmsx/002-filepool.patch rename to package/batocera/emulators/openmsx/002-filepool.patch diff --git a/package/emulators/openmsx/Config.in b/package/batocera/emulators/openmsx/Config.in similarity index 100% rename from package/emulators/openmsx/Config.in rename to package/batocera/emulators/openmsx/Config.in diff --git a/package/emulators/openmsx/colecovision.openmsx.keys b/package/batocera/emulators/openmsx/colecovision.openmsx.keys similarity index 100% rename from package/emulators/openmsx/colecovision.openmsx.keys rename to package/batocera/emulators/openmsx/colecovision.openmsx.keys diff --git a/package/emulators/openmsx/msx1.openmsx.keys b/package/batocera/emulators/openmsx/msx1.openmsx.keys similarity index 100% rename from package/emulators/openmsx/msx1.openmsx.keys rename to package/batocera/emulators/openmsx/msx1.openmsx.keys diff --git a/package/emulators/openmsx/msx2+.openmsx.keys b/package/batocera/emulators/openmsx/msx2+.openmsx.keys similarity index 100% rename from package/emulators/openmsx/msx2+.openmsx.keys rename to package/batocera/emulators/openmsx/msx2+.openmsx.keys diff --git a/package/emulators/openmsx/msx2.openmsx.keys b/package/batocera/emulators/openmsx/msx2.openmsx.keys similarity index 100% rename from package/emulators/openmsx/msx2.openmsx.keys rename to package/batocera/emulators/openmsx/msx2.openmsx.keys diff --git a/package/emulators/openmsx/msxturbor.openmsx.keys b/package/batocera/emulators/openmsx/msxturbor.openmsx.keys similarity index 100% rename from package/emulators/openmsx/msxturbor.openmsx.keys rename to package/batocera/emulators/openmsx/msxturbor.openmsx.keys diff --git a/package/emulators/openmsx/openmsx.mk b/package/batocera/emulators/openmsx/openmsx.mk similarity index 93% rename from package/emulators/openmsx/openmsx.mk rename to package/batocera/emulators/openmsx/openmsx.mk index 6456e361620..4616c0f241b 100644 --- a/package/emulators/openmsx/openmsx.mk +++ b/package/batocera/emulators/openmsx/openmsx.mk @@ -69,8 +69,8 @@ endef define OPENMSX_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/openmsx/*.keys $(TARGET_DIR)/usr/share/evmapy/ - cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/openmsx/settings.xml $(TARGET_DIR)/usr/share/openmsx + cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/openmsx/*.keys $(TARGET_DIR)/usr/share/evmapy/ + cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/openmsx/settings.xml $(TARGET_DIR)/usr/share/openmsx endef define OPENMSX_POST_INSTALL_CLEANUP diff --git a/package/emulators/openmsx/settings.xml b/package/batocera/emulators/openmsx/settings.xml similarity index 100% rename from package/emulators/openmsx/settings.xml rename to package/batocera/emulators/openmsx/settings.xml diff --git a/package/emulators/pcsx2/000-fix-linux-compilation-always_inline.patch b/package/batocera/emulators/pcsx2/000-fix-linux-compilation-always_inline.patch similarity index 100% rename from package/emulators/pcsx2/000-fix-linux-compilation-always_inline.patch rename to package/batocera/emulators/pcsx2/000-fix-linux-compilation-always_inline.patch diff --git a/package/emulators/pcsx2/001-fix-Savestates-path.patch b/package/batocera/emulators/pcsx2/001-fix-Savestates-path.patch similarity index 100% rename from package/emulators/pcsx2/001-fix-Savestates-path.patch rename to package/batocera/emulators/pcsx2/001-fix-Savestates-path.patch diff --git a/package/emulators/pcsx2/002-fix-linux-compilation-headers-gs.patch b/package/batocera/emulators/pcsx2/002-fix-linux-compilation-headers-gs.patch similarity index 100% rename from package/emulators/pcsx2/002-fix-linux-compilation-headers-gs.patch rename to package/batocera/emulators/pcsx2/002-fix-linux-compilation-headers-gs.patch diff --git a/package/emulators/pcsx2/003-fix-linux-detection.patch b/package/batocera/emulators/pcsx2/003-fix-linux-detection.patch similarity index 100% rename from package/emulators/pcsx2/003-fix-linux-detection.patch rename to package/batocera/emulators/pcsx2/003-fix-linux-detection.patch diff --git a/package/emulators/pcsx2/004-controller-db.patch b/package/batocera/emulators/pcsx2/004-controller-db.patch similarity index 100% rename from package/emulators/pcsx2/004-controller-db.patch rename to package/batocera/emulators/pcsx2/004-controller-db.patch diff --git a/package/emulators/pcsx2/005-lightguns.patch b/package/batocera/emulators/pcsx2/005-lightguns.patch similarity index 100% rename from package/emulators/pcsx2/005-lightguns.patch rename to package/batocera/emulators/pcsx2/005-lightguns.patch diff --git a/package/emulators/pcsx2/006-patches-in-bios-folder.patch b/package/batocera/emulators/pcsx2/006-patches-in-bios-folder.patch similarity index 100% rename from package/emulators/pcsx2/006-patches-in-bios-folder.patch rename to package/batocera/emulators/pcsx2/006-patches-in-bios-folder.patch diff --git a/package/emulators/pcsx2/008-fix-sdl-input.patch b/package/batocera/emulators/pcsx2/008-fix-sdl-input.patch similarity index 100% rename from package/emulators/pcsx2/008-fix-sdl-input.patch rename to package/batocera/emulators/pcsx2/008-fix-sdl-input.patch diff --git a/package/emulators/pcsx2/009-fix-cmake-pure-wayland.patch b/package/batocera/emulators/pcsx2/009-fix-cmake-pure-wayland.patch similarity index 100% rename from package/emulators/pcsx2/009-fix-cmake-pure-wayland.patch rename to package/batocera/emulators/pcsx2/009-fix-cmake-pure-wayland.patch diff --git a/package/emulators/pcsx2/Config.in b/package/batocera/emulators/pcsx2/Config.in similarity index 100% rename from package/emulators/pcsx2/Config.in rename to package/batocera/emulators/pcsx2/Config.in diff --git a/package/emulators/pcsx2/crosshairs/Blue.png b/package/batocera/emulators/pcsx2/crosshairs/Blue.png similarity index 100% rename from package/emulators/pcsx2/crosshairs/Blue.png rename to package/batocera/emulators/pcsx2/crosshairs/Blue.png diff --git a/package/emulators/pcsx2/crosshairs/Red.png b/package/batocera/emulators/pcsx2/crosshairs/Red.png similarity index 100% rename from package/emulators/pcsx2/crosshairs/Red.png rename to package/batocera/emulators/pcsx2/crosshairs/Red.png diff --git a/package/emulators/pcsx2/pcsx2.mk b/package/batocera/emulators/pcsx2/pcsx2.mk similarity index 91% rename from package/emulators/pcsx2/pcsx2.mk rename to package/batocera/emulators/pcsx2/pcsx2.mk index 34ffc743d6f..67a3f32e7ce 100644 --- a/package/emulators/pcsx2/pcsx2.mk +++ b/package/batocera/emulators/pcsx2/pcsx2.mk @@ -51,7 +51,7 @@ endef define PCSX2_EVMAPY mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/pcsx2/ps2.pcsx2.keys \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/pcsx2/ps2.pcsx2.keys \ $(TARGET_DIR)/usr/share/evmapy endef @@ -59,7 +59,7 @@ PCSX2_POST_INSTALL_TARGET_HOOKS += PCSX2_EVMAPY define PCSX2_TEXTURES mkdir -p $(TARGET_DIR)/usr/pcsx2/bin/resources/textures - cp -pr $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/pcsx2/textures/ \ + cp -pr $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/pcsx2/textures/ \ $(TARGET_DIR)/usr/pcsx2/bin/resources/ endef @@ -76,7 +76,7 @@ PCSX2_POST_INSTALL_TARGET_HOOKS += PCSX2_PATCHES define PCSX2_CROSSHAIRS mkdir -p $(TARGET_DIR)/usr/pcsx2/bin/resources/crosshairs - cp -pr $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/pcsx2/crosshairs/ \ + cp -pr $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/pcsx2/crosshairs/ \ $(TARGET_DIR)/usr/pcsx2/bin/resources/ endef diff --git a/package/emulators/pcsx2/ps2.pcsx2.keys b/package/batocera/emulators/pcsx2/ps2.pcsx2.keys similarity index 100% rename from package/emulators/pcsx2/ps2.pcsx2.keys rename to package/batocera/emulators/pcsx2/ps2.pcsx2.keys diff --git a/package/emulators/pcsx2/textures/SCES-52530/replacements/c321d53987f3986d-eadd4df7c9d76527-00005dd4.png b/package/batocera/emulators/pcsx2/textures/SCES-52530/replacements/c321d53987f3986d-eadd4df7c9d76527-00005dd4.png similarity index 100% rename from package/emulators/pcsx2/textures/SCES-52530/replacements/c321d53987f3986d-eadd4df7c9d76527-00005dd4.png rename to package/batocera/emulators/pcsx2/textures/SCES-52530/replacements/c321d53987f3986d-eadd4df7c9d76527-00005dd4.png diff --git a/package/emulators/pcsx2/textures/SLUS-20927/replacements/c321d53987f3986d-eadd4df7c9d76527-00005dd4.png b/package/batocera/emulators/pcsx2/textures/SLUS-20927/replacements/c321d53987f3986d-eadd4df7c9d76527-00005dd4.png similarity index 100% rename from package/emulators/pcsx2/textures/SLUS-20927/replacements/c321d53987f3986d-eadd4df7c9d76527-00005dd4.png rename to package/batocera/emulators/pcsx2/textures/SLUS-20927/replacements/c321d53987f3986d-eadd4df7c9d76527-00005dd4.png diff --git a/package/emulators/play/001-fpic.patch b/package/batocera/emulators/play/001-fpic.patch similarity index 100% rename from package/emulators/play/001-fpic.patch rename to package/batocera/emulators/play/001-fpic.patch diff --git a/package/emulators/play/002-fix-arcadepath.patch b/package/batocera/emulators/play/002-fix-arcadepath.patch similarity index 100% rename from package/emulators/play/002-fix-arcadepath.patch rename to package/batocera/emulators/play/002-fix-arcadepath.patch diff --git a/package/emulators/play/003-gcc13-fix.patch b/package/batocera/emulators/play/003-gcc13-fix.patch similarity index 100% rename from package/emulators/play/003-gcc13-fix.patch rename to package/batocera/emulators/play/003-gcc13-fix.patch diff --git a/package/emulators/play/Config.in b/package/batocera/emulators/play/Config.in similarity index 100% rename from package/emulators/play/Config.in rename to package/batocera/emulators/play/Config.in diff --git a/package/emulators/play/namco2x6.keys b/package/batocera/emulators/play/namco2x6.keys similarity index 100% rename from package/emulators/play/namco2x6.keys rename to package/batocera/emulators/play/namco2x6.keys diff --git a/package/emulators/play/play.mk b/package/batocera/emulators/play/play.mk similarity index 93% rename from package/emulators/play/play.mk rename to package/batocera/emulators/play/play.mk index f8ed1608483..8c85927d144 100644 --- a/package/emulators/play/play.mk +++ b/package/batocera/emulators/play/play.mk @@ -33,7 +33,7 @@ endif define PLAY_EVMAPY # evmap config mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/play/*.keys \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/play/*.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/emulators/play/ps2.play.keys b/package/batocera/emulators/play/ps2.play.keys similarity index 100% rename from package/emulators/play/ps2.play.keys rename to package/batocera/emulators/play/ps2.play.keys diff --git a/package/emulators/ppsspp/001-batocera-path.patch b/package/batocera/emulators/ppsspp/001-batocera-path.patch similarity index 100% rename from package/emulators/ppsspp/001-batocera-path.patch rename to package/batocera/emulators/ppsspp/001-batocera-path.patch diff --git a/package/emulators/ppsspp/002-cmake-arm-conversion-fix.patch b/package/batocera/emulators/ppsspp/002-cmake-arm-conversion-fix.patch similarity index 100% rename from package/emulators/ppsspp/002-cmake-arm-conversion-fix.patch rename to package/batocera/emulators/ppsspp/002-cmake-arm-conversion-fix.patch diff --git a/package/emulators/ppsspp/003-fullscreen_drm.patch b/package/batocera/emulators/ppsspp/003-fullscreen_drm.patch similarity index 100% rename from package/emulators/ppsspp/003-fullscreen_drm.patch rename to package/batocera/emulators/ppsspp/003-fullscreen_drm.patch diff --git a/package/emulators/ppsspp/004-statenameasromfilename.patch b/package/batocera/emulators/ppsspp/004-statenameasromfilename.patch similarity index 100% rename from package/emulators/ppsspp/004-statenameasromfilename.patch rename to package/batocera/emulators/ppsspp/004-statenameasromfilename.patch diff --git a/package/emulators/ppsspp/005-reduce_vulkan_checks.patch b/package/batocera/emulators/ppsspp/005-reduce_vulkan_checks.patch similarity index 100% rename from package/emulators/ppsspp/005-reduce_vulkan_checks.patch rename to package/batocera/emulators/ppsspp/005-reduce_vulkan_checks.patch diff --git a/package/emulators/ppsspp/006-fix-controller-name.patch b/package/batocera/emulators/ppsspp/006-fix-controller-name.patch similarity index 100% rename from package/emulators/ppsspp/006-fix-controller-name.patch rename to package/batocera/emulators/ppsspp/006-fix-controller-name.patch diff --git a/package/emulators/ppsspp/007-njoy.patch b/package/batocera/emulators/ppsspp/007-njoy.patch similarity index 100% rename from package/emulators/ppsspp/007-njoy.patch rename to package/batocera/emulators/ppsspp/007-njoy.patch diff --git a/package/emulators/ppsspp/008-cmake-sdl2-ttf-fix.patch b/package/batocera/emulators/ppsspp/008-cmake-sdl2-ttf-fix.patch similarity index 100% rename from package/emulators/ppsspp/008-cmake-sdl2-ttf-fix.patch rename to package/batocera/emulators/ppsspp/008-cmake-sdl2-ttf-fix.patch diff --git a/package/emulators/ppsspp/Config.in b/package/batocera/emulators/ppsspp/Config.in similarity index 100% rename from package/emulators/ppsspp/Config.in rename to package/batocera/emulators/ppsspp/Config.in diff --git a/package/emulators/ppsspp/NotoSansCJKjp-DemiLight.ttf b/package/batocera/emulators/ppsspp/NotoSansCJKjp-DemiLight.ttf similarity index 100% rename from package/emulators/ppsspp/NotoSansCJKjp-DemiLight.ttf rename to package/batocera/emulators/ppsspp/NotoSansCJKjp-DemiLight.ttf diff --git a/package/emulators/ppsspp/ppsspp.mk b/package/batocera/emulators/ppsspp/ppsspp.mk similarity index 95% rename from package/emulators/ppsspp/ppsspp.mk rename to package/batocera/emulators/ppsspp/ppsspp.mk index 80ec2c3df82..1d31c806c7d 100644 --- a/package/emulators/ppsspp/ppsspp.mk +++ b/package/batocera/emulators/ppsspp/ppsspp.mk @@ -131,13 +131,13 @@ define PPSSPP_INSTALL_TARGET_CMDS cp -R $(@D)/assets $(TARGET_DIR)/usr/share/ppsspp/PPSSPP # Fix PSP font for languages like Japanese # (font from https://github.com/minoryorg/Noto-Sans-CJK-JP/blob/master/fonts/) - cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/ppsspp/NotoSansCJKjp-DemiLight.ttf \ + cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/ppsspp/NotoSansCJKjp-DemiLight.ttf \ $(TARGET_DIR)/usr/share/ppsspp/PPSSPP/Roboto-Condensed.ttf endef define PPSSPP_POST_PROCESS mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/ppsspp/psp.ppsspp.keys \ + cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/ppsspp/psp.ppsspp.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/emulators/ppsspp/psp.ppsspp.keys b/package/batocera/emulators/ppsspp/psp.ppsspp.keys similarity index 100% rename from package/emulators/ppsspp/psp.ppsspp.keys rename to package/batocera/emulators/ppsspp/psp.ppsspp.keys diff --git a/package/emulators/python-pygame2/001-disable-portmidi.patch b/package/batocera/emulators/python-pygame2/001-disable-portmidi.patch similarity index 100% rename from package/emulators/python-pygame2/001-disable-portmidi.patch rename to package/batocera/emulators/python-pygame2/001-disable-portmidi.patch diff --git a/package/emulators/python-pygame2/002-x11include.patch b/package/batocera/emulators/python-pygame2/002-x11include.patch similarity index 100% rename from package/emulators/python-pygame2/002-x11include.patch rename to package/batocera/emulators/python-pygame2/002-x11include.patch diff --git a/package/emulators/python-pygame2/003-disable-scrap.patch b/package/batocera/emulators/python-pygame2/003-disable-scrap.patch similarity index 100% rename from package/emulators/python-pygame2/003-disable-scrap.patch rename to package/batocera/emulators/python-pygame2/003-disable-scrap.patch diff --git a/package/emulators/python-pygame2/004-disable-install-headers.patch b/package/batocera/emulators/python-pygame2/004-disable-install-headers.patch similarity index 100% rename from package/emulators/python-pygame2/004-disable-install-headers.patch rename to package/batocera/emulators/python-pygame2/004-disable-install-headers.patch diff --git a/package/emulators/python-pygame2/Config.in b/package/batocera/emulators/python-pygame2/Config.in similarity index 100% rename from package/emulators/python-pygame2/Config.in rename to package/batocera/emulators/python-pygame2/Config.in diff --git a/package/emulators/python-pygame2/python-pygame2.hash b/package/batocera/emulators/python-pygame2/python-pygame2.hash similarity index 100% rename from package/emulators/python-pygame2/python-pygame2.hash rename to package/batocera/emulators/python-pygame2/python-pygame2.hash diff --git a/package/emulators/python-pygame2/python-pygame2.mk b/package/batocera/emulators/python-pygame2/python-pygame2.mk similarity index 100% rename from package/emulators/python-pygame2/python-pygame2.mk rename to package/batocera/emulators/python-pygame2/python-pygame2.mk diff --git a/package/emulators/python-pyxel/001-pyproject.patch b/package/batocera/emulators/python-pyxel/001-pyproject.patch similarity index 100% rename from package/emulators/python-pyxel/001-pyproject.patch rename to package/batocera/emulators/python-pyxel/001-pyproject.patch diff --git a/package/emulators/python-pyxel/002-static-rust-sdl2.patch b/package/batocera/emulators/python-pyxel/002-static-rust-sdl2.patch similarity index 100% rename from package/emulators/python-pyxel/002-static-rust-sdl2.patch rename to package/batocera/emulators/python-pyxel/002-static-rust-sdl2.patch diff --git a/package/emulators/python-pyxel/Config.in b/package/batocera/emulators/python-pyxel/Config.in similarity index 100% rename from package/emulators/python-pyxel/Config.in rename to package/batocera/emulators/python-pyxel/Config.in diff --git a/package/emulators/python-pyxel/python-pyxel.mk b/package/batocera/emulators/python-pyxel/python-pyxel.mk similarity index 91% rename from package/emulators/python-pyxel/python-pyxel.mk rename to package/batocera/emulators/python-pyxel/python-pyxel.mk index 8094c788fdc..70d07216a71 100644 --- a/package/emulators/python-pyxel/python-pyxel.mk +++ b/package/batocera/emulators/python-pyxel/python-pyxel.mk @@ -29,7 +29,7 @@ define PYTHON_PYXEL_SAMPLE_AND_KEYS cp -rf $(@D)/python/pyxel $(TARGET_DIR)/usr/lib/python*/site-packages/ rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pyxel/examples cd $(TARGET_DIR)/usr/lib/python*/site-packages/pyxel && ln -sf ../pyxel_extension . - cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/python-pyxel/pyxel.keys $(TARGET_DIR)/usr/share/evmapy/ + cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/python-pyxel/pyxel.keys $(TARGET_DIR)/usr/share/evmapy/ endef PYTHON_PYXEL_PRE_INSTALL_TARGET_HOOKS += PYTHON_PYXEL_REMOVE_PREVIOUS diff --git a/package/emulators/python-pyxel/pyxel.keys b/package/batocera/emulators/python-pyxel/pyxel.keys similarity index 100% rename from package/emulators/python-pyxel/pyxel.keys rename to package/batocera/emulators/python-pyxel/pyxel.keys diff --git a/package/emulators/retroarch/batocera-retroachievements-sounds/Config.in b/package/batocera/emulators/retroarch/batocera-retroachievements-sounds/Config.in similarity index 100% rename from package/emulators/retroarch/batocera-retroachievements-sounds/Config.in rename to package/batocera/emulators/retroarch/batocera-retroachievements-sounds/Config.in diff --git a/package/emulators/retroarch/batocera-retroachievements-sounds/batocera-retroachievements-sounds.mk b/package/batocera/emulators/retroarch/batocera-retroachievements-sounds/batocera-retroachievements-sounds.mk similarity index 67% rename from package/emulators/retroarch/batocera-retroachievements-sounds/batocera-retroachievements-sounds.mk rename to package/batocera/emulators/retroarch/batocera-retroachievements-sounds/batocera-retroachievements-sounds.mk index de9d7f0abd1..31efaf2729f 100644 --- a/package/emulators/retroarch/batocera-retroachievements-sounds/batocera-retroachievements-sounds.mk +++ b/package/batocera/emulators/retroarch/batocera-retroachievements-sounds/batocera-retroachievements-sounds.mk @@ -6,7 +6,7 @@ define BATOCERA_RETROACHIEVEMENTS_SOUNDS_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/share/libretro/assets/sounds/ - cp -r $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/retroarch/batocera-retroachievements-sounds/sounds/*.ogg $(TARGET_DIR)/usr/share/libretro/assets/sounds/ + cp -r $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/retroarch/batocera-retroachievements-sounds/sounds/*.ogg $(TARGET_DIR)/usr/share/libretro/assets/sounds/ endef $(eval $(generic-package)) diff --git a/package/emulators/retroarch/batocera-retroachievements-sounds/sounds/ff-victory-orchestra.ogg b/package/batocera/emulators/retroarch/batocera-retroachievements-sounds/sounds/ff-victory-orchestra.ogg similarity index 100% rename from package/emulators/retroarch/batocera-retroachievements-sounds/sounds/ff-victory-orchestra.ogg rename to package/batocera/emulators/retroarch/batocera-retroachievements-sounds/sounds/ff-victory-orchestra.ogg diff --git a/package/emulators/retroarch/batocera-retroachievements-sounds/sounds/mario-1up.ogg b/package/batocera/emulators/retroarch/batocera-retroachievements-sounds/sounds/mario-1up.ogg similarity index 100% rename from package/emulators/retroarch/batocera-retroachievements-sounds/sounds/mario-1up.ogg rename to package/batocera/emulators/retroarch/batocera-retroachievements-sounds/sounds/mario-1up.ogg diff --git a/package/emulators/retroarch/batocera-retroachievements-sounds/sounds/mario-mushroom.ogg b/package/batocera/emulators/retroarch/batocera-retroachievements-sounds/sounds/mario-mushroom.ogg similarity index 100% rename from package/emulators/retroarch/batocera-retroachievements-sounds/sounds/mario-mushroom.ogg rename to package/batocera/emulators/retroarch/batocera-retroachievements-sounds/sounds/mario-mushroom.ogg diff --git a/package/emulators/retroarch/batocera-retroachievements-sounds/sounds/mgs-alert.ogg b/package/batocera/emulators/retroarch/batocera-retroachievements-sounds/sounds/mgs-alert.ogg similarity index 100% rename from package/emulators/retroarch/batocera-retroachievements-sounds/sounds/mgs-alert.ogg rename to package/batocera/emulators/retroarch/batocera-retroachievements-sounds/sounds/mgs-alert.ogg diff --git a/package/emulators/retroarch/batocera-retroachievements-sounds/sounds/ps3-trophy.ogg b/package/batocera/emulators/retroarch/batocera-retroachievements-sounds/sounds/ps3-trophy.ogg similarity index 100% rename from package/emulators/retroarch/batocera-retroachievements-sounds/sounds/ps3-trophy.ogg rename to package/batocera/emulators/retroarch/batocera-retroachievements-sounds/sounds/ps3-trophy.ogg diff --git a/package/emulators/retroarch/batocera-retroachievements-sounds/sounds/sonic-ring.ogg b/package/batocera/emulators/retroarch/batocera-retroachievements-sounds/sounds/sonic-ring.ogg similarity index 100% rename from package/emulators/retroarch/batocera-retroachievements-sounds/sounds/sonic-ring.ogg rename to package/batocera/emulators/retroarch/batocera-retroachievements-sounds/sounds/sonic-ring.ogg diff --git a/package/emulators/retroarch/batocera-retroachievements-sounds/sounds/xbox360-achievement.ogg b/package/batocera/emulators/retroarch/batocera-retroachievements-sounds/sounds/xbox360-achievement.ogg similarity index 100% rename from package/emulators/retroarch/batocera-retroachievements-sounds/sounds/xbox360-achievement.ogg rename to package/batocera/emulators/retroarch/batocera-retroachievements-sounds/sounds/xbox360-achievement.ogg diff --git a/package/emulators/retroarch/batocera-retroachievements-sounds/sounds/zelda-secret.ogg b/package/batocera/emulators/retroarch/batocera-retroachievements-sounds/sounds/zelda-secret.ogg similarity index 100% rename from package/emulators/retroarch/batocera-retroachievements-sounds/sounds/zelda-secret.ogg rename to package/batocera/emulators/retroarch/batocera-retroachievements-sounds/sounds/zelda-secret.ogg diff --git a/package/emulators/retroarch/libretro-core-info/Config.in b/package/batocera/emulators/retroarch/libretro-core-info/Config.in similarity index 100% rename from package/emulators/retroarch/libretro-core-info/Config.in rename to package/batocera/emulators/retroarch/libretro-core-info/Config.in diff --git a/package/emulators/retroarch/libretro-core-info/libretro-core-info.mk b/package/batocera/emulators/retroarch/libretro-core-info/libretro-core-info.mk similarity index 100% rename from package/emulators/retroarch/libretro-core-info/libretro-core-info.mk rename to package/batocera/emulators/retroarch/libretro-core-info/libretro-core-info.mk diff --git a/package/emulators/retroarch/libretro/libretro-81/000-rpi_makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-81/000-rpi_makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-81/000-rpi_makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-81/000-rpi_makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-81/001-slowerkeyboard.patch b/package/batocera/emulators/retroarch/libretro/libretro-81/001-slowerkeyboard.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-81/001-slowerkeyboard.patch rename to package/batocera/emulators/retroarch/libretro/libretro-81/001-slowerkeyboard.patch diff --git a/package/emulators/retroarch/libretro/libretro-81/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-81/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-81/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-81/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-81/libretro-81.mk b/package/batocera/emulators/retroarch/libretro/libretro-81/libretro-81.mk similarity index 92% rename from package/emulators/retroarch/libretro/libretro-81/libretro-81.mk rename to package/batocera/emulators/retroarch/libretro/libretro-81/libretro-81.mk index 1fc201b86b8..63bd48c3a69 100755 --- a/package/emulators/retroarch/libretro/libretro-81/libretro-81.mk +++ b/package/batocera/emulators/retroarch/libretro/libretro-81/libretro-81.mk @@ -30,7 +30,7 @@ endef define LIBRETRO_81_INSTALL_TARGET_CMDS $(INSTALL) -D $(@D)/81_libretro.so $(TARGET_DIR)/usr/lib/libretro/81_libretro.so $(INSTALL) -D -t $(TARGET_DIR)/usr/share/evmapy/ \ - $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/retroarch/libretro/libretro-81/zx81.keys + $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/retroarch/libretro/libretro-81/zx81.keys endef $(eval $(generic-package)) diff --git a/package/emulators/retroarch/libretro/libretro-81/zx81.keys b/package/batocera/emulators/retroarch/libretro/libretro-81/zx81.keys similarity index 100% rename from package/emulators/retroarch/libretro/libretro-81/zx81.keys rename to package/batocera/emulators/retroarch/libretro/libretro-81/zx81.keys diff --git a/package/emulators/retroarch/libretro/libretro-a5200/001-RPi5-optimisation.patch b/package/batocera/emulators/retroarch/libretro/libretro-a5200/001-RPi5-optimisation.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-a5200/001-RPi5-optimisation.patch rename to package/batocera/emulators/retroarch/libretro/libretro-a5200/001-RPi5-optimisation.patch diff --git a/package/emulators/retroarch/libretro/libretro-a5200/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-a5200/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-a5200/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-a5200/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-a5200/libretro-a5200.mk b/package/batocera/emulators/retroarch/libretro/libretro-a5200/libretro-a5200.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-a5200/libretro-a5200.mk rename to package/batocera/emulators/retroarch/libretro/libretro-a5200/libretro-a5200.mk diff --git a/package/emulators/retroarch/libretro/libretro-arduous/001-bootsizewarning.patch b/package/batocera/emulators/retroarch/libretro/libretro-arduous/001-bootsizewarning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-arduous/001-bootsizewarning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-arduous/001-bootsizewarning.patch diff --git a/package/emulators/retroarch/libretro/libretro-arduous/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-arduous/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-arduous/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-arduous/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-arduous/libretro-arduous.mk b/package/batocera/emulators/retroarch/libretro/libretro-arduous/libretro-arduous.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-arduous/libretro-arduous.mk rename to package/batocera/emulators/retroarch/libretro/libretro-arduous/libretro-arduous.mk diff --git a/package/emulators/retroarch/libretro/libretro-atari800/000-rpi_makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-atari800/000-rpi_makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-atari800/000-rpi_makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-atari800/000-rpi_makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-atari800/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-atari800/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-atari800/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-atari800/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-atari800/libretro-atari800.mk b/package/batocera/emulators/retroarch/libretro/libretro-atari800/libretro-atari800.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-atari800/libretro-atari800.mk rename to package/batocera/emulators/retroarch/libretro/libretro-atari800/libretro-atari800.mk diff --git a/package/emulators/retroarch/libretro/libretro-beetle-lynx/001-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-beetle-lynx/001-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-lynx/001-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-lynx/001-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-beetle-lynx/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-beetle-lynx/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-lynx/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-lynx/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-beetle-lynx/libretro-beetle-lynx.mk b/package/batocera/emulators/retroarch/libretro/libretro-beetle-lynx/libretro-beetle-lynx.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-lynx/libretro-beetle-lynx.mk rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-lynx/libretro-beetle-lynx.mk diff --git a/package/emulators/retroarch/libretro/libretro-beetle-ngp/001-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-beetle-ngp/001-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-ngp/001-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-ngp/001-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-beetle-ngp/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-beetle-ngp/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-ngp/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-ngp/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-beetle-ngp/libretro-beetle-ngp.mk b/package/batocera/emulators/retroarch/libretro/libretro-beetle-ngp/libretro-beetle-ngp.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-ngp/libretro-beetle-ngp.mk rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-ngp/libretro-beetle-ngp.mk diff --git a/package/emulators/retroarch/libretro/libretro-beetle-pce-fast/000-makefile-no-cd.patch b/package/batocera/emulators/retroarch/libretro/libretro-beetle-pce-fast/000-makefile-no-cd.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-pce-fast/000-makefile-no-cd.patch rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-pce-fast/000-makefile-no-cd.patch diff --git a/package/emulators/retroarch/libretro/libretro-beetle-pce-fast/001-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-beetle-pce-fast/001-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-pce-fast/001-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-pce-fast/001-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-beetle-pce-fast/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-beetle-pce-fast/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-pce-fast/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-pce-fast/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-beetle-pce-fast/libretro-beetle-pce-fast.mk b/package/batocera/emulators/retroarch/libretro/libretro-beetle-pce-fast/libretro-beetle-pce-fast.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-pce-fast/libretro-beetle-pce-fast.mk rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-pce-fast/libretro-beetle-pce-fast.mk diff --git a/package/emulators/retroarch/libretro/libretro-beetle-pce/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-beetle-pce/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-pce/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-pce/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-beetle-pce/libretro-beetle-pce.mk b/package/batocera/emulators/retroarch/libretro/libretro-beetle-pce/libretro-beetle-pce.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-pce/libretro-beetle-pce.mk rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-pce/libretro-beetle-pce.mk diff --git a/package/emulators/retroarch/libretro/libretro-beetle-pcfx/000-makefile-add-odin.patch b/package/batocera/emulators/retroarch/libretro/libretro-beetle-pcfx/000-makefile-add-odin.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-pcfx/000-makefile-add-odin.patch rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-pcfx/000-makefile-add-odin.patch diff --git a/package/emulators/retroarch/libretro/libretro-beetle-pcfx/001-makefile-add-rk3588.patch b/package/batocera/emulators/retroarch/libretro/libretro-beetle-pcfx/001-makefile-add-rk3588.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-pcfx/001-makefile-add-rk3588.patch rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-pcfx/001-makefile-add-rk3588.patch diff --git a/package/emulators/retroarch/libretro/libretro-beetle-pcfx/002-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-beetle-pcfx/002-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-pcfx/002-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-pcfx/002-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-beetle-pcfx/003-makefile-add-riscv64.patch b/package/batocera/emulators/retroarch/libretro/libretro-beetle-pcfx/003-makefile-add-riscv64.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-pcfx/003-makefile-add-riscv64.patch rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-pcfx/003-makefile-add-riscv64.patch diff --git a/package/emulators/retroarch/libretro/libretro-beetle-pcfx/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-beetle-pcfx/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-pcfx/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-pcfx/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-beetle-pcfx/libretro-beetle-pcfx.mk b/package/batocera/emulators/retroarch/libretro/libretro-beetle-pcfx/libretro-beetle-pcfx.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-pcfx/libretro-beetle-pcfx.mk rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-pcfx/libretro-beetle-pcfx.mk diff --git a/package/emulators/retroarch/libretro/libretro-beetle-psx/000-makefile-no-cd.patch b/package/batocera/emulators/retroarch/libretro/libretro-beetle-psx/000-makefile-no-cd.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-psx/000-makefile-no-cd.patch rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-psx/000-makefile-no-cd.patch diff --git a/package/emulators/retroarch/libretro/libretro-beetle-psx/001-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-beetle-psx/001-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-psx/001-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-psx/001-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-beetle-psx/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-beetle-psx/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-psx/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-psx/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-beetle-psx/libretro-beetle-psx.mk b/package/batocera/emulators/retroarch/libretro/libretro-beetle-psx/libretro-beetle-psx.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-psx/libretro-beetle-psx.mk rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-psx/libretro-beetle-psx.mk diff --git a/package/emulators/retroarch/libretro/libretro-beetle-saturn/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-beetle-saturn/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-saturn/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-saturn/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-beetle-saturn/libretro-beetle-saturn.mk b/package/batocera/emulators/retroarch/libretro/libretro-beetle-saturn/libretro-beetle-saturn.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-saturn/libretro-beetle-saturn.mk rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-saturn/libretro-beetle-saturn.mk diff --git a/package/emulators/retroarch/libretro/libretro-beetle-supergrafx/000-makefile-no-cd.patch b/package/batocera/emulators/retroarch/libretro/libretro-beetle-supergrafx/000-makefile-no-cd.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-supergrafx/000-makefile-no-cd.patch rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-supergrafx/000-makefile-no-cd.patch diff --git a/package/emulators/retroarch/libretro/libretro-beetle-supergrafx/001-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-beetle-supergrafx/001-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-supergrafx/001-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-supergrafx/001-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-beetle-supergrafx/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-beetle-supergrafx/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-supergrafx/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-supergrafx/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-beetle-supergrafx/libretro-beetle-supergrafx.mk b/package/batocera/emulators/retroarch/libretro/libretro-beetle-supergrafx/libretro-beetle-supergrafx.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-supergrafx/libretro-beetle-supergrafx.mk rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-supergrafx/libretro-beetle-supergrafx.mk diff --git a/package/emulators/retroarch/libretro/libretro-beetle-vb/001-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-beetle-vb/001-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-vb/001-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-vb/001-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-beetle-vb/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-beetle-vb/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-vb/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-vb/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-beetle-vb/libretro-beetle-vb.mk b/package/batocera/emulators/retroarch/libretro/libretro-beetle-vb/libretro-beetle-vb.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-vb/libretro-beetle-vb.mk rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-vb/libretro-beetle-vb.mk diff --git a/package/emulators/retroarch/libretro/libretro-beetle-wswan/001-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-beetle-wswan/001-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-wswan/001-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-wswan/001-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-beetle-wswan/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-beetle-wswan/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-wswan/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-wswan/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-beetle-wswan/libretro-beetle-wswan.mk b/package/batocera/emulators/retroarch/libretro/libretro-beetle-wswan/libretro-beetle-wswan.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-beetle-wswan/libretro-beetle-wswan.mk rename to package/batocera/emulators/retroarch/libretro/libretro-beetle-wswan/libretro-beetle-wswan.mk diff --git a/package/emulators/retroarch/libretro/libretro-blastem/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-blastem/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-blastem/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-blastem/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-blastem/libretro-blastem.mk b/package/batocera/emulators/retroarch/libretro/libretro-blastem/libretro-blastem.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-blastem/libretro-blastem.mk rename to package/batocera/emulators/retroarch/libretro/libretro-blastem/libretro-blastem.mk diff --git a/package/emulators/retroarch/libretro/libretro-bluemsx/001-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-bluemsx/001-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-bluemsx/001-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-bluemsx/001-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-bluemsx/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-bluemsx/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-bluemsx/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-bluemsx/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-bluemsx/libretro-bluemsx.mk b/package/batocera/emulators/retroarch/libretro/libretro-bluemsx/libretro-bluemsx.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-bluemsx/libretro-bluemsx.mk rename to package/batocera/emulators/retroarch/libretro/libretro-bluemsx/libretro-bluemsx.mk diff --git a/package/emulators/retroarch/libretro/libretro-bsnes-hd/000-GNUmakefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-bsnes-hd/000-GNUmakefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-bsnes-hd/000-GNUmakefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-bsnes-hd/000-GNUmakefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-bsnes-hd/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-bsnes-hd/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-bsnes-hd/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-bsnes-hd/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-bsnes-hd/libretro-bsnes-hd.mk b/package/batocera/emulators/retroarch/libretro/libretro-bsnes-hd/libretro-bsnes-hd.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-bsnes-hd/libretro-bsnes-hd.mk rename to package/batocera/emulators/retroarch/libretro/libretro-bsnes-hd/libretro-bsnes-hd.mk diff --git a/package/emulators/retroarch/libretro/libretro-bsnes/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-bsnes/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-bsnes/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-bsnes/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-bsnes/libretro-bsnes.mk b/package/batocera/emulators/retroarch/libretro/libretro-bsnes/libretro-bsnes.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-bsnes/libretro-bsnes.mk rename to package/batocera/emulators/retroarch/libretro/libretro-bsnes/libretro-bsnes.mk diff --git a/package/emulators/retroarch/libretro/libretro-cap32/000-rpi_makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-cap32/000-rpi_makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-cap32/000-rpi_makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-cap32/000-rpi_makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-cap32/002-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-cap32/002-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-cap32/002-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-cap32/002-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-cap32/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-cap32/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-cap32/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-cap32/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-cap32/amstradcpc.keys b/package/batocera/emulators/retroarch/libretro/libretro-cap32/amstradcpc.keys similarity index 100% rename from package/emulators/retroarch/libretro/libretro-cap32/amstradcpc.keys rename to package/batocera/emulators/retroarch/libretro/libretro-cap32/amstradcpc.keys diff --git a/package/emulators/retroarch/libretro/libretro-cap32/libretro-cap32.mk b/package/batocera/emulators/retroarch/libretro/libretro-cap32/libretro-cap32.mk similarity index 92% rename from package/emulators/retroarch/libretro/libretro-cap32/libretro-cap32.mk rename to package/batocera/emulators/retroarch/libretro/libretro-cap32/libretro-cap32.mk index 40743e84e5b..8df6c6efbb2 100644 --- a/package/emulators/retroarch/libretro/libretro-cap32/libretro-cap32.mk +++ b/package/batocera/emulators/retroarch/libretro/libretro-cap32/libretro-cap32.mk @@ -40,7 +40,7 @@ define LIBRETRO_CAP32_INSTALL_TARGET_CMDS $(INSTALL) -D $(@D)/cap32_libretro.so \ $(TARGET_DIR)/usr/lib/libretro/cap32_libretro.so mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/retroarch/libretro/libretro-cap32/amstradcpc.keys \ + cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/retroarch/libretro/libretro-cap32/amstradcpc.keys \ $(TARGET_DIR)/usr/share/evmapy/ endef diff --git a/package/emulators/retroarch/libretro/libretro-chailove/000-rpi_makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-chailove/000-rpi_makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-chailove/000-rpi_makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-chailove/000-rpi_makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-chailove/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-chailove/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-chailove/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-chailove/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-chailove/libretro-chailove.mk b/package/batocera/emulators/retroarch/libretro/libretro-chailove/libretro-chailove.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-chailove/libretro-chailove.mk rename to package/batocera/emulators/retroarch/libretro/libretro-chailove/libretro-chailove.mk diff --git a/package/emulators/retroarch/libretro/libretro-craft/000-makefile-rpi.patch b/package/batocera/emulators/retroarch/libretro/libretro-craft/000-makefile-rpi.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-craft/000-makefile-rpi.patch rename to package/batocera/emulators/retroarch/libretro/libretro-craft/000-makefile-rpi.patch diff --git a/package/emulators/retroarch/libretro/libretro-craft/001-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-craft/001-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-craft/001-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-craft/001-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-craft/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-craft/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-craft/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-craft/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-craft/libretro-craft.mk b/package/batocera/emulators/retroarch/libretro/libretro-craft/libretro-craft.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-craft/libretro-craft.mk rename to package/batocera/emulators/retroarch/libretro/libretro-craft/libretro-craft.mk diff --git a/package/emulators/retroarch/libretro/libretro-desmume/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-desmume/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-desmume/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-desmume/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-desmume/libretro-desmume.mk b/package/batocera/emulators/retroarch/libretro/libretro-desmume/libretro-desmume.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-desmume/libretro-desmume.mk rename to package/batocera/emulators/retroarch/libretro/libretro-desmume/libretro-desmume.mk diff --git a/package/emulators/retroarch/libretro/libretro-dinothawr/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-dinothawr/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-dinothawr/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-dinothawr/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-dinothawr/libretro-dinothawr.mk b/package/batocera/emulators/retroarch/libretro/libretro-dinothawr/libretro-dinothawr.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-dinothawr/libretro-dinothawr.mk rename to package/batocera/emulators/retroarch/libretro/libretro-dinothawr/libretro-dinothawr.mk diff --git a/package/emulators/retroarch/libretro/libretro-dolphin/001-remove_conflicting_armv8_flag.patch b/package/batocera/emulators/retroarch/libretro/libretro-dolphin/001-remove_conflicting_armv8_flag.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-dolphin/001-remove_conflicting_armv8_flag.patch rename to package/batocera/emulators/retroarch/libretro/libretro-dolphin/001-remove_conflicting_armv8_flag.patch diff --git a/package/emulators/retroarch/libretro/libretro-dolphin/002-fix-fmt10-errors.patch b/package/batocera/emulators/retroarch/libretro/libretro-dolphin/002-fix-fmt10-errors.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-dolphin/002-fix-fmt10-errors.patch rename to package/batocera/emulators/retroarch/libretro/libretro-dolphin/002-fix-fmt10-errors.patch diff --git a/package/emulators/retroarch/libretro/libretro-dolphin/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-dolphin/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-dolphin/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-dolphin/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-dolphin/libretro-dolphin.mk b/package/batocera/emulators/retroarch/libretro/libretro-dolphin/libretro-dolphin.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-dolphin/libretro-dolphin.mk rename to package/batocera/emulators/retroarch/libretro/libretro-dolphin/libretro-dolphin.mk diff --git a/package/emulators/retroarch/libretro/libretro-dosbox-pure/000-rpi_makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-dosbox-pure/000-rpi_makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-dosbox-pure/000-rpi_makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-dosbox-pure/000-rpi_makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-dosbox-pure/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-dosbox-pure/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-dosbox-pure/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-dosbox-pure/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-dosbox-pure/libretro-dosbox-pure.mk b/package/batocera/emulators/retroarch/libretro/libretro-dosbox-pure/libretro-dosbox-pure.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-dosbox-pure/libretro-dosbox-pure.mk rename to package/batocera/emulators/retroarch/libretro/libretro-dosbox-pure/libretro-dosbox-pure.mk diff --git a/package/emulators/retroarch/libretro/libretro-easyrpg/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-easyrpg/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-easyrpg/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-easyrpg/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-easyrpg/libretro-easyrpg.mk b/package/batocera/emulators/retroarch/libretro/libretro-easyrpg/libretro-easyrpg.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-easyrpg/libretro-easyrpg.mk rename to package/batocera/emulators/retroarch/libretro/libretro-easyrpg/libretro-easyrpg.mk diff --git a/package/emulators/retroarch/libretro/libretro-emuscv/000-rpi_makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-emuscv/000-rpi_makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-emuscv/000-rpi_makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-emuscv/000-rpi_makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-emuscv/001-fix-hardcoded-pathes.patch b/package/batocera/emulators/retroarch/libretro/libretro-emuscv/001-fix-hardcoded-pathes.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-emuscv/001-fix-hardcoded-pathes.patch rename to package/batocera/emulators/retroarch/libretro/libretro-emuscv/001-fix-hardcoded-pathes.patch diff --git a/package/emulators/retroarch/libretro/libretro-emuscv/002-disable-watermark.patch b/package/batocera/emulators/retroarch/libretro/libretro-emuscv/002-disable-watermark.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-emuscv/002-disable-watermark.patch rename to package/batocera/emulators/retroarch/libretro/libretro-emuscv/002-disable-watermark.patch diff --git a/package/emulators/retroarch/libretro/libretro-emuscv/003-remove-io-header.patch b/package/batocera/emulators/retroarch/libretro/libretro-emuscv/003-remove-io-header.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-emuscv/003-remove-io-header.patch rename to package/batocera/emulators/retroarch/libretro/libretro-emuscv/003-remove-io-header.patch diff --git a/package/emulators/retroarch/libretro/libretro-emuscv/004-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-emuscv/004-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-emuscv/004-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-emuscv/004-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-emuscv/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-emuscv/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-emuscv/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-emuscv/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-emuscv/libretro-emuscv.mk b/package/batocera/emulators/retroarch/libretro/libretro-emuscv/libretro-emuscv.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-emuscv/libretro-emuscv.mk rename to package/batocera/emulators/retroarch/libretro/libretro-emuscv/libretro-emuscv.mk diff --git a/package/emulators/retroarch/libretro/libretro-fake08/001-fix-gcc13.patch b/package/batocera/emulators/retroarch/libretro/libretro-fake08/001-fix-gcc13.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-fake08/001-fix-gcc13.patch rename to package/batocera/emulators/retroarch/libretro/libretro-fake08/001-fix-gcc13.patch diff --git a/package/emulators/retroarch/libretro/libretro-fake08/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-fake08/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-fake08/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-fake08/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-fake08/libretro-fake08.mk b/package/batocera/emulators/retroarch/libretro/libretro-fake08/libretro-fake08.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-fake08/libretro-fake08.mk rename to package/batocera/emulators/retroarch/libretro/libretro-fake08/libretro-fake08.mk diff --git a/package/emulators/retroarch/libretro/libretro-fbalpha/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-fbalpha/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-fbalpha/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-fbalpha/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-fbalpha/libretro-fbalpha.mk b/package/batocera/emulators/retroarch/libretro/libretro-fbalpha/libretro-fbalpha.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-fbalpha/libretro-fbalpha.mk rename to package/batocera/emulators/retroarch/libretro/libretro-fbalpha/libretro-fbalpha.mk diff --git a/package/emulators/retroarch/libretro/libretro-fbneo/001-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-fbneo/001-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-fbneo/001-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-fbneo/001-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-fbneo/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-fbneo/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-fbneo/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-fbneo/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-fbneo/libretro-fbneo.mk b/package/batocera/emulators/retroarch/libretro/libretro-fbneo/libretro-fbneo.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-fbneo/libretro-fbneo.mk rename to package/batocera/emulators/retroarch/libretro/libretro-fbneo/libretro-fbneo.mk diff --git a/package/emulators/retroarch/libretro/libretro-fceumm/001-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-fceumm/001-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-fceumm/001-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-fceumm/001-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-fceumm/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-fceumm/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-fceumm/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-fceumm/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-fceumm/libretro-fceumm.mk b/package/batocera/emulators/retroarch/libretro/libretro-fceumm/libretro-fceumm.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-fceumm/libretro-fceumm.mk rename to package/batocera/emulators/retroarch/libretro/libretro-fceumm/libretro-fceumm.mk diff --git a/package/emulators/retroarch/libretro/libretro-flycast/000-makefile-additions.patch b/package/batocera/emulators/retroarch/libretro/libretro-flycast/000-makefile-additions.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-flycast/000-makefile-additions.patch rename to package/batocera/emulators/retroarch/libretro/libretro-flycast/000-makefile-additions.patch diff --git a/package/emulators/retroarch/libretro/libretro-flycast/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-flycast/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-flycast/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-flycast/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-flycast/libretro-flycast.mk b/package/batocera/emulators/retroarch/libretro/libretro-flycast/libretro-flycast.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-flycast/libretro-flycast.mk rename to package/batocera/emulators/retroarch/libretro/libretro-flycast/libretro-flycast.mk diff --git a/package/emulators/retroarch/libretro/libretro-flycastvl/000-save_vmu.patch b/package/batocera/emulators/retroarch/libretro/libretro-flycastvl/000-save_vmu.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-flycastvl/000-save_vmu.patch rename to package/batocera/emulators/retroarch/libretro/libretro-flycastvl/000-save_vmu.patch diff --git a/package/emulators/retroarch/libretro/libretro-flycastvl/0001-makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-flycastvl/0001-makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-flycastvl/0001-makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-flycastvl/0001-makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-flycastvl/0002-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-flycastvl/0002-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-flycastvl/0002-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-flycastvl/0002-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-flycastvl/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-flycastvl/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-flycastvl/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-flycastvl/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-flycastvl/flycastvl_libretro.info b/package/batocera/emulators/retroarch/libretro/libretro-flycastvl/flycastvl_libretro.info similarity index 100% rename from package/emulators/retroarch/libretro/libretro-flycastvl/flycastvl_libretro.info rename to package/batocera/emulators/retroarch/libretro/libretro-flycastvl/flycastvl_libretro.info diff --git a/package/emulators/retroarch/libretro/libretro-flycastvl/libretro-flycastvl.mk b/package/batocera/emulators/retroarch/libretro/libretro-flycastvl/libretro-flycastvl.mk similarity index 95% rename from package/emulators/retroarch/libretro/libretro-flycastvl/libretro-flycastvl.mk rename to package/batocera/emulators/retroarch/libretro/libretro-flycastvl/libretro-flycastvl.mk index 5dbd13e70dd..305b1dd9945 100644 --- a/package/emulators/retroarch/libretro/libretro-flycastvl/libretro-flycastvl.mk +++ b/package/batocera/emulators/retroarch/libretro/libretro-flycastvl/libretro-flycastvl.mk @@ -57,7 +57,7 @@ define LIBRETRO_FLYCASTVL_INSTALL_TARGET_CMDS $(TARGET_DIR)/usr/lib/libretro/flycastvl_libretro.so mkdir -p $(TARGET_DIR)/usr/share/libretro/info/ - cp "$(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/retroarch/libretro/libretro-flycastvl/flycastvl_libretro.info" \ + cp "$(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/retroarch/libretro/libretro-flycastvl/flycastvl_libretro.info" \ "$(TARGET_DIR)/usr/share/libretro/info/" endef diff --git a/package/emulators/retroarch/libretro/libretro-fmsx/000-rpi_makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-fmsx/000-rpi_makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-fmsx/000-rpi_makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-fmsx/000-rpi_makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-fmsx/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-fmsx/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-fmsx/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-fmsx/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-fmsx/libretro-fmsx.mk b/package/batocera/emulators/retroarch/libretro/libretro-fmsx/libretro-fmsx.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-fmsx/libretro-fmsx.mk rename to package/batocera/emulators/retroarch/libretro/libretro-fmsx/libretro-fmsx.mk diff --git a/package/emulators/retroarch/libretro/libretro-freechaf/000-rpi_makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-freechaf/000-rpi_makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-freechaf/000-rpi_makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-freechaf/000-rpi_makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-freechaf/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-freechaf/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-freechaf/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-freechaf/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-freechaf/libretro-freechaf.mk b/package/batocera/emulators/retroarch/libretro/libretro-freechaf/libretro-freechaf.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-freechaf/libretro-freechaf.mk rename to package/batocera/emulators/retroarch/libretro/libretro-freechaf/libretro-freechaf.mk diff --git a/package/emulators/retroarch/libretro/libretro-freeintv/000-rpi_makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-freeintv/000-rpi_makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-freeintv/000-rpi_makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-freeintv/000-rpi_makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-freeintv/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-freeintv/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-freeintv/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-freeintv/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-freeintv/libretro-freeintv.mk b/package/batocera/emulators/retroarch/libretro/libretro-freeintv/libretro-freeintv.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-freeintv/libretro-freeintv.mk rename to package/batocera/emulators/retroarch/libretro/libretro-freeintv/libretro-freeintv.mk diff --git a/package/emulators/retroarch/libretro/libretro-fuse/001-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-fuse/001-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-fuse/001-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-fuse/001-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-fuse/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-fuse/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-fuse/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-fuse/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-fuse/libretro-fuse.mk b/package/batocera/emulators/retroarch/libretro/libretro-fuse/libretro-fuse.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-fuse/libretro-fuse.mk rename to package/batocera/emulators/retroarch/libretro/libretro-fuse/libretro-fuse.mk diff --git a/package/emulators/retroarch/libretro/libretro-gambatte/001-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-gambatte/001-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-gambatte/001-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-gambatte/001-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-gambatte/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-gambatte/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-gambatte/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-gambatte/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-gambatte/libretro-gambatte.mk b/package/batocera/emulators/retroarch/libretro/libretro-gambatte/libretro-gambatte.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-gambatte/libretro-gambatte.mk rename to package/batocera/emulators/retroarch/libretro/libretro-gambatte/libretro-gambatte.mk diff --git a/package/emulators/retroarch/libretro/libretro-gearsystem/000-makefile-additions.patch b/package/batocera/emulators/retroarch/libretro/libretro-gearsystem/000-makefile-additions.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-gearsystem/000-makefile-additions.patch rename to package/batocera/emulators/retroarch/libretro/libretro-gearsystem/000-makefile-additions.patch diff --git a/package/emulators/retroarch/libretro/libretro-gearsystem/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-gearsystem/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-gearsystem/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-gearsystem/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-gearsystem/libretro-gearsystem.mk b/package/batocera/emulators/retroarch/libretro/libretro-gearsystem/libretro-gearsystem.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-gearsystem/libretro-gearsystem.mk rename to package/batocera/emulators/retroarch/libretro/libretro-gearsystem/libretro-gearsystem.mk diff --git a/package/emulators/retroarch/libretro/libretro-genesisplusgx-wide/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-genesisplusgx-wide/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-genesisplusgx-wide/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-genesisplusgx-wide/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-genesisplusgx-wide/libretro-genesisplusgx-wide.mk b/package/batocera/emulators/retroarch/libretro/libretro-genesisplusgx-wide/libretro-genesisplusgx-wide.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-genesisplusgx-wide/libretro-genesisplusgx-wide.mk rename to package/batocera/emulators/retroarch/libretro/libretro-genesisplusgx-wide/libretro-genesisplusgx-wide.mk diff --git a/package/emulators/retroarch/libretro/libretro-genesisplusgx/000-makefile-additions.patch b/package/batocera/emulators/retroarch/libretro/libretro-genesisplusgx/000-makefile-additions.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-genesisplusgx/000-makefile-additions.patch rename to package/batocera/emulators/retroarch/libretro/libretro-genesisplusgx/000-makefile-additions.patch diff --git a/package/emulators/retroarch/libretro/libretro-genesisplusgx/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-genesisplusgx/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-genesisplusgx/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-genesisplusgx/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-genesisplusgx/libretro-genesisplusgx.mk b/package/batocera/emulators/retroarch/libretro/libretro-genesisplusgx/libretro-genesisplusgx.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-genesisplusgx/libretro-genesisplusgx.mk rename to package/batocera/emulators/retroarch/libretro/libretro-genesisplusgx/libretro-genesisplusgx.mk diff --git a/package/emulators/retroarch/libretro/libretro-gpsp/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-gpsp/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-gpsp/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-gpsp/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-gpsp/libretro-gpsp.mk b/package/batocera/emulators/retroarch/libretro/libretro-gpsp/libretro-gpsp.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-gpsp/libretro-gpsp.mk rename to package/batocera/emulators/retroarch/libretro/libretro-gpsp/libretro-gpsp.mk diff --git a/package/emulators/retroarch/libretro/libretro-gw/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-gw/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-gw/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-gw/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-gw/libretro-gw.mk b/package/batocera/emulators/retroarch/libretro/libretro-gw/libretro-gw.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-gw/libretro-gw.mk rename to package/batocera/emulators/retroarch/libretro/libretro-gw/libretro-gw.mk diff --git a/package/emulators/retroarch/libretro/libretro-handy/000-rpi_makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-handy/000-rpi_makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-handy/000-rpi_makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-handy/000-rpi_makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-handy/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-handy/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-handy/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-handy/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-handy/libretro-handy.mk b/package/batocera/emulators/retroarch/libretro/libretro-handy/libretro-handy.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-handy/libretro-handy.mk rename to package/batocera/emulators/retroarch/libretro/libretro-handy/libretro-handy.mk diff --git a/package/emulators/retroarch/libretro/libretro-hatari/000-makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-hatari/000-makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-hatari/000-makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-hatari/000-makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-hatari/001-pathconfig.patch b/package/batocera/emulators/retroarch/libretro/libretro-hatari/001-pathconfig.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-hatari/001-pathconfig.patch rename to package/batocera/emulators/retroarch/libretro/libretro-hatari/001-pathconfig.patch diff --git a/package/emulators/retroarch/libretro/libretro-hatari/003-floppy-ipf.patch b/package/batocera/emulators/retroarch/libretro/libretro-hatari/003-floppy-ipf.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-hatari/003-floppy-ipf.patch rename to package/batocera/emulators/retroarch/libretro/libretro-hatari/003-floppy-ipf.patch diff --git a/package/emulators/retroarch/libretro/libretro-hatari/004-ipf-uaecpu.patch b/package/batocera/emulators/retroarch/libretro/libretro-hatari/004-ipf-uaecpu.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-hatari/004-ipf-uaecpu.patch rename to package/batocera/emulators/retroarch/libretro/libretro-hatari/004-ipf-uaecpu.patch diff --git a/package/emulators/retroarch/libretro/libretro-hatari/005-rpi_makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-hatari/005-rpi_makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-hatari/005-rpi_makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-hatari/005-rpi_makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-hatari/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-hatari/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-hatari/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-hatari/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-hatari/libretro-hatari.mk b/package/batocera/emulators/retroarch/libretro/libretro-hatari/libretro-hatari.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-hatari/libretro-hatari.mk rename to package/batocera/emulators/retroarch/libretro/libretro-hatari/libretro-hatari.mk diff --git a/package/emulators/retroarch/libretro/libretro-hatarib/001-fix-soname.patch b/package/batocera/emulators/retroarch/libretro/libretro-hatarib/001-fix-soname.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-hatarib/001-fix-soname.patch rename to package/batocera/emulators/retroarch/libretro/libretro-hatarib/001-fix-soname.patch diff --git a/package/emulators/retroarch/libretro/libretro-hatarib/002-no-bundled-sdl-zlib.patch b/package/batocera/emulators/retroarch/libretro/libretro-hatarib/002-no-bundled-sdl-zlib.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-hatarib/002-no-bundled-sdl-zlib.patch rename to package/batocera/emulators/retroarch/libretro/libretro-hatarib/002-no-bundled-sdl-zlib.patch diff --git a/package/emulators/retroarch/libretro/libretro-hatarib/003-hatari-cmake-crosscompiling.patch b/package/batocera/emulators/retroarch/libretro/libretro-hatarib/003-hatari-cmake-crosscompiling.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-hatarib/003-hatari-cmake-crosscompiling.patch rename to package/batocera/emulators/retroarch/libretro/libretro-hatarib/003-hatari-cmake-crosscompiling.patch diff --git a/package/emulators/retroarch/libretro/libretro-hatarib/004-remove-shorthash.patch b/package/batocera/emulators/retroarch/libretro/libretro-hatarib/004-remove-shorthash.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-hatarib/004-remove-shorthash.patch rename to package/batocera/emulators/retroarch/libretro/libretro-hatarib/004-remove-shorthash.patch diff --git a/package/emulators/retroarch/libretro/libretro-hatarib/005-cmakeflags.patch b/package/batocera/emulators/retroarch/libretro/libretro-hatarib/005-cmakeflags.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-hatarib/005-cmakeflags.patch rename to package/batocera/emulators/retroarch/libretro/libretro-hatarib/005-cmakeflags.patch diff --git a/package/emulators/retroarch/libretro/libretro-hatarib/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-hatarib/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-hatarib/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-hatarib/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-hatarib/libretro-hatarib.mk b/package/batocera/emulators/retroarch/libretro/libretro-hatarib/libretro-hatarib.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-hatarib/libretro-hatarib.mk rename to package/batocera/emulators/retroarch/libretro/libretro-hatarib/libretro-hatarib.mk diff --git a/package/emulators/retroarch/libretro/libretro-imame/000-rpi_makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-imame/000-rpi_makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-imame/000-rpi_makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-imame/000-rpi_makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-imame/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-imame/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-imame/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-imame/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-imame/libretro-imame.mk b/package/batocera/emulators/retroarch/libretro/libretro-imame/libretro-imame.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-imame/libretro-imame.mk rename to package/batocera/emulators/retroarch/libretro/libretro-imame/libretro-imame.mk diff --git a/package/emulators/retroarch/libretro/libretro-kronos/000-biospath.patch b/package/batocera/emulators/retroarch/libretro/libretro-kronos/000-biospath.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-kronos/000-biospath.patch rename to package/batocera/emulators/retroarch/libretro/libretro-kronos/000-biospath.patch diff --git a/package/emulators/retroarch/libretro/libretro-kronos/001-makefile-remove-bogus-link-GL.patch b/package/batocera/emulators/retroarch/libretro/libretro-kronos/001-makefile-remove-bogus-link-GL.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-kronos/001-makefile-remove-bogus-link-GL.patch rename to package/batocera/emulators/retroarch/libretro/libretro-kronos/001-makefile-remove-bogus-link-GL.patch diff --git a/package/emulators/retroarch/libretro/libretro-kronos/002-makefile-c4-support.patch b/package/batocera/emulators/retroarch/libretro/libretro-kronos/002-makefile-c4-support.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-kronos/002-makefile-c4-support.patch rename to package/batocera/emulators/retroarch/libretro/libretro-kronos/002-makefile-c4-support.patch diff --git a/package/emulators/retroarch/libretro/libretro-kronos/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-kronos/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-kronos/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-kronos/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-kronos/libretro-kronos.mk b/package/batocera/emulators/retroarch/libretro/libretro-kronos/libretro-kronos.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-kronos/libretro-kronos.mk rename to package/batocera/emulators/retroarch/libretro/libretro-kronos/libretro-kronos.mk diff --git a/package/emulators/retroarch/libretro/libretro-lowresnx/001-rpi-optimisations.patch b/package/batocera/emulators/retroarch/libretro/libretro-lowresnx/001-rpi-optimisations.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-lowresnx/001-rpi-optimisations.patch rename to package/batocera/emulators/retroarch/libretro/libretro-lowresnx/001-rpi-optimisations.patch diff --git a/package/emulators/retroarch/libretro/libretro-lowresnx/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-lowresnx/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-lowresnx/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-lowresnx/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-lowresnx/libretro-lowresnx.mk b/package/batocera/emulators/retroarch/libretro/libretro-lowresnx/libretro-lowresnx.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-lowresnx/libretro-lowresnx.mk rename to package/batocera/emulators/retroarch/libretro/libretro-lowresnx/libretro-lowresnx.mk diff --git a/package/emulators/retroarch/libretro/libretro-lutro/000-rpi_makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-lutro/000-rpi_makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-lutro/000-rpi_makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-lutro/000-rpi_makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-lutro/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-lutro/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-lutro/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-lutro/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-lutro/libretro-lutro.mk b/package/batocera/emulators/retroarch/libretro/libretro-lutro/libretro-lutro.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-lutro/libretro-lutro.mk rename to package/batocera/emulators/retroarch/libretro/libretro-lutro/libretro-lutro.mk diff --git a/package/emulators/retroarch/libretro/libretro-mame/000-makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-mame/000-makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mame/000-makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-mame/000-makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-mame/001-mame-cross-compilation.patch b/package/batocera/emulators/retroarch/libretro/libretro-mame/001-mame-cross-compilation.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mame/001-mame-cross-compilation.patch rename to package/batocera/emulators/retroarch/libretro/libretro-mame/001-mame-cross-compilation.patch diff --git a/package/emulators/retroarch/libretro/libretro-mame/002-vgmplay-layout.patch b/package/batocera/emulators/retroarch/libretro/libretro-mame/002-vgmplay-layout.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mame/002-vgmplay-layout.patch rename to package/batocera/emulators/retroarch/libretro/libretro-mame/002-vgmplay-layout.patch diff --git a/package/emulators/retroarch/libretro/libretro-mame/003-nopch.patch b/package/batocera/emulators/retroarch/libretro/libretro-mame/003-nopch.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mame/003-nopch.patch rename to package/batocera/emulators/retroarch/libretro/libretro-mame/003-nopch.patch diff --git a/package/emulators/retroarch/libretro/libretro-mame/004-batocera-ini.patch b/package/batocera/emulators/retroarch/libretro/libretro-mame/004-batocera-ini.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mame/004-batocera-ini.patch rename to package/batocera/emulators/retroarch/libretro/libretro-mame/004-batocera-ini.patch diff --git a/package/emulators/retroarch/libretro/libretro-mame/005-flto-auto-genie.patch b/package/batocera/emulators/retroarch/libretro/libretro-mame/005-flto-auto-genie.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mame/005-flto-auto-genie.patch rename to package/batocera/emulators/retroarch/libretro/libretro-mame/005-flto-auto-genie.patch diff --git a/package/emulators/retroarch/libretro/libretro-mame/006-mame-cv1k.patch.disabled b/package/batocera/emulators/retroarch/libretro/libretro-mame/006-mame-cv1k.patch.disabled similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mame/006-mame-cv1k.patch.disabled rename to package/batocera/emulators/retroarch/libretro/libretro-mame/006-mame-cv1k.patch.disabled diff --git a/package/emulators/retroarch/libretro/libretro-mame/007-libretro-fix-joystick-4-way-option.patch b/package/batocera/emulators/retroarch/libretro/libretro-mame/007-libretro-fix-joystick-4-way-option.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mame/007-libretro-fix-joystick-4-way-option.patch rename to package/batocera/emulators/retroarch/libretro/libretro-mame/007-libretro-fix-joystick-4-way-option.patch diff --git a/package/emulators/retroarch/libretro/libretro-mame/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-mame/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mame/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-mame/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-mame/blank.fmtowns b/package/batocera/emulators/retroarch/libretro/libretro-mame/blank.fmtowns similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mame/blank.fmtowns rename to package/batocera/emulators/retroarch/libretro/libretro-mame/blank.fmtowns diff --git a/package/emulators/retroarch/libretro/libretro-mame/coindrop/LICENSE.md b/package/batocera/emulators/retroarch/libretro/libretro-mame/coindrop/LICENSE.md similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mame/coindrop/LICENSE.md rename to package/batocera/emulators/retroarch/libretro/libretro-mame/coindrop/LICENSE.md diff --git a/package/emulators/retroarch/libretro/libretro-mame/coindrop/README.md b/package/batocera/emulators/retroarch/libretro/libretro-mame/coindrop/README.md similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mame/coindrop/README.md rename to package/batocera/emulators/retroarch/libretro/libretro-mame/coindrop/README.md diff --git a/package/emulators/retroarch/libretro/libretro-mame/coindrop/init.lua b/package/batocera/emulators/retroarch/libretro/libretro-mame/coindrop/init.lua similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mame/coindrop/init.lua rename to package/batocera/emulators/retroarch/libretro/libretro-mame/coindrop/init.lua diff --git a/package/emulators/retroarch/libretro/libretro-mame/coindrop/plugin.json b/package/batocera/emulators/retroarch/libretro/libretro-mame/coindrop/plugin.json similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mame/coindrop/plugin.json rename to package/batocera/emulators/retroarch/libretro/libretro-mame/coindrop/plugin.json diff --git a/package/emulators/retroarch/libretro/libretro-mame/coindrop/sounds/coin1.wav b/package/batocera/emulators/retroarch/libretro/libretro-mame/coindrop/sounds/coin1.wav similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mame/coindrop/sounds/coin1.wav rename to package/batocera/emulators/retroarch/libretro/libretro-mame/coindrop/sounds/coin1.wav diff --git a/package/emulators/retroarch/libretro/libretro-mame/coindrop/sounds/coin2.wav b/package/batocera/emulators/retroarch/libretro/libretro-mame/coindrop/sounds/coin2.wav similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mame/coindrop/sounds/coin2.wav rename to package/batocera/emulators/retroarch/libretro/libretro-mame/coindrop/sounds/coin2.wav diff --git a/package/emulators/retroarch/libretro/libretro-mame/coindrop/sounds/coin3.wav b/package/batocera/emulators/retroarch/libretro/libretro-mame/coindrop/sounds/coin3.wav similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mame/coindrop/sounds/coin3.wav rename to package/batocera/emulators/retroarch/libretro/libretro-mame/coindrop/sounds/coin3.wav diff --git a/package/emulators/retroarch/libretro/libretro-mame/coindrop/sounds/silent.wav b/package/batocera/emulators/retroarch/libretro/libretro-mame/coindrop/sounds/silent.wav similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mame/coindrop/sounds/silent.wav rename to package/batocera/emulators/retroarch/libretro/libretro-mame/coindrop/sounds/silent.wav diff --git a/package/emulators/retroarch/libretro/libretro-mame/libretro-mame.mk b/package/batocera/emulators/retroarch/libretro/libretro-mame/libretro-mame.mk similarity index 91% rename from package/emulators/retroarch/libretro/libretro-mame/libretro-mame.mk rename to package/batocera/emulators/retroarch/libretro/libretro-mame/libretro-mame.mk index 49d8ad56a47..f4895b277d1 100644 --- a/package/emulators/retroarch/libretro/libretro-mame/libretro-mame.mk +++ b/package/batocera/emulators/retroarch/libretro/libretro-mame/libretro-mame.mk @@ -70,7 +70,7 @@ define LIBRETRO_MAME_BUILD_CMDS cat $(@D)/build/skel.list | while read file ; do sed -i '/MACHINE_IS_SKELETON/d' $$file ; done rm $(@D)/build/skel.list # Remove reference to skeleton drivers in mame.lst - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/retroarch/libretro/libretro-mame/mame.flt $(@D)/mame.flt + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/retroarch/libretro/libretro-mame/mame.flt $(@D)/mame.flt cat $(@D)/mame.flt | while read file ; do sed -i /$$file/d $(@D)/src/mame/mame.lst ; done # Compile @@ -90,12 +90,12 @@ define LIBRETRO_MAME_INSTALL_TARGET_CMDS cp -R $(@D)/hash $(TARGET_DIR)/usr/share/lr-mame mkdir -p $(TARGET_DIR)/usr/share/mame - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/blank.fmtowns $(TARGET_DIR)/usr/share/mame/blank.fmtowns + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/blank.fmtowns $(TARGET_DIR)/usr/share/mame/blank.fmtowns # Copy coin drop plugin mkdir -p $(TARGET_DIR)/usr/bin/mame/ cp -R -u $(@D)/plugins $(TARGET_DIR)/usr/bin/mame/ - cp -R -u $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/coindrop $(TARGET_DIR)/usr/bin/mame/plugins + cp -R -u $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/coindrop $(TARGET_DIR)/usr/bin/mame/plugins endef $(eval $(generic-package)) diff --git a/package/emulators/retroarch/libretro/libretro-mame/mame.flt b/package/batocera/emulators/retroarch/libretro/libretro-mame/mame.flt similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mame/mame.flt rename to package/batocera/emulators/retroarch/libretro/libretro-mame/mame.flt diff --git a/package/emulators/retroarch/libretro/libretro-mame2003-plus/000-add-s812-makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-mame2003-plus/000-add-s812-makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mame2003-plus/000-add-s812-makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-mame2003-plus/000-add-s812-makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-mame2003-plus/001-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-mame2003-plus/001-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mame2003-plus/001-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-mame2003-plus/001-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-mame2003-plus/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-mame2003-plus/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mame2003-plus/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-mame2003-plus/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-mame2003-plus/libretro-mame2003-plus.mk b/package/batocera/emulators/retroarch/libretro/libretro-mame2003-plus/libretro-mame2003-plus.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mame2003-plus/libretro-mame2003-plus.mk rename to package/batocera/emulators/retroarch/libretro/libretro-mame2003-plus/libretro-mame2003-plus.mk diff --git a/package/emulators/retroarch/libretro/libretro-mame2010/000-rpi_makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-mame2010/000-rpi_makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mame2010/000-rpi_makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-mame2010/000-rpi_makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-mame2010/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-mame2010/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mame2010/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-mame2010/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-mame2010/libretro-mame2010.mk b/package/batocera/emulators/retroarch/libretro/libretro-mame2010/libretro-mame2010.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mame2010/libretro-mame2010.mk rename to package/batocera/emulators/retroarch/libretro/libretro-mame2010/libretro-mame2010.mk diff --git a/package/emulators/retroarch/libretro/libretro-melonds-ds/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-melonds-ds/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-melonds-ds/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-melonds-ds/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-melonds-ds/libretro-melonds-ds.mk b/package/batocera/emulators/retroarch/libretro/libretro-melonds-ds/libretro-melonds-ds.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-melonds-ds/libretro-melonds-ds.mk rename to package/batocera/emulators/retroarch/libretro/libretro-melonds-ds/libretro-melonds-ds.mk diff --git a/package/emulators/retroarch/libretro/libretro-melonds/001-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-melonds/001-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-melonds/001-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-melonds/001-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-melonds/002-rk3588.patch b/package/batocera/emulators/retroarch/libretro/libretro-melonds/002-rk3588.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-melonds/002-rk3588.patch rename to package/batocera/emulators/retroarch/libretro/libretro-melonds/002-rk3588.patch diff --git a/package/emulators/retroarch/libretro/libretro-melonds/003-saphira.patch b/package/batocera/emulators/retroarch/libretro/libretro-melonds/003-saphira.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-melonds/003-saphira.patch rename to package/batocera/emulators/retroarch/libretro/libretro-melonds/003-saphira.patch diff --git a/package/emulators/retroarch/libretro/libretro-melonds/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-melonds/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-melonds/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-melonds/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-melonds/libretro-melonds.mk b/package/batocera/emulators/retroarch/libretro/libretro-melonds/libretro-melonds.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-melonds/libretro-melonds.mk rename to package/batocera/emulators/retroarch/libretro/libretro-melonds/libretro-melonds.mk diff --git a/package/emulators/retroarch/libretro/libretro-mesen/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-mesen/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mesen/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-mesen/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-mesen/libretro-mesen.mk b/package/batocera/emulators/retroarch/libretro/libretro-mesen/libretro-mesen.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mesen/libretro-mesen.mk rename to package/batocera/emulators/retroarch/libretro/libretro-mesen/libretro-mesen.mk diff --git a/package/emulators/retroarch/libretro/libretro-mesens/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-mesens/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mesens/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-mesens/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-mesens/libretro-mesens.mk b/package/batocera/emulators/retroarch/libretro/libretro-mesens/libretro-mesens.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mesens/libretro-mesens.mk rename to package/batocera/emulators/retroarch/libretro/libretro-mesens/libretro-mesens.mk diff --git a/package/emulators/retroarch/libretro/libretro-mgba/001-reduce-logs.patch b/package/batocera/emulators/retroarch/libretro/libretro-mgba/001-reduce-logs.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mgba/001-reduce-logs.patch rename to package/batocera/emulators/retroarch/libretro/libretro-mgba/001-reduce-logs.patch diff --git a/package/emulators/retroarch/libretro/libretro-mgba/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-mgba/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mgba/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-mgba/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-mgba/libretro-mgba.mk b/package/batocera/emulators/retroarch/libretro/libretro-mgba/libretro-mgba.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mgba/libretro-mgba.mk rename to package/batocera/emulators/retroarch/libretro/libretro-mgba/libretro-mgba.mk diff --git a/package/emulators/retroarch/libretro/libretro-minivmac/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-minivmac/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-minivmac/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-minivmac/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-minivmac/libretro-minivmac.mk b/package/batocera/emulators/retroarch/libretro/libretro-minivmac/libretro-minivmac.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-minivmac/libretro-minivmac.mk rename to package/batocera/emulators/retroarch/libretro/libretro-minivmac/libretro-minivmac.mk diff --git a/package/emulators/retroarch/libretro/libretro-mrboom/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-mrboom/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mrboom/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-mrboom/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-mrboom/libretro-mrboom.mk b/package/batocera/emulators/retroarch/libretro/libretro-mrboom/libretro-mrboom.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mrboom/libretro-mrboom.mk rename to package/batocera/emulators/retroarch/libretro/libretro-mrboom/libretro-mrboom.mk diff --git a/package/emulators/retroarch/libretro/libretro-mupen64plus-next/000-makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-mupen64plus-next/000-makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mupen64plus-next/000-makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-mupen64plus-next/000-makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-mupen64plus-next/001-gcc-fix.patch b/package/batocera/emulators/retroarch/libretro/libretro-mupen64plus-next/001-gcc-fix.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mupen64plus-next/001-gcc-fix.patch rename to package/batocera/emulators/retroarch/libretro/libretro-mupen64plus-next/001-gcc-fix.patch diff --git a/package/emulators/retroarch/libretro/libretro-mupen64plus-next/002-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-mupen64plus-next/002-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mupen64plus-next/002-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-mupen64plus-next/002-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-mupen64plus-next/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-mupen64plus-next/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mupen64plus-next/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-mupen64plus-next/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-mupen64plus-next/libretro-mupen64plus-next.mk b/package/batocera/emulators/retroarch/libretro/libretro-mupen64plus-next/libretro-mupen64plus-next.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-mupen64plus-next/libretro-mupen64plus-next.mk rename to package/batocera/emulators/retroarch/libretro/libretro-mupen64plus-next/libretro-mupen64plus-next.mk diff --git a/package/emulators/retroarch/libretro/libretro-neocd/000-biospatch.patch b/package/batocera/emulators/retroarch/libretro/libretro-neocd/000-biospatch.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-neocd/000-biospatch.patch rename to package/batocera/emulators/retroarch/libretro/libretro-neocd/000-biospatch.patch diff --git a/package/emulators/retroarch/libretro/libretro-neocd/001-rpi_makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-neocd/001-rpi_makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-neocd/001-rpi_makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-neocd/001-rpi_makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-neocd/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-neocd/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-neocd/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-neocd/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-neocd/libretro-neocd.mk b/package/batocera/emulators/retroarch/libretro/libretro-neocd/libretro-neocd.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-neocd/libretro-neocd.mk rename to package/batocera/emulators/retroarch/libretro/libretro-neocd/libretro-neocd.mk diff --git a/package/emulators/retroarch/libretro/libretro-nestopia/001-rpi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-nestopia/001-rpi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-nestopia/001-rpi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-nestopia/001-rpi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-nestopia/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-nestopia/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-nestopia/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-nestopia/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-nestopia/libretro-nestopia.mk b/package/batocera/emulators/retroarch/libretro/libretro-nestopia/libretro-nestopia.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-nestopia/libretro-nestopia.mk rename to package/batocera/emulators/retroarch/libretro/libretro-nestopia/libretro-nestopia.mk diff --git a/package/emulators/retroarch/libretro/libretro-nxengine/001-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-nxengine/001-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-nxengine/001-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-nxengine/001-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-nxengine/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-nxengine/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-nxengine/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-nxengine/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-nxengine/libretro-nxengine.mk b/package/batocera/emulators/retroarch/libretro/libretro-nxengine/libretro-nxengine.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-nxengine/libretro-nxengine.mk rename to package/batocera/emulators/retroarch/libretro/libretro-nxengine/libretro-nxengine.mk diff --git a/package/emulators/retroarch/libretro/libretro-o2em/000-rpi_makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-o2em/000-rpi_makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-o2em/000-rpi_makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-o2em/000-rpi_makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-o2em/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-o2em/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-o2em/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-o2em/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-o2em/libretro-o2em.mk b/package/batocera/emulators/retroarch/libretro/libretro-o2em/libretro-o2em.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-o2em/libretro-o2em.mk rename to package/batocera/emulators/retroarch/libretro/libretro-o2em/libretro-o2em.mk diff --git a/package/emulators/retroarch/libretro/libretro-opera/001-makefile-no-cd.patch b/package/batocera/emulators/retroarch/libretro/libretro-opera/001-makefile-no-cd.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-opera/001-makefile-no-cd.patch rename to package/batocera/emulators/retroarch/libretro/libretro-opera/001-makefile-no-cd.patch diff --git a/package/emulators/retroarch/libretro/libretro-opera/002-RPi5.patch b/package/batocera/emulators/retroarch/libretro/libretro-opera/002-RPi5.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-opera/002-RPi5.patch rename to package/batocera/emulators/retroarch/libretro/libretro-opera/002-RPi5.patch diff --git a/package/emulators/retroarch/libretro/libretro-opera/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-opera/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-opera/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-opera/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-opera/libretro-opera.mk b/package/batocera/emulators/retroarch/libretro/libretro-opera/libretro-opera.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-opera/libretro-opera.mk rename to package/batocera/emulators/retroarch/libretro/libretro-opera/libretro-opera.mk diff --git a/package/emulators/retroarch/libretro/libretro-parallel-n64/0001-add-board-makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-parallel-n64/0001-add-board-makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-parallel-n64/0001-add-board-makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-parallel-n64/0001-add-board-makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-parallel-n64/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-parallel-n64/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-parallel-n64/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-parallel-n64/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-parallel-n64/libretro-parallel-n64.mk b/package/batocera/emulators/retroarch/libretro/libretro-parallel-n64/libretro-parallel-n64.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-parallel-n64/libretro-parallel-n64.mk rename to package/batocera/emulators/retroarch/libretro/libretro-parallel-n64/libretro-parallel-n64.mk diff --git a/package/emulators/retroarch/libretro/libretro-pc88/001-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-pc88/001-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-pc88/001-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-pc88/001-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-pc88/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-pc88/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-pc88/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-pc88/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-pc88/libretro-pc88.mk b/package/batocera/emulators/retroarch/libretro/libretro-pc88/libretro-pc88.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-pc88/libretro-pc88.mk rename to package/batocera/emulators/retroarch/libretro/libretro-pc88/libretro-pc88.mk diff --git a/package/emulators/retroarch/libretro/libretro-pc98/000-makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-pc98/000-makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-pc98/000-makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-pc98/000-makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-pc98/001-rpi_makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-pc98/001-rpi_makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-pc98/001-rpi_makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-pc98/001-rpi_makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-pc98/002-rpi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-pc98/002-rpi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-pc98/002-rpi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-pc98/002-rpi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-pc98/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-pc98/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-pc98/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-pc98/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-pc98/libretro-pc98.mk b/package/batocera/emulators/retroarch/libretro/libretro-pc98/libretro-pc98.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-pc98/libretro-pc98.mk rename to package/batocera/emulators/retroarch/libretro/libretro-pc98/libretro-pc98.mk diff --git a/package/emulators/retroarch/libretro/libretro-pcsx/000-makefile-rk3326-64.patch b/package/batocera/emulators/retroarch/libretro/libretro-pcsx/000-makefile-rk3326-64.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-pcsx/000-makefile-rk3326-64.patch rename to package/batocera/emulators/retroarch/libretro/libretro-pcsx/000-makefile-rk3326-64.patch diff --git a/package/emulators/retroarch/libretro/libretro-pcsx/001-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-pcsx/001-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-pcsx/001-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-pcsx/001-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-pcsx/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-pcsx/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-pcsx/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-pcsx/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-pcsx/libretro-pcsx.mk b/package/batocera/emulators/retroarch/libretro/libretro-pcsx/libretro-pcsx.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-pcsx/libretro-pcsx.mk rename to package/batocera/emulators/retroarch/libretro/libretro-pcsx/libretro-pcsx.mk diff --git a/package/emulators/retroarch/libretro/libretro-picodrive/000-makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-picodrive/000-makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-picodrive/000-makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-picodrive/000-makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-picodrive/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-picodrive/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-picodrive/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-picodrive/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-picodrive/libretro-picodrive.mk b/package/batocera/emulators/retroarch/libretro/libretro-picodrive/libretro-picodrive.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-picodrive/libretro-picodrive.mk rename to package/batocera/emulators/retroarch/libretro/libretro-picodrive/libretro-picodrive.mk diff --git a/package/emulators/retroarch/libretro/libretro-play/001-egl-no-x11.patch b/package/batocera/emulators/retroarch/libretro/libretro-play/001-egl-no-x11.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-play/001-egl-no-x11.patch rename to package/batocera/emulators/retroarch/libretro/libretro-play/001-egl-no-x11.patch diff --git a/package/emulators/retroarch/libretro/libretro-play/002-aarch64-gles.patch b/package/batocera/emulators/retroarch/libretro/libretro-play/002-aarch64-gles.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-play/002-aarch64-gles.patch rename to package/batocera/emulators/retroarch/libretro/libretro-play/002-aarch64-gles.patch diff --git a/package/emulators/retroarch/libretro/libretro-play/003-gcc13-fix.patch b/package/batocera/emulators/retroarch/libretro/libretro-play/003-gcc13-fix.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-play/003-gcc13-fix.patch rename to package/batocera/emulators/retroarch/libretro/libretro-play/003-gcc13-fix.patch diff --git a/package/emulators/retroarch/libretro/libretro-play/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-play/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-play/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-play/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-play/libretro-play.mk b/package/batocera/emulators/retroarch/libretro/libretro-play/libretro-play.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-play/libretro-play.mk rename to package/batocera/emulators/retroarch/libretro/libretro-play/libretro-play.mk diff --git a/package/emulators/retroarch/libretro/libretro-pocketsnes/000-rpi_makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-pocketsnes/000-rpi_makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-pocketsnes/000-rpi_makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-pocketsnes/000-rpi_makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-pocketsnes/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-pocketsnes/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-pocketsnes/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-pocketsnes/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-pocketsnes/libretro-pocketsnes.mk b/package/batocera/emulators/retroarch/libretro/libretro-pocketsnes/libretro-pocketsnes.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-pocketsnes/libretro-pocketsnes.mk rename to package/batocera/emulators/retroarch/libretro/libretro-pocketsnes/libretro-pocketsnes.mk diff --git a/package/emulators/retroarch/libretro/libretro-pokemini/001-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-pokemini/001-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-pokemini/001-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-pokemini/001-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-pokemini/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-pokemini/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-pokemini/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-pokemini/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-pokemini/libretro-pokemini.mk b/package/batocera/emulators/retroarch/libretro/libretro-pokemini/libretro-pokemini.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-pokemini/libretro-pokemini.mk rename to package/batocera/emulators/retroarch/libretro/libretro-pokemini/libretro-pokemini.mk diff --git a/package/emulators/retroarch/libretro/libretro-ppsspp/000-batocera-path.patch b/package/batocera/emulators/retroarch/libretro/libretro-ppsspp/000-batocera-path.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-ppsspp/000-batocera-path.patch rename to package/batocera/emulators/retroarch/libretro/libretro-ppsspp/000-batocera-path.patch diff --git a/package/emulators/retroarch/libretro/libretro-ppsspp/001-batocera-psp-paths.patch b/package/batocera/emulators/retroarch/libretro/libretro-ppsspp/001-batocera-psp-paths.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-ppsspp/001-batocera-psp-paths.patch rename to package/batocera/emulators/retroarch/libretro/libretro-ppsspp/001-batocera-psp-paths.patch diff --git a/package/emulators/retroarch/libretro/libretro-ppsspp/002-cmake-arm-conversion-fix.patch b/package/batocera/emulators/retroarch/libretro/libretro-ppsspp/002-cmake-arm-conversion-fix.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-ppsspp/002-cmake-arm-conversion-fix.patch rename to package/batocera/emulators/retroarch/libretro/libretro-ppsspp/002-cmake-arm-conversion-fix.patch diff --git a/package/emulators/retroarch/libretro/libretro-ppsspp/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-ppsspp/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-ppsspp/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-ppsspp/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-ppsspp/libretro-ppsspp.mk b/package/batocera/emulators/retroarch/libretro/libretro-ppsspp/libretro-ppsspp.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-ppsspp/libretro-ppsspp.mk rename to package/batocera/emulators/retroarch/libretro/libretro-ppsspp/libretro-ppsspp.mk diff --git a/package/emulators/retroarch/libretro/libretro-prboom/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-prboom/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-prboom/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-prboom/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-prboom/libretro-prboom.mk b/package/batocera/emulators/retroarch/libretro/libretro-prboom/libretro-prboom.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-prboom/libretro-prboom.mk rename to package/batocera/emulators/retroarch/libretro/libretro-prboom/libretro-prboom.mk diff --git a/package/emulators/retroarch/libretro/libretro-prosystem/001-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-prosystem/001-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-prosystem/001-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-prosystem/001-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-prosystem/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-prosystem/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-prosystem/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-prosystem/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-prosystem/libretro-prosystem.mk b/package/batocera/emulators/retroarch/libretro/libretro-prosystem/libretro-prosystem.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-prosystem/libretro-prosystem.mk rename to package/batocera/emulators/retroarch/libretro/libretro-prosystem/libretro-prosystem.mk diff --git a/package/emulators/retroarch/libretro/libretro-puae/000-rpi_makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-puae/000-rpi_makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-puae/000-rpi_makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-puae/000-rpi_makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-puae/001-capsimg-path.patch b/package/batocera/emulators/retroarch/libretro/libretro-puae/001-capsimg-path.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-puae/001-capsimg-path.patch rename to package/batocera/emulators/retroarch/libretro/libretro-puae/001-capsimg-path.patch diff --git a/package/emulators/retroarch/libretro/libretro-puae/002-isoc99math.patch b/package/batocera/emulators/retroarch/libretro/libretro-puae/002-isoc99math.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-puae/002-isoc99math.patch rename to package/batocera/emulators/retroarch/libretro/libretro-puae/002-isoc99math.patch diff --git a/package/emulators/retroarch/libretro/libretro-puae/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-puae/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-puae/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-puae/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-puae/libretro-puae.mk b/package/batocera/emulators/retroarch/libretro/libretro-puae/libretro-puae.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-puae/libretro-puae.mk rename to package/batocera/emulators/retroarch/libretro/libretro-puae/libretro-puae.mk diff --git a/package/emulators/retroarch/libretro/libretro-px68k/000-rpi_makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-px68k/000-rpi_makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-px68k/000-rpi_makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-px68k/000-rpi_makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-px68k/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-px68k/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-px68k/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-px68k/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-px68k/libretro-px68k.mk b/package/batocera/emulators/retroarch/libretro/libretro-px68k/libretro-px68k.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-px68k/libretro-px68k.mk rename to package/batocera/emulators/retroarch/libretro/libretro-px68k/libretro-px68k.mk diff --git a/package/emulators/retroarch/libretro/libretro-reminiscence/000-makefile-rpi3-64.patch b/package/batocera/emulators/retroarch/libretro/libretro-reminiscence/000-makefile-rpi3-64.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-reminiscence/000-makefile-rpi3-64.patch rename to package/batocera/emulators/retroarch/libretro/libretro-reminiscence/000-makefile-rpi3-64.patch diff --git a/package/emulators/retroarch/libretro/libretro-reminiscence/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-reminiscence/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-reminiscence/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-reminiscence/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-reminiscence/libretro-reminiscence.mk b/package/batocera/emulators/retroarch/libretro/libretro-reminiscence/libretro-reminiscence.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-reminiscence/libretro-reminiscence.mk rename to package/batocera/emulators/retroarch/libretro/libretro-reminiscence/libretro-reminiscence.mk diff --git a/package/emulators/retroarch/libretro/libretro-retro8/000-fix-gc11.patch b/package/batocera/emulators/retroarch/libretro/libretro-retro8/000-fix-gc11.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-retro8/000-fix-gc11.patch rename to package/batocera/emulators/retroarch/libretro/libretro-retro8/000-fix-gc11.patch diff --git a/package/emulators/retroarch/libretro/libretro-retro8/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-retro8/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-retro8/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-retro8/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-retro8/libretro-retro8.mk b/package/batocera/emulators/retroarch/libretro/libretro-retro8/libretro-retro8.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-retro8/libretro-retro8.mk rename to package/batocera/emulators/retroarch/libretro/libretro-retro8/libretro-retro8.mk diff --git a/package/emulators/retroarch/libretro/libretro-same-cdi/001-fix-gcc.patch b/package/batocera/emulators/retroarch/libretro/libretro-same-cdi/001-fix-gcc.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-same-cdi/001-fix-gcc.patch rename to package/batocera/emulators/retroarch/libretro/libretro-same-cdi/001-fix-gcc.patch diff --git a/package/emulators/retroarch/libretro/libretro-same-cdi/002-optimize-for-size.patch b/package/batocera/emulators/retroarch/libretro/libretro-same-cdi/002-optimize-for-size.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-same-cdi/002-optimize-for-size.patch rename to package/batocera/emulators/retroarch/libretro/libretro-same-cdi/002-optimize-for-size.patch diff --git a/package/emulators/retroarch/libretro/libretro-same-cdi/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-same-cdi/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-same-cdi/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-same-cdi/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-same-cdi/libretro-same-cdi.mk b/package/batocera/emulators/retroarch/libretro/libretro-same-cdi/libretro-same-cdi.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-same-cdi/libretro-same-cdi.mk rename to package/batocera/emulators/retroarch/libretro/libretro-same-cdi/libretro-same-cdi.mk diff --git a/package/emulators/retroarch/libretro/libretro-sameduck/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-sameduck/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-sameduck/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-sameduck/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-sameduck/libretro-sameduck.mk b/package/batocera/emulators/retroarch/libretro/libretro-sameduck/libretro-sameduck.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-sameduck/libretro-sameduck.mk rename to package/batocera/emulators/retroarch/libretro/libretro-sameduck/libretro-sameduck.mk diff --git a/package/emulators/retroarch/libretro/libretro-scummvm/0000-rpi-makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-scummvm/0000-rpi-makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-scummvm/0000-rpi-makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-scummvm/0000-rpi-makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-scummvm/0001-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-scummvm/0001-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-scummvm/0001-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-scummvm/0001-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-scummvm/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-scummvm/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-scummvm/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-scummvm/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-scummvm/libretro-scummvm.mk b/package/batocera/emulators/retroarch/libretro/libretro-scummvm/libretro-scummvm.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-scummvm/libretro-scummvm.mk rename to package/batocera/emulators/retroarch/libretro/libretro-scummvm/libretro-scummvm.mk diff --git a/package/emulators/retroarch/libretro/libretro-smsplus-gx/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-smsplus-gx/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-smsplus-gx/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-smsplus-gx/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-smsplus-gx/libretro-smsplus-gx.mk b/package/batocera/emulators/retroarch/libretro/libretro-smsplus-gx/libretro-smsplus-gx.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-smsplus-gx/libretro-smsplus-gx.mk rename to package/batocera/emulators/retroarch/libretro/libretro-smsplus-gx/libretro-smsplus-gx.mk diff --git a/package/emulators/retroarch/libretro/libretro-snes9x-next/001-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-snes9x-next/001-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-snes9x-next/001-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-snes9x-next/001-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-snes9x-next/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-snes9x-next/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-snes9x-next/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-snes9x-next/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-snes9x-next/libretro-snes9x-next.mk b/package/batocera/emulators/retroarch/libretro/libretro-snes9x-next/libretro-snes9x-next.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-snes9x-next/libretro-snes9x-next.mk rename to package/batocera/emulators/retroarch/libretro/libretro-snes9x-next/libretro-snes9x-next.mk diff --git a/package/emulators/retroarch/libretro/libretro-snes9x/001-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-snes9x/001-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-snes9x/001-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-snes9x/001-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-snes9x/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-snes9x/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-snes9x/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-snes9x/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-snes9x/libretro-snes9x.mk b/package/batocera/emulators/retroarch/libretro/libretro-snes9x/libretro-snes9x.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-snes9x/libretro-snes9x.mk rename to package/batocera/emulators/retroarch/libretro/libretro-snes9x/libretro-snes9x.mk diff --git a/package/emulators/retroarch/libretro/libretro-stella/000-rpi_makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-stella/000-rpi_makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-stella/000-rpi_makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-stella/000-rpi_makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-stella/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-stella/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-stella/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-stella/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-stella/libretro-stella.mk b/package/batocera/emulators/retroarch/libretro/libretro-stella/libretro-stella.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-stella/libretro-stella.mk rename to package/batocera/emulators/retroarch/libretro/libretro-stella/libretro-stella.mk diff --git a/package/emulators/retroarch/libretro/libretro-stella2014/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-stella2014/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-stella2014/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-stella2014/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-stella2014/libretro-stella2014.mk b/package/batocera/emulators/retroarch/libretro/libretro-stella2014/libretro-stella2014.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-stella2014/libretro-stella2014.mk rename to package/batocera/emulators/retroarch/libretro/libretro-stella2014/libretro-stella2014.mk diff --git a/package/emulators/retroarch/libretro/libretro-superbroswar/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-superbroswar/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-superbroswar/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-superbroswar/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-superbroswar/libretro-superbroswar.mk b/package/batocera/emulators/retroarch/libretro/libretro-superbroswar/libretro-superbroswar.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-superbroswar/libretro-superbroswar.mk rename to package/batocera/emulators/retroarch/libretro/libretro-superbroswar/libretro-superbroswar.mk diff --git a/package/emulators/retroarch/libretro/libretro-superflappybirds/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-superflappybirds/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-superflappybirds/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-superflappybirds/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-superflappybirds/libretro-superflappybirds.mk b/package/batocera/emulators/retroarch/libretro/libretro-superflappybirds/libretro-superflappybirds.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-superflappybirds/libretro-superflappybirds.mk rename to package/batocera/emulators/retroarch/libretro/libretro-superflappybirds/libretro-superflappybirds.mk diff --git a/package/emulators/retroarch/libretro/libretro-swanstation/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-swanstation/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-swanstation/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-swanstation/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-swanstation/libretro-swanstation.mk b/package/batocera/emulators/retroarch/libretro/libretro-swanstation/libretro-swanstation.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-swanstation/libretro-swanstation.mk rename to package/batocera/emulators/retroarch/libretro/libretro-swanstation/libretro-swanstation.mk diff --git a/package/emulators/retroarch/libretro/libretro-tgbdual/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-tgbdual/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-tgbdual/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-tgbdual/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-tgbdual/libretro-tgbdual.mk b/package/batocera/emulators/retroarch/libretro/libretro-tgbdual/libretro-tgbdual.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-tgbdual/libretro-tgbdual.mk rename to package/batocera/emulators/retroarch/libretro/libretro-tgbdual/libretro-tgbdual.mk diff --git a/package/emulators/retroarch/libretro/libretro-theodore/001-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-theodore/001-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-theodore/001-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-theodore/001-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-theodore/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-theodore/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-theodore/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-theodore/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-theodore/libretro-theodore.mk b/package/batocera/emulators/retroarch/libretro/libretro-theodore/libretro-theodore.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-theodore/libretro-theodore.mk rename to package/batocera/emulators/retroarch/libretro/libretro-theodore/libretro-theodore.mk diff --git a/package/emulators/retroarch/libretro/libretro-tic80/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-tic80/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-tic80/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-tic80/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-tic80/libretro-tic80.mk b/package/batocera/emulators/retroarch/libretro/libretro-tic80/libretro-tic80.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-tic80/libretro-tic80.mk rename to package/batocera/emulators/retroarch/libretro/libretro-tic80/libretro-tic80.mk diff --git a/package/emulators/retroarch/libretro/libretro-tyrquake/001-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-tyrquake/001-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-tyrquake/001-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-tyrquake/001-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-tyrquake/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-tyrquake/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-tyrquake/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-tyrquake/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-tyrquake/libretro-tyrquake.mk b/package/batocera/emulators/retroarch/libretro/libretro-tyrquake/libretro-tyrquake.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-tyrquake/libretro-tyrquake.mk rename to package/batocera/emulators/retroarch/libretro/libretro-tyrquake/libretro-tyrquake.mk diff --git a/package/emulators/retroarch/libretro/libretro-uae4arm/001-RPi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-uae4arm/001-RPi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-uae4arm/001-RPi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-uae4arm/001-RPi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-uae4arm/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-uae4arm/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-uae4arm/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-uae4arm/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-uae4arm/libretro-uae4arm.mk b/package/batocera/emulators/retroarch/libretro/libretro-uae4arm/libretro-uae4arm.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-uae4arm/libretro-uae4arm.mk rename to package/batocera/emulators/retroarch/libretro/libretro-uae4arm/libretro-uae4arm.mk diff --git a/package/emulators/retroarch/libretro/libretro-uzem/000-rpi_makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-uzem/000-rpi_makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-uzem/000-rpi_makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-uzem/000-rpi_makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-uzem/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-uzem/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-uzem/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-uzem/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-uzem/libretro-uzem.mk b/package/batocera/emulators/retroarch/libretro/libretro-uzem/libretro-uzem.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-uzem/libretro-uzem.mk rename to package/batocera/emulators/retroarch/libretro/libretro-uzem/libretro-uzem.mk diff --git a/package/emulators/retroarch/libretro/libretro-vba-m/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-vba-m/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-vba-m/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-vba-m/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-vba-m/libretro-vba-m.mk b/package/batocera/emulators/retroarch/libretro/libretro-vba-m/libretro-vba-m.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-vba-m/libretro-vba-m.mk rename to package/batocera/emulators/retroarch/libretro/libretro-vba-m/libretro-vba-m.mk diff --git a/package/emulators/retroarch/libretro/libretro-vecx/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-vecx/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-vecx/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-vecx/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-vecx/libretro-vecx.mk b/package/batocera/emulators/retroarch/libretro/libretro-vecx/libretro-vecx.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-vecx/libretro-vecx.mk rename to package/batocera/emulators/retroarch/libretro/libretro-vecx/libretro-vecx.mk diff --git a/package/emulators/retroarch/libretro/libretro-vemulator/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-vemulator/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-vemulator/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-vemulator/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-vemulator/libretro-vemulator.mk b/package/batocera/emulators/retroarch/libretro/libretro-vemulator/libretro-vemulator.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-vemulator/libretro-vemulator.mk rename to package/batocera/emulators/retroarch/libretro/libretro-vemulator/libretro-vemulator.mk diff --git a/package/emulators/retroarch/libretro/libretro-vice/000-rpi_makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-vice/000-rpi_makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-vice/000-rpi_makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-vice/000-rpi_makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-vice/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-vice/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-vice/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-vice/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-vice/libretro-vice.mk b/package/batocera/emulators/retroarch/libretro/libretro-vice/libretro-vice.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-vice/libretro-vice.mk rename to package/batocera/emulators/retroarch/libretro/libretro-vice/libretro-vice.mk diff --git a/package/emulators/retroarch/libretro/libretro-virtualjaguar/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-virtualjaguar/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-virtualjaguar/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-virtualjaguar/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-virtualjaguar/libretro-virtualjaguar.mk b/package/batocera/emulators/retroarch/libretro/libretro-virtualjaguar/libretro-virtualjaguar.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-virtualjaguar/libretro-virtualjaguar.mk rename to package/batocera/emulators/retroarch/libretro/libretro-virtualjaguar/libretro-virtualjaguar.mk diff --git a/package/emulators/retroarch/libretro/libretro-wasm4/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-wasm4/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-wasm4/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-wasm4/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-wasm4/libretro-wasm4.mk b/package/batocera/emulators/retroarch/libretro/libretro-wasm4/libretro-wasm4.mk similarity index 86% rename from package/emulators/retroarch/libretro/libretro-wasm4/libretro-wasm4.mk rename to package/batocera/emulators/retroarch/libretro/libretro-wasm4/libretro-wasm4.mk index c382930b797..7474d416f02 100644 --- a/package/emulators/retroarch/libretro/libretro-wasm4/libretro-wasm4.mk +++ b/package/batocera/emulators/retroarch/libretro/libretro-wasm4/libretro-wasm4.mk @@ -18,7 +18,7 @@ define LIBRETRO_WASM4_INSTALL_TARGET_CMDS $(INSTALL) -D $(@D)/runtimes/native/wasm4_libretro.so \ $(TARGET_DIR)/usr/lib/libretro/wasm4_libretro.so mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/retroarch/libretro/libretro-wasm4/wasm4.keys \ + cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/retroarch/libretro/libretro-wasm4/wasm4.keys \ $(TARGET_DIR)/usr/share/evmapy/ endef diff --git a/package/emulators/retroarch/libretro/libretro-wasm4/wasm4.keys b/package/batocera/emulators/retroarch/libretro/libretro-wasm4/wasm4.keys similarity index 100% rename from package/emulators/retroarch/libretro/libretro-wasm4/wasm4.keys rename to package/batocera/emulators/retroarch/libretro/libretro-wasm4/wasm4.keys diff --git a/package/emulators/retroarch/libretro/libretro-watara/001-rpi5-tuning.patch b/package/batocera/emulators/retroarch/libretro/libretro-watara/001-rpi5-tuning.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-watara/001-rpi5-tuning.patch rename to package/batocera/emulators/retroarch/libretro/libretro-watara/001-rpi5-tuning.patch diff --git a/package/emulators/retroarch/libretro/libretro-watara/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-watara/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-watara/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-watara/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-watara/libretro-watara.mk b/package/batocera/emulators/retroarch/libretro/libretro-watara/libretro-watara.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-watara/libretro-watara.mk rename to package/batocera/emulators/retroarch/libretro/libretro-watara/libretro-watara.mk diff --git a/package/emulators/retroarch/libretro/libretro-xmil/000-rpi_makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-xmil/000-rpi_makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-xmil/000-rpi_makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-xmil/000-rpi_makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-xmil/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-xmil/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-xmil/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-xmil/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-xmil/libretro-xmil.mk b/package/batocera/emulators/retroarch/libretro/libretro-xmil/libretro-xmil.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-xmil/libretro-xmil.mk rename to package/batocera/emulators/retroarch/libretro/libretro-xmil/libretro-xmil.mk diff --git a/package/emulators/retroarch/libretro/libretro-xrick/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-xrick/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-xrick/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-xrick/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-xrick/libretro-xrick.mk b/package/batocera/emulators/retroarch/libretro/libretro-xrick/libretro-xrick.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-xrick/libretro-xrick.mk rename to package/batocera/emulators/retroarch/libretro/libretro-xrick/libretro-xrick.mk diff --git a/package/emulators/retroarch/libretro/libretro-yabasanshiro/000-makefile.patch b/package/batocera/emulators/retroarch/libretro/libretro-yabasanshiro/000-makefile.patch similarity index 100% rename from package/emulators/retroarch/libretro/libretro-yabasanshiro/000-makefile.patch rename to package/batocera/emulators/retroarch/libretro/libretro-yabasanshiro/000-makefile.patch diff --git a/package/emulators/retroarch/libretro/libretro-yabasanshiro/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-yabasanshiro/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-yabasanshiro/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-yabasanshiro/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-yabasanshiro/libretro-yabasanshiro.mk b/package/batocera/emulators/retroarch/libretro/libretro-yabasanshiro/libretro-yabasanshiro.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-yabasanshiro/libretro-yabasanshiro.mk rename to package/batocera/emulators/retroarch/libretro/libretro-yabasanshiro/libretro-yabasanshiro.mk diff --git a/package/emulators/retroarch/libretro/libretro-zc210/Config.in b/package/batocera/emulators/retroarch/libretro/libretro-zc210/Config.in similarity index 100% rename from package/emulators/retroarch/libretro/libretro-zc210/Config.in rename to package/batocera/emulators/retroarch/libretro/libretro-zc210/Config.in diff --git a/package/emulators/retroarch/libretro/libretro-zc210/libretro-zc210.mk b/package/batocera/emulators/retroarch/libretro/libretro-zc210/libretro-zc210.mk similarity index 100% rename from package/emulators/retroarch/libretro/libretro-zc210/libretro-zc210.mk rename to package/batocera/emulators/retroarch/libretro/libretro-zc210/libretro-zc210.mk diff --git a/package/emulators/retroarch/retroarch-assets/Config.in b/package/batocera/emulators/retroarch/retroarch-assets/Config.in similarity index 100% rename from package/emulators/retroarch/retroarch-assets/Config.in rename to package/batocera/emulators/retroarch/retroarch-assets/Config.in diff --git a/package/emulators/retroarch/retroarch-assets/retroarch-assets.mk b/package/batocera/emulators/retroarch/retroarch-assets/retroarch-assets.mk similarity index 100% rename from package/emulators/retroarch/retroarch-assets/retroarch-assets.mk rename to package/batocera/emulators/retroarch/retroarch-assets/retroarch-assets.mk diff --git a/package/emulators/retroarch/retroarch/000-input_sort_devices.patch b/package/batocera/emulators/retroarch/retroarch/000-input_sort_devices.patch similarity index 100% rename from package/emulators/retroarch/retroarch/000-input_sort_devices.patch rename to package/batocera/emulators/retroarch/retroarch/000-input_sort_devices.patch diff --git a/package/emulators/retroarch/retroarch/001-avoid_x11.patch b/package/batocera/emulators/retroarch/retroarch/001-avoid_x11.patch similarity index 100% rename from package/emulators/retroarch/retroarch/001-avoid_x11.patch rename to package/batocera/emulators/retroarch/retroarch/001-avoid_x11.patch diff --git a/package/emulators/retroarch/retroarch/002-fix_configure.patch b/package/batocera/emulators/retroarch/retroarch/002-fix_configure.patch similarity index 100% rename from package/emulators/retroarch/retroarch/002-fix_configure.patch rename to package/batocera/emulators/retroarch/retroarch/002-fix_configure.patch diff --git a/package/emulators/retroarch/retroarch/003-coreinfos.patch b/package/batocera/emulators/retroarch/retroarch/003-coreinfos.patch similarity index 100% rename from package/emulators/retroarch/retroarch/003-coreinfos.patch rename to package/batocera/emulators/retroarch/retroarch/003-coreinfos.patch diff --git a/package/emulators/retroarch/retroarch/004-cheevos-sounds.patch b/package/batocera/emulators/retroarch/retroarch/004-cheevos-sounds.patch similarity index 100% rename from package/emulators/retroarch/retroarch/004-cheevos-sounds.patch rename to package/batocera/emulators/retroarch/retroarch/004-cheevos-sounds.patch diff --git a/package/emulators/retroarch/retroarch/005-extend-udev-buttons.patch b/package/batocera/emulators/retroarch/retroarch/005-extend-udev-buttons.patch similarity index 100% rename from package/emulators/retroarch/retroarch/005-extend-udev-buttons.patch rename to package/batocera/emulators/retroarch/retroarch/005-extend-udev-buttons.patch diff --git a/package/emulators/retroarch/retroarch/006-drm-conn.patch b/package/batocera/emulators/retroarch/retroarch/006-drm-conn.patch similarity index 100% rename from package/emulators/retroarch/retroarch/006-drm-conn.patch rename to package/batocera/emulators/retroarch/retroarch/006-drm-conn.patch diff --git a/package/emulators/retroarch/retroarch/007-drm-libgo-resolution.patch b/package/batocera/emulators/retroarch/retroarch/007-drm-libgo-resolution.patch similarity index 100% rename from package/emulators/retroarch/retroarch/007-drm-libgo-resolution.patch rename to package/batocera/emulators/retroarch/retroarch/007-drm-libgo-resolution.patch diff --git a/package/emulators/retroarch/retroarch/008-drm-resolution.patch b/package/batocera/emulators/retroarch/retroarch/008-drm-resolution.patch similarity index 100% rename from package/emulators/retroarch/retroarch/008-drm-resolution.patch rename to package/batocera/emulators/retroarch/retroarch/008-drm-resolution.patch diff --git a/package/emulators/retroarch/retroarch/009-disable-drm-resolution-adaptation.patch b/package/batocera/emulators/retroarch/retroarch/009-disable-drm-resolution-adaptation.patch similarity index 100% rename from package/emulators/retroarch/retroarch/009-disable-drm-resolution-adaptation.patch rename to package/batocera/emulators/retroarch/retroarch/009-disable-drm-resolution-adaptation.patch diff --git a/package/emulators/retroarch/retroarch/010-pad-lots-buttons.patch b/package/batocera/emulators/retroarch/retroarch/010-pad-lots-buttons.patch similarity index 100% rename from package/emulators/retroarch/retroarch/010-pad-lots-buttons.patch rename to package/batocera/emulators/retroarch/retroarch/010-pad-lots-buttons.patch diff --git a/package/emulators/retroarch/retroarch/011-include_rga.patch b/package/batocera/emulators/retroarch/retroarch/011-include_rga.patch similarity index 100% rename from package/emulators/retroarch/retroarch/011-include_rga.patch rename to package/batocera/emulators/retroarch/retroarch/011-include_rga.patch diff --git a/package/emulators/retroarch/retroarch/012-cheevos-screenshot-filename.patch b/package/batocera/emulators/retroarch/retroarch/012-cheevos-screenshot-filename.patch similarity index 100% rename from package/emulators/retroarch/retroarch/012-cheevos-screenshot-filename.patch rename to package/batocera/emulators/retroarch/retroarch/012-cheevos-screenshot-filename.patch diff --git a/package/emulators/retroarch/retroarch/013-remapcommon.patch b/package/batocera/emulators/retroarch/retroarch/013-remapcommon.patch similarity index 100% rename from package/emulators/retroarch/retroarch/013-remapcommon.patch rename to package/batocera/emulators/retroarch/retroarch/013-remapcommon.patch diff --git a/package/emulators/retroarch/retroarch/014-input_sort_devices.patch b/package/batocera/emulators/retroarch/retroarch/014-input_sort_devices.patch similarity index 100% rename from package/emulators/retroarch/retroarch/014-input_sort_devices.patch rename to package/batocera/emulators/retroarch/retroarch/014-input_sort_devices.patch diff --git a/package/emulators/retroarch/retroarch/015-mousebuttons.patch b/package/batocera/emulators/retroarch/retroarch/015-mousebuttons.patch similarity index 100% rename from package/emulators/retroarch/retroarch/015-mousebuttons.patch rename to package/batocera/emulators/retroarch/retroarch/015-mousebuttons.patch diff --git a/package/emulators/retroarch/retroarch/016-mouse-can-have-key.patch b/package/batocera/emulators/retroarch/retroarch/016-mouse-can-have-key.patch similarity index 100% rename from package/emulators/retroarch/retroarch/016-mouse-can-have-key.patch rename to package/batocera/emulators/retroarch/retroarch/016-mouse-can-have-key.patch diff --git a/package/emulators/retroarch/retroarch/017-disable-autoconfig-to-remove-messages.patch b/package/batocera/emulators/retroarch/retroarch/017-disable-autoconfig-to-remove-messages.patch similarity index 100% rename from package/emulators/retroarch/retroarch/017-disable-autoconfig-to-remove-messages.patch rename to package/batocera/emulators/retroarch/retroarch/017-disable-autoconfig-to-remove-messages.patch diff --git a/package/emulators/retroarch/retroarch/018-disable-draw-splash-screen.patch b/package/batocera/emulators/retroarch/retroarch/018-disable-draw-splash-screen.patch similarity index 100% rename from package/emulators/retroarch/retroarch/018-disable-draw-splash-screen.patch rename to package/batocera/emulators/retroarch/retroarch/018-disable-draw-splash-screen.patch diff --git a/package/emulators/retroarch/retroarch/019-disable-wayland-events-by-wayland.patch b/package/batocera/emulators/retroarch/retroarch/019-disable-wayland-events-by-wayland.patch similarity index 100% rename from package/emulators/retroarch/retroarch/019-disable-wayland-events-by-wayland.patch rename to package/batocera/emulators/retroarch/retroarch/019-disable-wayland-events-by-wayland.patch diff --git a/package/emulators/retroarch/retroarch/020-disable-gamemode.patch b/package/batocera/emulators/retroarch/retroarch/020-disable-gamemode.patch similarity index 100% rename from package/emulators/retroarch/retroarch/020-disable-gamemode.patch rename to package/batocera/emulators/retroarch/retroarch/020-disable-gamemode.patch diff --git a/package/emulators/retroarch/retroarch/021-switchres-kmsdrm-relax.patch b/package/batocera/emulators/retroarch/retroarch/021-switchres-kmsdrm-relax.patch similarity index 100% rename from package/emulators/retroarch/retroarch/021-switchres-kmsdrm-relax.patch rename to package/batocera/emulators/retroarch/retroarch/021-switchres-kmsdrm-relax.patch diff --git a/package/emulators/retroarch/retroarch/022-achievementcall.patch b/package/batocera/emulators/retroarch/retroarch/022-achievementcall.patch similarity index 100% rename from package/emulators/retroarch/retroarch/022-achievementcall.patch rename to package/batocera/emulators/retroarch/retroarch/022-achievementcall.patch diff --git a/package/emulators/retroarch/retroarch/023-change-dot-config-path-to-configs.patch b/package/batocera/emulators/retroarch/retroarch/023-change-dot-config-path-to-configs.patch similarity index 100% rename from package/emulators/retroarch/retroarch/023-change-dot-config-path-to-configs.patch rename to package/batocera/emulators/retroarch/retroarch/023-change-dot-config-path-to-configs.patch diff --git a/package/emulators/retroarch/retroarch/Config.in b/package/batocera/emulators/retroarch/retroarch/Config.in similarity index 100% rename from package/emulators/retroarch/retroarch/Config.in rename to package/batocera/emulators/retroarch/retroarch/Config.in diff --git a/package/emulators/retroarch/retroarch/retroarch.hash b/package/batocera/emulators/retroarch/retroarch/retroarch.hash similarity index 100% rename from package/emulators/retroarch/retroarch/retroarch.hash rename to package/batocera/emulators/retroarch/retroarch/retroarch.hash diff --git a/package/emulators/retroarch/retroarch/retroarch.mk b/package/batocera/emulators/retroarch/retroarch/retroarch.mk similarity index 100% rename from package/emulators/retroarch/retroarch/retroarch.mk rename to package/batocera/emulators/retroarch/retroarch/retroarch.mk diff --git a/package/emulators/retroarch/shaders/common-shaders/Config.in b/package/batocera/emulators/retroarch/shaders/common-shaders/Config.in similarity index 100% rename from package/emulators/retroarch/shaders/common-shaders/Config.in rename to package/batocera/emulators/retroarch/shaders/common-shaders/Config.in diff --git a/package/emulators/retroarch/shaders/common-shaders/common-shaders.mk b/package/batocera/emulators/retroarch/shaders/common-shaders/common-shaders.mk similarity index 100% rename from package/emulators/retroarch/shaders/common-shaders/common-shaders.mk rename to package/batocera/emulators/retroarch/shaders/common-shaders/common-shaders.mk diff --git a/package/emulators/retroarch/shaders/glsl-shaders/Config.in b/package/batocera/emulators/retroarch/shaders/glsl-shaders/Config.in similarity index 100% rename from package/emulators/retroarch/shaders/glsl-shaders/Config.in rename to package/batocera/emulators/retroarch/shaders/glsl-shaders/Config.in diff --git a/package/emulators/retroarch/shaders/glsl-shaders/glsl-shaders.mk b/package/batocera/emulators/retroarch/shaders/glsl-shaders/glsl-shaders.mk similarity index 100% rename from package/emulators/retroarch/shaders/glsl-shaders/glsl-shaders.mk rename to package/batocera/emulators/retroarch/shaders/glsl-shaders/glsl-shaders.mk diff --git a/package/emulators/retroarch/shaders/slang-shaders/Config.in b/package/batocera/emulators/retroarch/shaders/slang-shaders/Config.in similarity index 100% rename from package/emulators/retroarch/shaders/slang-shaders/Config.in rename to package/batocera/emulators/retroarch/shaders/slang-shaders/Config.in diff --git a/package/emulators/retroarch/shaders/slang-shaders/slang-shaders.mk b/package/batocera/emulators/retroarch/shaders/slang-shaders/slang-shaders.mk similarity index 100% rename from package/emulators/retroarch/shaders/slang-shaders/slang-shaders.mk rename to package/batocera/emulators/retroarch/shaders/slang-shaders/slang-shaders.mk diff --git a/package/emulators/rpcs3/001-fix-libusb.patch b/package/batocera/emulators/rpcs3/001-fix-libusb.patch similarity index 100% rename from package/emulators/rpcs3/001-fix-libusb.patch rename to package/batocera/emulators/rpcs3/001-fix-libusb.patch diff --git a/package/emulators/rpcs3/002-fix-faudio-sdl2.patch b/package/batocera/emulators/rpcs3/002-fix-faudio-sdl2.patch similarity index 100% rename from package/emulators/rpcs3/002-fix-faudio-sdl2.patch rename to package/batocera/emulators/rpcs3/002-fix-faudio-sdl2.patch diff --git a/package/emulators/rpcs3/003-cmake-version-fix.patch b/package/batocera/emulators/rpcs3/003-cmake-version-fix.patch similarity index 100% rename from package/emulators/rpcs3/003-cmake-version-fix.patch rename to package/batocera/emulators/rpcs3/003-cmake-version-fix.patch diff --git a/package/emulators/rpcs3/004-fix-iconv.patch b/package/batocera/emulators/rpcs3/004-fix-iconv.patch similarity index 100% rename from package/emulators/rpcs3/004-fix-iconv.patch rename to package/batocera/emulators/rpcs3/004-fix-iconv.patch diff --git a/package/emulators/rpcs3/006-no-firmware-confirmation.patch b/package/batocera/emulators/rpcs3/006-no-firmware-confirmation.patch similarity index 100% rename from package/emulators/rpcs3/006-no-firmware-confirmation.patch rename to package/batocera/emulators/rpcs3/006-no-firmware-confirmation.patch diff --git a/package/emulators/rpcs3/007-fix-screenshot-directory.patch b/package/batocera/emulators/rpcs3/007-fix-screenshot-directory.patch similarity index 100% rename from package/emulators/rpcs3/007-fix-screenshot-directory.patch rename to package/batocera/emulators/rpcs3/007-fix-screenshot-directory.patch diff --git a/package/emulators/rpcs3/010-padsevdev.patch b/package/batocera/emulators/rpcs3/010-padsevdev.patch similarity index 100% rename from package/emulators/rpcs3/010-padsevdev.patch rename to package/batocera/emulators/rpcs3/010-padsevdev.patch diff --git a/package/emulators/rpcs3/012-savestate-location.patch b/package/batocera/emulators/rpcs3/012-savestate-location.patch similarity index 100% rename from package/emulators/rpcs3/012-savestate-location.patch rename to package/batocera/emulators/rpcs3/012-savestate-location.patch diff --git a/package/emulators/rpcs3/013-gun-support.patch b/package/batocera/emulators/rpcs3/013-gun-support.patch similarity index 100% rename from package/emulators/rpcs3/013-gun-support.patch rename to package/batocera/emulators/rpcs3/013-gun-support.patch diff --git a/package/emulators/rpcs3/014-gun-mapping.patch b/package/batocera/emulators/rpcs3/014-gun-mapping.patch similarity index 100% rename from package/emulators/rpcs3/014-gun-mapping.patch rename to package/batocera/emulators/rpcs3/014-gun-mapping.patch diff --git a/package/emulators/rpcs3/015-fix-sdl-pad-handler.patch b/package/batocera/emulators/rpcs3/015-fix-sdl-pad-handler.patch similarity index 100% rename from package/emulators/rpcs3/015-fix-sdl-pad-handler.patch rename to package/batocera/emulators/rpcs3/015-fix-sdl-pad-handler.patch diff --git a/package/emulators/rpcs3/Config.in b/package/batocera/emulators/rpcs3/Config.in similarity index 100% rename from package/emulators/rpcs3/Config.in rename to package/batocera/emulators/rpcs3/Config.in diff --git a/package/emulators/rpcs3/evmapy.keys b/package/batocera/emulators/rpcs3/evmapy.keys similarity index 100% rename from package/emulators/rpcs3/evmapy.keys rename to package/batocera/emulators/rpcs3/evmapy.keys diff --git a/package/emulators/rpcs3/rpcs3.mk b/package/batocera/emulators/rpcs3/rpcs3.mk similarity index 95% rename from package/emulators/rpcs3/rpcs3.mk rename to package/batocera/emulators/rpcs3/rpcs3.mk index a3c66dc6231..eb9939b0757 100644 --- a/package/emulators/rpcs3/rpcs3.mk +++ b/package/batocera/emulators/rpcs3/rpcs3.mk @@ -51,7 +51,7 @@ endef define RPCS3_INSTALL_EVMAPY mkdir -p $(TARGET_DIR)/usr/share/evmapy $(INSTALL) -D -m 0644 \ - $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/rpcs3/evmapy.keys \ + $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/rpcs3/evmapy.keys \ $(TARGET_DIR)/usr/share/evmapy/ps3.keys endef diff --git a/package/emulators/ruffle/Config.in b/package/batocera/emulators/ruffle/Config.in similarity index 100% rename from package/emulators/ruffle/Config.in rename to package/batocera/emulators/ruffle/Config.in diff --git a/package/emulators/ruffle/flash.ruffle.keys b/package/batocera/emulators/ruffle/flash.ruffle.keys similarity index 100% rename from package/emulators/ruffle/flash.ruffle.keys rename to package/batocera/emulators/ruffle/flash.ruffle.keys diff --git a/package/emulators/ruffle/ruffle.mk b/package/batocera/emulators/ruffle/ruffle.mk similarity index 93% rename from package/emulators/ruffle/ruffle.mk rename to package/batocera/emulators/ruffle/ruffle.mk index 90ac20feebf..a1d4d3e6a36 100644 --- a/package/emulators/ruffle/ruffle.mk +++ b/package/batocera/emulators/ruffle/ruffle.mk @@ -30,9 +30,9 @@ endef define RUFFLE_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/$(RUFFLE_BIN_DIR)/ruffle_desktop \ $(TARGET_DIR)/usr/bin/ruffle - + mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/ruffle/flash.ruffle.keys \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/ruffle/flash.ruffle.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/emulators/ryujinx/Config.in b/package/batocera/emulators/ryujinx/Config.in similarity index 100% rename from package/emulators/ryujinx/Config.in rename to package/batocera/emulators/ryujinx/Config.in diff --git a/package/emulators/ryujinx/ryujinx.hash b/package/batocera/emulators/ryujinx/ryujinx.hash similarity index 100% rename from package/emulators/ryujinx/ryujinx.hash rename to package/batocera/emulators/ryujinx/ryujinx.hash diff --git a/package/emulators/ryujinx/ryujinx.mk b/package/batocera/emulators/ryujinx/ryujinx.mk similarity index 91% rename from package/emulators/ryujinx/ryujinx.mk rename to package/batocera/emulators/ryujinx/ryujinx.mk index 4ef24bd37d4..6bc8feebd90 100644 --- a/package/emulators/ryujinx/ryujinx.mk +++ b/package/batocera/emulators/ryujinx/ryujinx.mk @@ -28,7 +28,7 @@ define RYUJINX_INSTALL_TARGET_CMDS # evmap config mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/ryujinx/switch.ryujinx.keys \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/ryujinx/switch.ryujinx.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/emulators/ryujinx/switch.ryujinx.keys b/package/batocera/emulators/ryujinx/switch.ryujinx.keys similarity index 100% rename from package/emulators/ryujinx/switch.ryujinx.keys rename to package/batocera/emulators/ryujinx/switch.ryujinx.keys diff --git a/package/emulators/scummvm/001-screenshotsdir.patch b/package/batocera/emulators/scummvm/001-screenshotsdir.patch similarity index 100% rename from package/emulators/scummvm/001-screenshotsdir.patch rename to package/batocera/emulators/scummvm/001-screenshotsdir.patch diff --git a/package/emulators/scummvm/002-rpi-sdl2.patch b/package/batocera/emulators/scummvm/002-rpi-sdl2.patch similarity index 100% rename from package/emulators/scummvm/002-rpi-sdl2.patch rename to package/batocera/emulators/scummvm/002-rpi-sdl2.patch diff --git a/package/emulators/scummvm/Config.in b/package/batocera/emulators/scummvm/Config.in similarity index 100% rename from package/emulators/scummvm/Config.in rename to package/batocera/emulators/scummvm/Config.in diff --git a/package/emulators/scummvm/scummvm.keys b/package/batocera/emulators/scummvm/scummvm.keys similarity index 100% rename from package/emulators/scummvm/scummvm.keys rename to package/batocera/emulators/scummvm/scummvm.keys diff --git a/package/emulators/scummvm/scummvm.mk b/package/batocera/emulators/scummvm/scummvm.mk similarity index 97% rename from package/emulators/scummvm/scummvm.mk rename to package/batocera/emulators/scummvm/scummvm.mk index 7e3bf7a902f..23905b4f567 100644 --- a/package/emulators/scummvm/scummvm.mk +++ b/package/batocera/emulators/scummvm/scummvm.mk @@ -109,7 +109,7 @@ define SCUMMVM_ADD_VIRTUAL_KEYBOARD cp -f $(@D)/backends/vkeybd/packs/vkeybd_small.zip \ $(TARGET_DIR)/usr/share/scummvm mkdir -p $(TARGET_DIR)/usr/share/evmapy/ - cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/scummvm/scummvm.keys \ + cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/scummvm/scummvm.keys \ $(TARGET_DIR)/usr/share/evmapy/ endef diff --git a/package/emulators/simcoupe/0001-aarch64-little-endian.patch b/package/batocera/emulators/simcoupe/0001-aarch64-little-endian.patch similarity index 100% rename from package/emulators/simcoupe/0001-aarch64-little-endian.patch rename to package/batocera/emulators/simcoupe/0001-aarch64-little-endian.patch diff --git a/package/emulators/simcoupe/0002-add-pad-configuration-options.patch b/package/batocera/emulators/simcoupe/0002-add-pad-configuration-options.patch similarity index 100% rename from package/emulators/simcoupe/0002-add-pad-configuration-options.patch rename to package/batocera/emulators/simcoupe/0002-add-pad-configuration-options.patch diff --git a/package/emulators/simcoupe/0003-use-pad-configuration.patch b/package/batocera/emulators/simcoupe/0003-use-pad-configuration.patch similarity index 100% rename from package/emulators/simcoupe/0003-use-pad-configuration.patch rename to package/batocera/emulators/simcoupe/0003-use-pad-configuration.patch diff --git a/package/emulators/simcoupe/Config.in b/package/batocera/emulators/simcoupe/Config.in similarity index 100% rename from package/emulators/simcoupe/Config.in rename to package/batocera/emulators/simcoupe/Config.in diff --git a/package/emulators/simcoupe/samcoupe.keys b/package/batocera/emulators/simcoupe/samcoupe.keys similarity index 100% rename from package/emulators/simcoupe/samcoupe.keys rename to package/batocera/emulators/simcoupe/samcoupe.keys diff --git a/package/emulators/simcoupe/simcoupe.mk b/package/batocera/emulators/simcoupe/simcoupe.mk similarity index 91% rename from package/emulators/simcoupe/simcoupe.mk rename to package/batocera/emulators/simcoupe/simcoupe.mk index ea448ec9c4c..d80d0b5997f 100644 --- a/package/emulators/simcoupe/simcoupe.mk +++ b/package/batocera/emulators/simcoupe/simcoupe.mk @@ -23,7 +23,7 @@ define SIMCOUPE_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)$(SIMCOUPE_BIOS_AND_RESOURCES) cp -R $(@D)/Resource/* $(TARGET_DIR)$(SIMCOUPE_BIOS_AND_RESOURCES) mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/simcoupe/samcoupe.keys \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/simcoupe/samcoupe.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/emulators/solarus-engine/001-cmake-remove-Werror.patch b/package/batocera/emulators/solarus-engine/001-cmake-remove-Werror.patch similarity index 100% rename from package/emulators/solarus-engine/001-cmake-remove-Werror.patch rename to package/batocera/emulators/solarus-engine/001-cmake-remove-Werror.patch diff --git a/package/emulators/solarus-engine/002-pad.patch b/package/batocera/emulators/solarus-engine/002-pad.patch similarity index 100% rename from package/emulators/solarus-engine/002-pad.patch rename to package/batocera/emulators/solarus-engine/002-pad.patch diff --git a/package/emulators/solarus-engine/003-padnum.patch b/package/batocera/emulators/solarus-engine/003-padnum.patch similarity index 100% rename from package/emulators/solarus-engine/003-padnum.patch rename to package/batocera/emulators/solarus-engine/003-padnum.patch diff --git a/package/emulators/solarus-engine/Config.in b/package/batocera/emulators/solarus-engine/Config.in similarity index 100% rename from package/emulators/solarus-engine/Config.in rename to package/batocera/emulators/solarus-engine/Config.in diff --git a/package/emulators/solarus-engine/solarus-engine.mk b/package/batocera/emulators/solarus-engine/solarus-engine.mk similarity index 100% rename from package/emulators/solarus-engine/solarus-engine.mk rename to package/batocera/emulators/solarus-engine/solarus-engine.mk diff --git a/package/emulators/supermodel-es/001-folder-directory.patch b/package/batocera/emulators/supermodel-es/001-folder-directory.patch similarity index 100% rename from package/emulators/supermodel-es/001-folder-directory.patch rename to package/batocera/emulators/supermodel-es/001-folder-directory.patch diff --git a/package/emulators/supermodel-es/002-updatetemplate.patch b/package/batocera/emulators/supermodel-es/002-updatetemplate.patch similarity index 100% rename from package/emulators/supermodel-es/002-updatetemplate.patch rename to package/batocera/emulators/supermodel-es/002-updatetemplate.patch diff --git a/package/emulators/supermodel-es/003-cross-compile.patch b/package/batocera/emulators/supermodel-es/003-cross-compile.patch similarity index 100% rename from package/emulators/supermodel-es/003-cross-compile.patch rename to package/batocera/emulators/supermodel-es/003-cross-compile.patch diff --git a/package/emulators/supermodel-es/004-volume-adjustments.patch b/package/batocera/emulators/supermodel-es/004-volume-adjustments.patch similarity index 100% rename from package/emulators/supermodel-es/004-volume-adjustments.patch rename to package/batocera/emulators/supermodel-es/004-volume-adjustments.patch diff --git a/package/emulators/supermodel-es/005-evdev-for-guns.patch b/package/batocera/emulators/supermodel-es/005-evdev-for-guns.patch similarity index 100% rename from package/emulators/supermodel-es/005-evdev-for-guns.patch rename to package/batocera/emulators/supermodel-es/005-evdev-for-guns.patch diff --git a/package/emulators/supermodel-es/Config.in b/package/batocera/emulators/supermodel-es/Config.in similarity index 100% rename from package/emulators/supermodel-es/Config.in rename to package/batocera/emulators/supermodel-es/Config.in diff --git a/package/emulators/supermodel-es/NVRAM/_reamde.txt b/package/batocera/emulators/supermodel-es/NVRAM/_reamde.txt similarity index 100% rename from package/emulators/supermodel-es/NVRAM/_reamde.txt rename to package/batocera/emulators/supermodel-es/NVRAM/_reamde.txt diff --git a/package/emulators/supermodel-es/NVRAM/dayto2pe.nv b/package/batocera/emulators/supermodel-es/NVRAM/dayto2pe.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/dayto2pe.nv rename to package/batocera/emulators/supermodel-es/NVRAM/dayto2pe.nv diff --git a/package/emulators/supermodel-es/NVRAM/daytona2.nv b/package/batocera/emulators/supermodel-es/NVRAM/daytona2.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/daytona2.nv rename to package/batocera/emulators/supermodel-es/NVRAM/daytona2.nv diff --git a/package/emulators/supermodel-es/NVRAM/dirtdvls.nv b/package/batocera/emulators/supermodel-es/NVRAM/dirtdvls.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/dirtdvls.nv rename to package/batocera/emulators/supermodel-es/NVRAM/dirtdvls.nv diff --git a/package/emulators/supermodel-es/NVRAM/dirtdvlsau.nv b/package/batocera/emulators/supermodel-es/NVRAM/dirtdvlsau.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/dirtdvlsau.nv rename to package/batocera/emulators/supermodel-es/NVRAM/dirtdvlsau.nv diff --git a/package/emulators/supermodel-es/NVRAM/eca.nv b/package/batocera/emulators/supermodel-es/NVRAM/eca.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/eca.nv rename to package/batocera/emulators/supermodel-es/NVRAM/eca.nv diff --git a/package/emulators/supermodel-es/NVRAM/fvipers2.nv b/package/batocera/emulators/supermodel-es/NVRAM/fvipers2.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/fvipers2.nv rename to package/batocera/emulators/supermodel-es/NVRAM/fvipers2.nv diff --git a/package/emulators/supermodel-es/NVRAM/getbass.nv b/package/batocera/emulators/supermodel-es/NVRAM/getbass.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/getbass.nv rename to package/batocera/emulators/supermodel-es/NVRAM/getbass.nv diff --git a/package/emulators/supermodel-es/NVRAM/getbassdx.nv b/package/batocera/emulators/supermodel-es/NVRAM/getbassdx.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/getbassdx.nv rename to package/batocera/emulators/supermodel-es/NVRAM/getbassdx.nv diff --git a/package/emulators/supermodel-es/NVRAM/getbassur.nv b/package/batocera/emulators/supermodel-es/NVRAM/getbassur.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/getbassur.nv rename to package/batocera/emulators/supermodel-es/NVRAM/getbassur.nv diff --git a/package/emulators/supermodel-es/NVRAM/harley.nv b/package/batocera/emulators/supermodel-es/NVRAM/harley.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/harley.nv rename to package/batocera/emulators/supermodel-es/NVRAM/harley.nv diff --git a/package/emulators/supermodel-es/NVRAM/harleya.nv b/package/batocera/emulators/supermodel-es/NVRAM/harleya.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/harleya.nv rename to package/batocera/emulators/supermodel-es/NVRAM/harleya.nv diff --git a/package/emulators/supermodel-es/NVRAM/lamachin.nv b/package/batocera/emulators/supermodel-es/NVRAM/lamachin.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/lamachin.nv rename to package/batocera/emulators/supermodel-es/NVRAM/lamachin.nv diff --git a/package/emulators/supermodel-es/NVRAM/lemans24.nv b/package/batocera/emulators/supermodel-es/NVRAM/lemans24.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/lemans24.nv rename to package/batocera/emulators/supermodel-es/NVRAM/lemans24.nv diff --git a/package/emulators/supermodel-es/NVRAM/lostwsga (Calibrated for 4x3 resolutions).nv b/package/batocera/emulators/supermodel-es/NVRAM/lostwsga (Calibrated for 4x3 resolutions).nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/lostwsga (Calibrated for 4x3 resolutions).nv rename to package/batocera/emulators/supermodel-es/NVRAM/lostwsga (Calibrated for 4x3 resolutions).nv diff --git a/package/emulators/supermodel-es/NVRAM/lostwsga.nv b/package/batocera/emulators/supermodel-es/NVRAM/lostwsga.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/lostwsga.nv rename to package/batocera/emulators/supermodel-es/NVRAM/lostwsga.nv diff --git a/package/emulators/supermodel-es/NVRAM/magtruck.nv b/package/batocera/emulators/supermodel-es/NVRAM/magtruck.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/magtruck.nv rename to package/batocera/emulators/supermodel-es/NVRAM/magtruck.nv diff --git a/package/emulators/supermodel-es/NVRAM/mgtrkbad.nv b/package/batocera/emulators/supermodel-es/NVRAM/mgtrkbad.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/mgtrkbad.nv rename to package/batocera/emulators/supermodel-es/NVRAM/mgtrkbad.nv diff --git a/package/emulators/supermodel-es/NVRAM/oceanhun.nv b/package/batocera/emulators/supermodel-es/NVRAM/oceanhun.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/oceanhun.nv rename to package/batocera/emulators/supermodel-es/NVRAM/oceanhun.nv diff --git a/package/emulators/supermodel-es/NVRAM/oceanhuna.nv b/package/batocera/emulators/supermodel-es/NVRAM/oceanhuna.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/oceanhuna.nv rename to package/batocera/emulators/supermodel-es/NVRAM/oceanhuna.nv diff --git a/package/emulators/supermodel-es/NVRAM/scud.nv b/package/batocera/emulators/supermodel-es/NVRAM/scud.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/scud.nv rename to package/batocera/emulators/supermodel-es/NVRAM/scud.nv diff --git a/package/emulators/supermodel-es/NVRAM/scudau.nv b/package/batocera/emulators/supermodel-es/NVRAM/scudau.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/scudau.nv rename to package/batocera/emulators/supermodel-es/NVRAM/scudau.nv diff --git a/package/emulators/supermodel-es/NVRAM/scudplus.nv b/package/batocera/emulators/supermodel-es/NVRAM/scudplus.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/scudplus.nv rename to package/batocera/emulators/supermodel-es/NVRAM/scudplus.nv diff --git a/package/emulators/supermodel-es/NVRAM/skichamp.nv b/package/batocera/emulators/supermodel-es/NVRAM/skichamp.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/skichamp.nv rename to package/batocera/emulators/supermodel-es/NVRAM/skichamp.nv diff --git a/package/emulators/supermodel-es/NVRAM/spikeofe.nv b/package/batocera/emulators/supermodel-es/NVRAM/spikeofe.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/spikeofe.nv rename to package/batocera/emulators/supermodel-es/NVRAM/spikeofe.nv diff --git a/package/emulators/supermodel-es/NVRAM/spikeout.nv b/package/batocera/emulators/supermodel-es/NVRAM/spikeout.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/spikeout.nv rename to package/batocera/emulators/supermodel-es/NVRAM/spikeout.nv diff --git a/package/emulators/supermodel-es/NVRAM/srally2.nv b/package/batocera/emulators/supermodel-es/NVRAM/srally2.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/srally2.nv rename to package/batocera/emulators/supermodel-es/NVRAM/srally2.nv diff --git a/package/emulators/supermodel-es/NVRAM/srally2dx.nv b/package/batocera/emulators/supermodel-es/NVRAM/srally2dx.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/srally2dx.nv rename to package/batocera/emulators/supermodel-es/NVRAM/srally2dx.nv diff --git a/package/emulators/supermodel-es/NVRAM/swtrilgy.nv b/package/batocera/emulators/supermodel-es/NVRAM/swtrilgy.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/swtrilgy.nv rename to package/batocera/emulators/supermodel-es/NVRAM/swtrilgy.nv diff --git a/package/emulators/supermodel-es/NVRAM/swtrilgya.nv b/package/batocera/emulators/supermodel-es/NVRAM/swtrilgya.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/swtrilgya.nv rename to package/batocera/emulators/supermodel-es/NVRAM/swtrilgya.nv diff --git a/package/emulators/supermodel-es/NVRAM/vf3.nv b/package/batocera/emulators/supermodel-es/NVRAM/vf3.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/vf3.nv rename to package/batocera/emulators/supermodel-es/NVRAM/vf3.nv diff --git a/package/emulators/supermodel-es/NVRAM/vf3a.nv b/package/batocera/emulators/supermodel-es/NVRAM/vf3a.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/vf3a.nv rename to package/batocera/emulators/supermodel-es/NVRAM/vf3a.nv diff --git a/package/emulators/supermodel-es/NVRAM/vf3c.nv b/package/batocera/emulators/supermodel-es/NVRAM/vf3c.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/vf3c.nv rename to package/batocera/emulators/supermodel-es/NVRAM/vf3c.nv diff --git a/package/emulators/supermodel-es/NVRAM/vf3tb.nv b/package/batocera/emulators/supermodel-es/NVRAM/vf3tb.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/vf3tb.nv rename to package/batocera/emulators/supermodel-es/NVRAM/vf3tb.nv diff --git a/package/emulators/supermodel-es/NVRAM/von2.nv b/package/batocera/emulators/supermodel-es/NVRAM/von2.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/von2.nv rename to package/batocera/emulators/supermodel-es/NVRAM/von2.nv diff --git a/package/emulators/supermodel-es/NVRAM/von254g.nv b/package/batocera/emulators/supermodel-es/NVRAM/von254g.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/von254g.nv rename to package/batocera/emulators/supermodel-es/NVRAM/von254g.nv diff --git a/package/emulators/supermodel-es/NVRAM/vs2.nv b/package/batocera/emulators/supermodel-es/NVRAM/vs2.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/vs2.nv rename to package/batocera/emulators/supermodel-es/NVRAM/vs2.nv diff --git a/package/emulators/supermodel-es/NVRAM/vs215.nv b/package/batocera/emulators/supermodel-es/NVRAM/vs215.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/vs215.nv rename to package/batocera/emulators/supermodel-es/NVRAM/vs215.nv diff --git a/package/emulators/supermodel-es/NVRAM/vs298.nv b/package/batocera/emulators/supermodel-es/NVRAM/vs298.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/vs298.nv rename to package/batocera/emulators/supermodel-es/NVRAM/vs298.nv diff --git a/package/emulators/supermodel-es/NVRAM/vs29815.nv b/package/batocera/emulators/supermodel-es/NVRAM/vs29815.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/vs29815.nv rename to package/batocera/emulators/supermodel-es/NVRAM/vs29815.nv diff --git a/package/emulators/supermodel-es/NVRAM/vs299.nv b/package/batocera/emulators/supermodel-es/NVRAM/vs299.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/vs299.nv rename to package/batocera/emulators/supermodel-es/NVRAM/vs299.nv diff --git a/package/emulators/supermodel-es/NVRAM/vs299a.nv b/package/batocera/emulators/supermodel-es/NVRAM/vs299a.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/vs299a.nv rename to package/batocera/emulators/supermodel-es/NVRAM/vs299a.nv diff --git a/package/emulators/supermodel-es/NVRAM/vs299b.nv b/package/batocera/emulators/supermodel-es/NVRAM/vs299b.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/vs299b.nv rename to package/batocera/emulators/supermodel-es/NVRAM/vs299b.nv diff --git a/package/emulators/supermodel-es/NVRAM/vs2v991.nv b/package/batocera/emulators/supermodel-es/NVRAM/vs2v991.nv similarity index 100% rename from package/emulators/supermodel-es/NVRAM/vs2v991.nv rename to package/batocera/emulators/supermodel-es/NVRAM/vs2v991.nv diff --git a/package/emulators/supermodel-es/model3.supermodel.keys b/package/batocera/emulators/supermodel-es/model3.supermodel.keys similarity index 100% rename from package/emulators/supermodel-es/model3.supermodel.keys rename to package/batocera/emulators/supermodel-es/model3.supermodel.keys diff --git a/package/emulators/supermodel-es/supermodel-es.mk b/package/batocera/emulators/supermodel-es/supermodel-es.mk similarity index 93% rename from package/emulators/supermodel-es/supermodel-es.mk rename to package/batocera/emulators/supermodel-es/supermodel-es.mk index 07947ccd2c0..63a9b3d42b1 100644 --- a/package/emulators/supermodel-es/supermodel-es.mk +++ b/package/batocera/emulators/supermodel-es/supermodel-es.mk @@ -46,8 +46,8 @@ endef define SUPERMODEL_ES_POST_PROCESS mkdir -p $(TARGET_DIR)/usr/share/evmapy $(TARGET_DIR)/usr/share/supermodel - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/supermodel/model3.supermodel.keys $(TARGET_DIR)/usr/share/evmapy - cp -pr $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/supermodel/NVRAM $(TARGET_DIR)/usr/share/supermodel + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/supermodel/model3.supermodel.keys $(TARGET_DIR)/usr/share/evmapy + cp -pr $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/supermodel/NVRAM $(TARGET_DIR)/usr/share/supermodel endef SUPERMODEL_ES_PRE_PATCH_HOOKS += SUPERMODEL_ES_LINE_ENDINGS_FIXUP diff --git a/package/emulators/supermodel-legacy/001-folder-directory.patch b/package/batocera/emulators/supermodel-legacy/001-folder-directory.patch similarity index 100% rename from package/emulators/supermodel-legacy/001-folder-directory.patch rename to package/batocera/emulators/supermodel-legacy/001-folder-directory.patch diff --git a/package/emulators/supermodel-legacy/002-updatetemplate.patch b/package/batocera/emulators/supermodel-legacy/002-updatetemplate.patch similarity index 100% rename from package/emulators/supermodel-legacy/002-updatetemplate.patch rename to package/batocera/emulators/supermodel-legacy/002-updatetemplate.patch diff --git a/package/emulators/supermodel-legacy/003-cross-compile.patch b/package/batocera/emulators/supermodel-legacy/003-cross-compile.patch similarity index 100% rename from package/emulators/supermodel-legacy/003-cross-compile.patch rename to package/batocera/emulators/supermodel-legacy/003-cross-compile.patch diff --git a/package/emulators/supermodel-legacy/004-volume-adjustments.patch b/package/batocera/emulators/supermodel-legacy/004-volume-adjustments.patch similarity index 100% rename from package/emulators/supermodel-legacy/004-volume-adjustments.patch rename to package/batocera/emulators/supermodel-legacy/004-volume-adjustments.patch diff --git a/package/emulators/supermodel-legacy/005-evdev-for-guns.patch b/package/batocera/emulators/supermodel-legacy/005-evdev-for-guns.patch similarity index 100% rename from package/emulators/supermodel-legacy/005-evdev-for-guns.patch rename to package/batocera/emulators/supermodel-legacy/005-evdev-for-guns.patch diff --git a/package/emulators/supermodel-legacy/Config.in b/package/batocera/emulators/supermodel-legacy/Config.in similarity index 100% rename from package/emulators/supermodel-legacy/Config.in rename to package/batocera/emulators/supermodel-legacy/Config.in diff --git a/package/emulators/supermodel-legacy/NVRAM/_reamde.txt b/package/batocera/emulators/supermodel-legacy/NVRAM/_reamde.txt similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/_reamde.txt rename to package/batocera/emulators/supermodel-legacy/NVRAM/_reamde.txt diff --git a/package/emulators/supermodel-legacy/NVRAM/dayto2pe.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/dayto2pe.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/dayto2pe.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/dayto2pe.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/daytona2.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/daytona2.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/daytona2.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/daytona2.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/dirtdvls.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/dirtdvls.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/dirtdvls.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/dirtdvls.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/dirtdvlsau.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/dirtdvlsau.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/dirtdvlsau.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/dirtdvlsau.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/eca.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/eca.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/eca.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/eca.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/fvipers2.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/fvipers2.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/fvipers2.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/fvipers2.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/getbass.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/getbass.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/getbass.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/getbass.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/getbassdx.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/getbassdx.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/getbassdx.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/getbassdx.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/getbassur.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/getbassur.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/getbassur.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/getbassur.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/harley.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/harley.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/harley.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/harley.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/harleya.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/harleya.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/harleya.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/harleya.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/lamachin.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/lamachin.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/lamachin.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/lamachin.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/lemans24.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/lemans24.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/lemans24.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/lemans24.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/lostwsga (Calibrated for 4x3 resolutions).nv b/package/batocera/emulators/supermodel-legacy/NVRAM/lostwsga (Calibrated for 4x3 resolutions).nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/lostwsga (Calibrated for 4x3 resolutions).nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/lostwsga (Calibrated for 4x3 resolutions).nv diff --git a/package/emulators/supermodel-legacy/NVRAM/lostwsga.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/lostwsga.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/lostwsga.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/lostwsga.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/magtruck.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/magtruck.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/magtruck.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/magtruck.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/mgtrkbad.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/mgtrkbad.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/mgtrkbad.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/mgtrkbad.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/oceanhun.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/oceanhun.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/oceanhun.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/oceanhun.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/oceanhuna.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/oceanhuna.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/oceanhuna.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/oceanhuna.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/scud.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/scud.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/scud.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/scud.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/scudau.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/scudau.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/scudau.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/scudau.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/scudplus.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/scudplus.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/scudplus.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/scudplus.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/skichamp.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/skichamp.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/skichamp.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/skichamp.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/spikeofe.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/spikeofe.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/spikeofe.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/spikeofe.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/spikeout.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/spikeout.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/spikeout.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/spikeout.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/srally2.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/srally2.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/srally2.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/srally2.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/srally2dx.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/srally2dx.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/srally2dx.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/srally2dx.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/swtrilgy.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/swtrilgy.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/swtrilgy.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/swtrilgy.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/swtrilgya.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/swtrilgya.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/swtrilgya.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/swtrilgya.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/vf3.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/vf3.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/vf3.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/vf3.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/vf3a.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/vf3a.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/vf3a.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/vf3a.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/vf3c.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/vf3c.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/vf3c.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/vf3c.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/vf3tb.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/vf3tb.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/vf3tb.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/vf3tb.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/von2.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/von2.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/von2.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/von2.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/von254g.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/von254g.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/von254g.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/von254g.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/vs2.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/vs2.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/vs2.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/vs2.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/vs215.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/vs215.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/vs215.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/vs215.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/vs298.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/vs298.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/vs298.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/vs298.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/vs29815.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/vs29815.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/vs29815.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/vs29815.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/vs299.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/vs299.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/vs299.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/vs299.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/vs299a.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/vs299a.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/vs299a.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/vs299a.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/vs299b.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/vs299b.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/vs299b.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/vs299b.nv diff --git a/package/emulators/supermodel-legacy/NVRAM/vs2v991.nv b/package/batocera/emulators/supermodel-legacy/NVRAM/vs2v991.nv similarity index 100% rename from package/emulators/supermodel-legacy/NVRAM/vs2v991.nv rename to package/batocera/emulators/supermodel-legacy/NVRAM/vs2v991.nv diff --git a/package/emulators/supermodel-legacy/model3.supermodel.keys b/package/batocera/emulators/supermodel-legacy/model3.supermodel.keys similarity index 100% rename from package/emulators/supermodel-legacy/model3.supermodel.keys rename to package/batocera/emulators/supermodel-legacy/model3.supermodel.keys diff --git a/package/emulators/supermodel-legacy/supermodel-legacy.mk b/package/batocera/emulators/supermodel-legacy/supermodel-legacy.mk similarity index 93% rename from package/emulators/supermodel-legacy/supermodel-legacy.mk rename to package/batocera/emulators/supermodel-legacy/supermodel-legacy.mk index b56d3923ef1..2b65302222d 100644 --- a/package/emulators/supermodel-legacy/supermodel-legacy.mk +++ b/package/batocera/emulators/supermodel-legacy/supermodel-legacy.mk @@ -49,8 +49,8 @@ endef define SUPERMODEL_LEGACY_POST_PROCESS mkdir -p $(TARGET_DIR)/usr/share/evmapy $(TARGET_DIR)/usr/share/supermodel - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/supermodel/model3.supermodel.keys $(TARGET_DIR)/usr/share/evmapy - cp -pr $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/supermodel/NVRAM $(TARGET_DIR)/usr/share/supermodel + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/supermodel/model3.supermodel.keys $(TARGET_DIR)/usr/share/evmapy + cp -pr $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/supermodel/NVRAM $(TARGET_DIR)/usr/share/supermodel endef SUPERMODEL_LEGACY_PRE_PATCH_HOOKS += SUPERMODEL_LEGACY_LINE_ENDINGS_FIXUP diff --git a/package/emulators/supermodel/001-folder-directory.patch b/package/batocera/emulators/supermodel/001-folder-directory.patch similarity index 100% rename from package/emulators/supermodel/001-folder-directory.patch rename to package/batocera/emulators/supermodel/001-folder-directory.patch diff --git a/package/emulators/supermodel/002-updatetemplate.patch b/package/batocera/emulators/supermodel/002-updatetemplate.patch similarity index 100% rename from package/emulators/supermodel/002-updatetemplate.patch rename to package/batocera/emulators/supermodel/002-updatetemplate.patch diff --git a/package/emulators/supermodel/003-cross-compile.patch b/package/batocera/emulators/supermodel/003-cross-compile.patch similarity index 100% rename from package/emulators/supermodel/003-cross-compile.patch rename to package/batocera/emulators/supermodel/003-cross-compile.patch diff --git a/package/emulators/supermodel/004-volume-adjustments.patch b/package/batocera/emulators/supermodel/004-volume-adjustments.patch similarity index 100% rename from package/emulators/supermodel/004-volume-adjustments.patch rename to package/batocera/emulators/supermodel/004-volume-adjustments.patch diff --git a/package/emulators/supermodel/005-evdev-for-guns.patch b/package/batocera/emulators/supermodel/005-evdev-for-guns.patch similarity index 100% rename from package/emulators/supermodel/005-evdev-for-guns.patch rename to package/batocera/emulators/supermodel/005-evdev-for-guns.patch diff --git a/package/emulators/supermodel/Config.in b/package/batocera/emulators/supermodel/Config.in similarity index 100% rename from package/emulators/supermodel/Config.in rename to package/batocera/emulators/supermodel/Config.in diff --git a/package/emulators/supermodel/NVRAM/_reamde.txt b/package/batocera/emulators/supermodel/NVRAM/_reamde.txt similarity index 100% rename from package/emulators/supermodel/NVRAM/_reamde.txt rename to package/batocera/emulators/supermodel/NVRAM/_reamde.txt diff --git a/package/emulators/supermodel/NVRAM/dayto2pe.nv b/package/batocera/emulators/supermodel/NVRAM/dayto2pe.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/dayto2pe.nv rename to package/batocera/emulators/supermodel/NVRAM/dayto2pe.nv diff --git a/package/emulators/supermodel/NVRAM/daytona2.nv b/package/batocera/emulators/supermodel/NVRAM/daytona2.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/daytona2.nv rename to package/batocera/emulators/supermodel/NVRAM/daytona2.nv diff --git a/package/emulators/supermodel/NVRAM/dirtdvls.nv b/package/batocera/emulators/supermodel/NVRAM/dirtdvls.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/dirtdvls.nv rename to package/batocera/emulators/supermodel/NVRAM/dirtdvls.nv diff --git a/package/emulators/supermodel/NVRAM/dirtdvlsau.nv b/package/batocera/emulators/supermodel/NVRAM/dirtdvlsau.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/dirtdvlsau.nv rename to package/batocera/emulators/supermodel/NVRAM/dirtdvlsau.nv diff --git a/package/emulators/supermodel/NVRAM/eca.nv b/package/batocera/emulators/supermodel/NVRAM/eca.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/eca.nv rename to package/batocera/emulators/supermodel/NVRAM/eca.nv diff --git a/package/emulators/supermodel/NVRAM/fvipers2.nv b/package/batocera/emulators/supermodel/NVRAM/fvipers2.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/fvipers2.nv rename to package/batocera/emulators/supermodel/NVRAM/fvipers2.nv diff --git a/package/emulators/supermodel/NVRAM/getbass.nv b/package/batocera/emulators/supermodel/NVRAM/getbass.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/getbass.nv rename to package/batocera/emulators/supermodel/NVRAM/getbass.nv diff --git a/package/emulators/supermodel/NVRAM/getbassdx.nv b/package/batocera/emulators/supermodel/NVRAM/getbassdx.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/getbassdx.nv rename to package/batocera/emulators/supermodel/NVRAM/getbassdx.nv diff --git a/package/emulators/supermodel/NVRAM/getbassur.nv b/package/batocera/emulators/supermodel/NVRAM/getbassur.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/getbassur.nv rename to package/batocera/emulators/supermodel/NVRAM/getbassur.nv diff --git a/package/emulators/supermodel/NVRAM/harley.nv b/package/batocera/emulators/supermodel/NVRAM/harley.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/harley.nv rename to package/batocera/emulators/supermodel/NVRAM/harley.nv diff --git a/package/emulators/supermodel/NVRAM/harleya.nv b/package/batocera/emulators/supermodel/NVRAM/harleya.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/harleya.nv rename to package/batocera/emulators/supermodel/NVRAM/harleya.nv diff --git a/package/emulators/supermodel/NVRAM/lamachin.nv b/package/batocera/emulators/supermodel/NVRAM/lamachin.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/lamachin.nv rename to package/batocera/emulators/supermodel/NVRAM/lamachin.nv diff --git a/package/emulators/supermodel/NVRAM/lemans24.nv b/package/batocera/emulators/supermodel/NVRAM/lemans24.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/lemans24.nv rename to package/batocera/emulators/supermodel/NVRAM/lemans24.nv diff --git a/package/emulators/supermodel/NVRAM/lostwsga (Calibrated for 4x3 resolutions).nv b/package/batocera/emulators/supermodel/NVRAM/lostwsga (Calibrated for 4x3 resolutions).nv similarity index 100% rename from package/emulators/supermodel/NVRAM/lostwsga (Calibrated for 4x3 resolutions).nv rename to package/batocera/emulators/supermodel/NVRAM/lostwsga (Calibrated for 4x3 resolutions).nv diff --git a/package/emulators/supermodel/NVRAM/lostwsga.nv b/package/batocera/emulators/supermodel/NVRAM/lostwsga.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/lostwsga.nv rename to package/batocera/emulators/supermodel/NVRAM/lostwsga.nv diff --git a/package/emulators/supermodel/NVRAM/magtruck.nv b/package/batocera/emulators/supermodel/NVRAM/magtruck.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/magtruck.nv rename to package/batocera/emulators/supermodel/NVRAM/magtruck.nv diff --git a/package/emulators/supermodel/NVRAM/mgtrkbad.nv b/package/batocera/emulators/supermodel/NVRAM/mgtrkbad.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/mgtrkbad.nv rename to package/batocera/emulators/supermodel/NVRAM/mgtrkbad.nv diff --git a/package/emulators/supermodel/NVRAM/oceanhun.nv b/package/batocera/emulators/supermodel/NVRAM/oceanhun.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/oceanhun.nv rename to package/batocera/emulators/supermodel/NVRAM/oceanhun.nv diff --git a/package/emulators/supermodel/NVRAM/oceanhuna.nv b/package/batocera/emulators/supermodel/NVRAM/oceanhuna.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/oceanhuna.nv rename to package/batocera/emulators/supermodel/NVRAM/oceanhuna.nv diff --git a/package/emulators/supermodel/NVRAM/scud.nv b/package/batocera/emulators/supermodel/NVRAM/scud.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/scud.nv rename to package/batocera/emulators/supermodel/NVRAM/scud.nv diff --git a/package/emulators/supermodel/NVRAM/scudau.nv b/package/batocera/emulators/supermodel/NVRAM/scudau.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/scudau.nv rename to package/batocera/emulators/supermodel/NVRAM/scudau.nv diff --git a/package/emulators/supermodel/NVRAM/scudplus.nv b/package/batocera/emulators/supermodel/NVRAM/scudplus.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/scudplus.nv rename to package/batocera/emulators/supermodel/NVRAM/scudplus.nv diff --git a/package/emulators/supermodel/NVRAM/skichamp.nv b/package/batocera/emulators/supermodel/NVRAM/skichamp.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/skichamp.nv rename to package/batocera/emulators/supermodel/NVRAM/skichamp.nv diff --git a/package/emulators/supermodel/NVRAM/spikeofe.nv b/package/batocera/emulators/supermodel/NVRAM/spikeofe.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/spikeofe.nv rename to package/batocera/emulators/supermodel/NVRAM/spikeofe.nv diff --git a/package/emulators/supermodel/NVRAM/spikeout.nv b/package/batocera/emulators/supermodel/NVRAM/spikeout.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/spikeout.nv rename to package/batocera/emulators/supermodel/NVRAM/spikeout.nv diff --git a/package/emulators/supermodel/NVRAM/srally2.nv b/package/batocera/emulators/supermodel/NVRAM/srally2.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/srally2.nv rename to package/batocera/emulators/supermodel/NVRAM/srally2.nv diff --git a/package/emulators/supermodel/NVRAM/srally2dx.nv b/package/batocera/emulators/supermodel/NVRAM/srally2dx.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/srally2dx.nv rename to package/batocera/emulators/supermodel/NVRAM/srally2dx.nv diff --git a/package/emulators/supermodel/NVRAM/swtrilgy.nv b/package/batocera/emulators/supermodel/NVRAM/swtrilgy.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/swtrilgy.nv rename to package/batocera/emulators/supermodel/NVRAM/swtrilgy.nv diff --git a/package/emulators/supermodel/NVRAM/swtrilgya.nv b/package/batocera/emulators/supermodel/NVRAM/swtrilgya.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/swtrilgya.nv rename to package/batocera/emulators/supermodel/NVRAM/swtrilgya.nv diff --git a/package/emulators/supermodel/NVRAM/vf3.nv b/package/batocera/emulators/supermodel/NVRAM/vf3.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/vf3.nv rename to package/batocera/emulators/supermodel/NVRAM/vf3.nv diff --git a/package/emulators/supermodel/NVRAM/vf3a.nv b/package/batocera/emulators/supermodel/NVRAM/vf3a.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/vf3a.nv rename to package/batocera/emulators/supermodel/NVRAM/vf3a.nv diff --git a/package/emulators/supermodel/NVRAM/vf3c.nv b/package/batocera/emulators/supermodel/NVRAM/vf3c.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/vf3c.nv rename to package/batocera/emulators/supermodel/NVRAM/vf3c.nv diff --git a/package/emulators/supermodel/NVRAM/vf3tb.nv b/package/batocera/emulators/supermodel/NVRAM/vf3tb.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/vf3tb.nv rename to package/batocera/emulators/supermodel/NVRAM/vf3tb.nv diff --git a/package/emulators/supermodel/NVRAM/von2.nv b/package/batocera/emulators/supermodel/NVRAM/von2.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/von2.nv rename to package/batocera/emulators/supermodel/NVRAM/von2.nv diff --git a/package/emulators/supermodel/NVRAM/von254g.nv b/package/batocera/emulators/supermodel/NVRAM/von254g.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/von254g.nv rename to package/batocera/emulators/supermodel/NVRAM/von254g.nv diff --git a/package/emulators/supermodel/NVRAM/vs2.nv b/package/batocera/emulators/supermodel/NVRAM/vs2.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/vs2.nv rename to package/batocera/emulators/supermodel/NVRAM/vs2.nv diff --git a/package/emulators/supermodel/NVRAM/vs215.nv b/package/batocera/emulators/supermodel/NVRAM/vs215.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/vs215.nv rename to package/batocera/emulators/supermodel/NVRAM/vs215.nv diff --git a/package/emulators/supermodel/NVRAM/vs298.nv b/package/batocera/emulators/supermodel/NVRAM/vs298.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/vs298.nv rename to package/batocera/emulators/supermodel/NVRAM/vs298.nv diff --git a/package/emulators/supermodel/NVRAM/vs29815.nv b/package/batocera/emulators/supermodel/NVRAM/vs29815.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/vs29815.nv rename to package/batocera/emulators/supermodel/NVRAM/vs29815.nv diff --git a/package/emulators/supermodel/NVRAM/vs299.nv b/package/batocera/emulators/supermodel/NVRAM/vs299.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/vs299.nv rename to package/batocera/emulators/supermodel/NVRAM/vs299.nv diff --git a/package/emulators/supermodel/NVRAM/vs299a.nv b/package/batocera/emulators/supermodel/NVRAM/vs299a.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/vs299a.nv rename to package/batocera/emulators/supermodel/NVRAM/vs299a.nv diff --git a/package/emulators/supermodel/NVRAM/vs299b.nv b/package/batocera/emulators/supermodel/NVRAM/vs299b.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/vs299b.nv rename to package/batocera/emulators/supermodel/NVRAM/vs299b.nv diff --git a/package/emulators/supermodel/NVRAM/vs2v991.nv b/package/batocera/emulators/supermodel/NVRAM/vs2v991.nv similarity index 100% rename from package/emulators/supermodel/NVRAM/vs2v991.nv rename to package/batocera/emulators/supermodel/NVRAM/vs2v991.nv diff --git a/package/emulators/supermodel/model3.supermodel.keys b/package/batocera/emulators/supermodel/model3.supermodel.keys similarity index 100% rename from package/emulators/supermodel/model3.supermodel.keys rename to package/batocera/emulators/supermodel/model3.supermodel.keys diff --git a/package/emulators/supermodel/supermodel.mk b/package/batocera/emulators/supermodel/supermodel.mk similarity index 93% rename from package/emulators/supermodel/supermodel.mk rename to package/batocera/emulators/supermodel/supermodel.mk index 2b33818e814..03f0d96c312 100644 --- a/package/emulators/supermodel/supermodel.mk +++ b/package/batocera/emulators/supermodel/supermodel.mk @@ -50,8 +50,8 @@ endef define SUPERMODEL_POST_PROCESS mkdir -p $(TARGET_DIR)/usr/share/evmapy $(TARGET_DIR)/usr/share/supermodel - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/supermodel/model3.supermodel.keys $(TARGET_DIR)/usr/share/evmapy - cp -pr $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/supermodel/NVRAM $(TARGET_DIR)/usr/share/supermodel + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/supermodel/model3.supermodel.keys $(TARGET_DIR)/usr/share/evmapy + cp -pr $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/supermodel/NVRAM $(TARGET_DIR)/usr/share/supermodel endef SUPERMODEL_PRE_PATCH_HOOKS += SUPERMODEL_LINE_ENDINGS_FIXUP diff --git a/package/emulators/tsugaru/Config.in b/package/batocera/emulators/tsugaru/Config.in similarity index 100% rename from package/emulators/tsugaru/Config.in rename to package/batocera/emulators/tsugaru/Config.in diff --git a/package/emulators/tsugaru/fmtowns.keys b/package/batocera/emulators/tsugaru/fmtowns.keys similarity index 100% rename from package/emulators/tsugaru/fmtowns.keys rename to package/batocera/emulators/tsugaru/fmtowns.keys diff --git a/package/emulators/tsugaru/tsugaru.hash b/package/batocera/emulators/tsugaru/tsugaru.hash similarity index 100% rename from package/emulators/tsugaru/tsugaru.hash rename to package/batocera/emulators/tsugaru/tsugaru.hash diff --git a/package/emulators/tsugaru/tsugaru.mk b/package/batocera/emulators/tsugaru/tsugaru.mk similarity index 87% rename from package/emulators/tsugaru/tsugaru.mk rename to package/batocera/emulators/tsugaru/tsugaru.mk index 649a4a328cc..44305c933d3 100644 --- a/package/emulators/tsugaru/tsugaru.mk +++ b/package/batocera/emulators/tsugaru/tsugaru.mk @@ -21,7 +21,7 @@ define TSUGARU_INSTALL_TARGET_CMDS $(TARGET_DIR)/usr/bin/ mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/tsugaru/fmtowns.keys $(TARGET_DIR)/usr/share/evmapy + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/tsugaru/fmtowns.keys $(TARGET_DIR)/usr/share/evmapy endef $(eval $(cmake-package)) diff --git a/package/emulators/vice/Config.in b/package/batocera/emulators/vice/Config.in similarity index 100% rename from package/emulators/vice/Config.in rename to package/batocera/emulators/vice/Config.in diff --git a/package/emulators/vice/c128.vice.keys b/package/batocera/emulators/vice/c128.vice.keys similarity index 100% rename from package/emulators/vice/c128.vice.keys rename to package/batocera/emulators/vice/c128.vice.keys diff --git a/package/emulators/vice/c64.vice.keys b/package/batocera/emulators/vice/c64.vice.keys similarity index 100% rename from package/emulators/vice/c64.vice.keys rename to package/batocera/emulators/vice/c64.vice.keys diff --git a/package/emulators/vice/vice.mk b/package/batocera/emulators/vice/vice.mk similarity index 90% rename from package/emulators/vice/vice.mk rename to package/batocera/emulators/vice/vice.mk index de8bc9a2f27..4eb1100aafe 100644 --- a/package/emulators/vice/vice.mk +++ b/package/batocera/emulators/vice/vice.mk @@ -24,14 +24,14 @@ VICE_CONF_OPTS += --without-pulse VICE_CONF_OPTS += --enable-x64 VICE_CONF_OPTS += --enable-arch=yes VICE_CONF_OPTS += --enable-sdl2ui -VICE_CONF_OPTS += --with-sdlsound +VICE_CONF_OPTS += --with-sdlsound VICE_CONF_OPTS += --disable-debug-gtk3ui VICE_CONF_ENV += LDFLAGS=-lSDL2 define VICE_POST_PROCESS mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/vice/c64.vice.keys \ + cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/vice/c64.vice.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/emulators/vita3k/001-adjust-paths.patch b/package/batocera/emulators/vita3k/001-adjust-paths.patch similarity index 100% rename from package/emulators/vita3k/001-adjust-paths.patch rename to package/batocera/emulators/vita3k/001-adjust-paths.patch diff --git a/package/emulators/vita3k/002-fix-curr_renderpass_info.patch b/package/batocera/emulators/vita3k/002-fix-curr_renderpass_info.patch similarity index 100% rename from package/emulators/vita3k/002-fix-curr_renderpass_info.patch rename to package/batocera/emulators/vita3k/002-fix-curr_renderpass_info.patch diff --git a/package/emulators/vita3k/004-lower-case-vita.patch b/package/batocera/emulators/vita3k/004-lower-case-vita.patch similarity index 100% rename from package/emulators/vita3k/004-lower-case-vita.patch rename to package/batocera/emulators/vita3k/004-lower-case-vita.patch diff --git a/package/emulators/vita3k/005-fix-header.patch b/package/batocera/emulators/vita3k/005-fix-header.patch similarity index 100% rename from package/emulators/vita3k/005-fix-header.patch rename to package/batocera/emulators/vita3k/005-fix-header.patch diff --git a/package/emulators/vita3k/006-hack-ffmpeg-git-sha.patch b/package/batocera/emulators/vita3k/006-hack-ffmpeg-git-sha.patch similarity index 100% rename from package/emulators/vita3k/006-hack-ffmpeg-git-sha.patch rename to package/batocera/emulators/vita3k/006-hack-ffmpeg-git-sha.patch diff --git a/package/emulators/vita3k/Config.in b/package/batocera/emulators/vita3k/Config.in similarity index 100% rename from package/emulators/vita3k/Config.in rename to package/batocera/emulators/vita3k/Config.in diff --git a/package/emulators/vita3k/psvita.vita3k.keys b/package/batocera/emulators/vita3k/psvita.vita3k.keys similarity index 100% rename from package/emulators/vita3k/psvita.vita3k.keys rename to package/batocera/emulators/vita3k/psvita.vita3k.keys diff --git a/package/emulators/vita3k/vita3k.mk b/package/batocera/emulators/vita3k/vita3k.mk similarity index 95% rename from package/emulators/vita3k/vita3k.mk rename to package/batocera/emulators/vita3k/vita3k.mk index f899eea0fc3..16bfb219a61 100644 --- a/package/emulators/vita3k/vita3k.mk +++ b/package/batocera/emulators/vita3k/vita3k.mk @@ -43,7 +43,7 @@ endef define VITA3K_INSTALL_EVMAPY mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/vita3k/psvita.vita3k.keys \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/vita3k/psvita.vita3k.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/emulators/vpinball/001-default-path.patch b/package/batocera/emulators/vpinball/001-default-path.patch similarity index 100% rename from package/emulators/vpinball/001-default-path.patch rename to package/batocera/emulators/vpinball/001-default-path.patch diff --git a/package/emulators/vpinball/Config.in b/package/batocera/emulators/vpinball/Config.in similarity index 100% rename from package/emulators/vpinball/Config.in rename to package/batocera/emulators/vpinball/Config.in diff --git a/package/emulators/vpinball/vpinball.keys b/package/batocera/emulators/vpinball/vpinball.keys similarity index 100% rename from package/emulators/vpinball/vpinball.keys rename to package/batocera/emulators/vpinball/vpinball.keys diff --git a/package/emulators/vpinball/vpinball.mk b/package/batocera/emulators/vpinball/vpinball.mk similarity index 97% rename from package/emulators/vpinball/vpinball.mk rename to package/batocera/emulators/vpinball/vpinball.mk index 43c5eb8b330..63955728804 100644 --- a/package/emulators/vpinball/vpinball.mk +++ b/package/batocera/emulators/vpinball/vpinball.mk @@ -69,7 +69,7 @@ endef define VPINBALL_EVMAPY mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/vpinball/vpinball.keys \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/vpinball/vpinball.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/emulators/wine-x86/Config.in b/package/batocera/emulators/wine-x86/Config.in similarity index 100% rename from package/emulators/wine-x86/Config.in rename to package/batocera/emulators/wine-x86/Config.in diff --git a/package/emulators/wine-x86/wine-x86.mk b/package/batocera/emulators/wine-x86/wine-x86.mk similarity index 100% rename from package/emulators/wine-x86/wine-x86.mk rename to package/batocera/emulators/wine-x86/wine-x86.mk diff --git a/package/emulators/wine/d8vk/Config.in b/package/batocera/emulators/wine/d8vk/Config.in similarity index 100% rename from package/emulators/wine/d8vk/Config.in rename to package/batocera/emulators/wine/d8vk/Config.in diff --git a/package/emulators/wine/d8vk/d8vk.mk b/package/batocera/emulators/wine/d8vk/d8vk.mk similarity index 100% rename from package/emulators/wine/d8vk/d8vk.mk rename to package/batocera/emulators/wine/d8vk/d8vk.mk diff --git a/package/emulators/wine/dxvk-nvapi/Config.in b/package/batocera/emulators/wine/dxvk-nvapi/Config.in similarity index 100% rename from package/emulators/wine/dxvk-nvapi/Config.in rename to package/batocera/emulators/wine/dxvk-nvapi/Config.in diff --git a/package/emulators/wine/dxvk-nvapi/dxvk-nvapi.hash b/package/batocera/emulators/wine/dxvk-nvapi/dxvk-nvapi.hash similarity index 100% rename from package/emulators/wine/dxvk-nvapi/dxvk-nvapi.hash rename to package/batocera/emulators/wine/dxvk-nvapi/dxvk-nvapi.hash diff --git a/package/emulators/wine/dxvk-nvapi/dxvk-nvapi.mk b/package/batocera/emulators/wine/dxvk-nvapi/dxvk-nvapi.mk similarity index 100% rename from package/emulators/wine/dxvk-nvapi/dxvk-nvapi.mk rename to package/batocera/emulators/wine/dxvk-nvapi/dxvk-nvapi.mk diff --git a/package/emulators/wine/dxvk/Config.in b/package/batocera/emulators/wine/dxvk/Config.in similarity index 100% rename from package/emulators/wine/dxvk/Config.in rename to package/batocera/emulators/wine/dxvk/Config.in diff --git a/package/emulators/wine/dxvk/dxvk.mk b/package/batocera/emulators/wine/dxvk/dxvk.mk similarity index 100% rename from package/emulators/wine/dxvk/dxvk.mk rename to package/batocera/emulators/wine/dxvk/dxvk.mk diff --git a/package/emulators/wine/mf/Config.in b/package/batocera/emulators/wine/mf/Config.in similarity index 100% rename from package/emulators/wine/mf/Config.in rename to package/batocera/emulators/wine/mf/Config.in diff --git a/package/emulators/wine/mf/mf.mk b/package/batocera/emulators/wine/mf/mf.mk similarity index 100% rename from package/emulators/wine/mf/mf.mk rename to package/batocera/emulators/wine/mf/mf.mk diff --git a/package/emulators/wine/rtkit/Config.in b/package/batocera/emulators/wine/rtkit/Config.in similarity index 100% rename from package/emulators/wine/rtkit/Config.in rename to package/batocera/emulators/wine/rtkit/Config.in diff --git a/package/emulators/wine/rtkit/rtkit.mk b/package/batocera/emulators/wine/rtkit/rtkit.mk similarity index 100% rename from package/emulators/wine/rtkit/rtkit.mk rename to package/batocera/emulators/wine/rtkit/rtkit.mk diff --git a/package/emulators/wine/vkd3d-proton/Config.in b/package/batocera/emulators/wine/vkd3d-proton/Config.in similarity index 100% rename from package/emulators/wine/vkd3d-proton/Config.in rename to package/batocera/emulators/wine/vkd3d-proton/Config.in diff --git a/package/emulators/wine/vkd3d-proton/vkd3d-proton.hash b/package/batocera/emulators/wine/vkd3d-proton/vkd3d-proton.hash similarity index 100% rename from package/emulators/wine/vkd3d-proton/vkd3d-proton.hash rename to package/batocera/emulators/wine/vkd3d-proton/vkd3d-proton.hash diff --git a/package/emulators/wine/vkd3d-proton/vkd3d-proton.mk b/package/batocera/emulators/wine/vkd3d-proton/vkd3d-proton.mk similarity index 100% rename from package/emulators/wine/vkd3d-proton/vkd3d-proton.mk rename to package/batocera/emulators/wine/vkd3d-proton/vkd3d-proton.mk diff --git a/package/emulators/wine/vkd3d/Config.in b/package/batocera/emulators/wine/vkd3d/Config.in similarity index 100% rename from package/emulators/wine/vkd3d/Config.in rename to package/batocera/emulators/wine/vkd3d/Config.in diff --git a/package/emulators/wine/vkd3d/vkd3d.mk b/package/batocera/emulators/wine/vkd3d/vkd3d.mk similarity index 100% rename from package/emulators/wine/vkd3d/vkd3d.mk rename to package/batocera/emulators/wine/vkd3d/vkd3d.mk diff --git a/package/emulators/wine/wine-ge-custom-wow64_32/000-disable-install-mono-and-gecko.patch b/package/batocera/emulators/wine/wine-ge-custom-wow64_32/000-disable-install-mono-and-gecko.patch similarity index 100% rename from package/emulators/wine/wine-ge-custom-wow64_32/000-disable-install-mono-and-gecko.patch rename to package/batocera/emulators/wine/wine-ge-custom-wow64_32/000-disable-install-mono-and-gecko.patch diff --git a/package/emulators/wine/wine-ge-custom-wow64_32/001-liblm.patch b/package/batocera/emulators/wine/wine-ge-custom-wow64_32/001-liblm.patch similarity index 100% rename from package/emulators/wine/wine-ge-custom-wow64_32/001-liblm.patch rename to package/batocera/emulators/wine/wine-ge-custom-wow64_32/001-liblm.patch diff --git a/package/emulators/wine/wine-ge-custom-wow64_32/Config.in b/package/batocera/emulators/wine/wine-ge-custom-wow64_32/Config.in similarity index 100% rename from package/emulators/wine/wine-ge-custom-wow64_32/Config.in rename to package/batocera/emulators/wine/wine-ge-custom-wow64_32/Config.in diff --git a/package/emulators/wine/wine-ge-custom-wow64_32/wine-ge-custom-wow64_32.mk b/package/batocera/emulators/wine/wine-ge-custom-wow64_32/wine-ge-custom-wow64_32.mk similarity index 100% rename from package/emulators/wine/wine-ge-custom-wow64_32/wine-ge-custom-wow64_32.mk rename to package/batocera/emulators/wine/wine-ge-custom-wow64_32/wine-ge-custom-wow64_32.mk diff --git a/package/emulators/wine/wine-ge-custom/000-disable-install-mono-and-gecko.patch b/package/batocera/emulators/wine/wine-ge-custom/000-disable-install-mono-and-gecko.patch similarity index 100% rename from package/emulators/wine/wine-ge-custom/000-disable-install-mono-and-gecko.patch rename to package/batocera/emulators/wine/wine-ge-custom/000-disable-install-mono-and-gecko.patch diff --git a/package/emulators/wine/wine-ge-custom/001-liblm.patch b/package/batocera/emulators/wine/wine-ge-custom/001-liblm.patch similarity index 100% rename from package/emulators/wine/wine-ge-custom/001-liblm.patch rename to package/batocera/emulators/wine/wine-ge-custom/001-liblm.patch diff --git a/package/emulators/wine/wine-ge-custom/Config.in b/package/batocera/emulators/wine/wine-ge-custom/Config.in similarity index 100% rename from package/emulators/wine/wine-ge-custom/Config.in rename to package/batocera/emulators/wine/wine-ge-custom/Config.in diff --git a/package/emulators/wine/wine-ge-custom/wine-ge-custom.mk b/package/batocera/emulators/wine/wine-ge-custom/wine-ge-custom.mk similarity index 100% rename from package/emulators/wine/wine-ge-custom/wine-ge-custom.mk rename to package/batocera/emulators/wine/wine-ge-custom/wine-ge-custom.mk diff --git a/package/emulators/wine/wine-mono-ge-custom/Config.in b/package/batocera/emulators/wine/wine-mono-ge-custom/Config.in similarity index 100% rename from package/emulators/wine/wine-mono-ge-custom/Config.in rename to package/batocera/emulators/wine/wine-mono-ge-custom/Config.in diff --git a/package/emulators/wine/wine-mono-ge-custom/wine-mono-ge-custom.mk b/package/batocera/emulators/wine/wine-mono-ge-custom/wine-mono-ge-custom.mk similarity index 100% rename from package/emulators/wine/wine-mono-ge-custom/wine-mono-ge-custom.mk rename to package/batocera/emulators/wine/wine-mono-ge-custom/wine-mono-ge-custom.mk diff --git a/package/emulators/wine/wine-mono-proton/Config.in b/package/batocera/emulators/wine/wine-mono-proton/Config.in similarity index 100% rename from package/emulators/wine/wine-mono-proton/Config.in rename to package/batocera/emulators/wine/wine-mono-proton/Config.in diff --git a/package/emulators/wine/wine-mono-proton/wine-mono-proton.mk b/package/batocera/emulators/wine/wine-mono-proton/wine-mono-proton.mk similarity index 100% rename from package/emulators/wine/wine-mono-proton/wine-mono-proton.mk rename to package/batocera/emulators/wine/wine-mono-proton/wine-mono-proton.mk diff --git a/package/emulators/wine/wine-proton-wow64_32/000-disable-install-mono-and-gecko.patch b/package/batocera/emulators/wine/wine-proton-wow64_32/000-disable-install-mono-and-gecko.patch similarity index 100% rename from package/emulators/wine/wine-proton-wow64_32/000-disable-install-mono-and-gecko.patch rename to package/batocera/emulators/wine/wine-proton-wow64_32/000-disable-install-mono-and-gecko.patch diff --git a/package/emulators/wine/wine-proton-wow64_32/003-disable-hidraw.patch b/package/batocera/emulators/wine/wine-proton-wow64_32/003-disable-hidraw.patch similarity index 100% rename from package/emulators/wine/wine-proton-wow64_32/003-disable-hidraw.patch rename to package/batocera/emulators/wine/wine-proton-wow64_32/003-disable-hidraw.patch diff --git a/package/emulators/wine/wine-proton-wow64_32/Config.in b/package/batocera/emulators/wine/wine-proton-wow64_32/Config.in similarity index 100% rename from package/emulators/wine/wine-proton-wow64_32/Config.in rename to package/batocera/emulators/wine/wine-proton-wow64_32/Config.in diff --git a/package/emulators/wine/wine-proton-wow64_32/wine-proton-wow64_32.mk b/package/batocera/emulators/wine/wine-proton-wow64_32/wine-proton-wow64_32.mk similarity index 100% rename from package/emulators/wine/wine-proton-wow64_32/wine-proton-wow64_32.mk rename to package/batocera/emulators/wine/wine-proton-wow64_32/wine-proton-wow64_32.mk diff --git a/package/emulators/wine/wine-proton/000-disable-install-mono-and-gecko.patch b/package/batocera/emulators/wine/wine-proton/000-disable-install-mono-and-gecko.patch similarity index 100% rename from package/emulators/wine/wine-proton/000-disable-install-mono-and-gecko.patch rename to package/batocera/emulators/wine/wine-proton/000-disable-install-mono-and-gecko.patch diff --git a/package/emulators/wine/wine-proton/001-liblm.patch b/package/batocera/emulators/wine/wine-proton/001-liblm.patch similarity index 100% rename from package/emulators/wine/wine-proton/001-liblm.patch rename to package/batocera/emulators/wine/wine-proton/001-liblm.patch diff --git a/package/emulators/wine/wine-proton/002-fix-controllers.patch b/package/batocera/emulators/wine/wine-proton/002-fix-controllers.patch similarity index 100% rename from package/emulators/wine/wine-proton/002-fix-controllers.patch rename to package/batocera/emulators/wine/wine-proton/002-fix-controllers.patch diff --git a/package/emulators/wine/wine-proton/Config.in b/package/batocera/emulators/wine/wine-proton/Config.in similarity index 100% rename from package/emulators/wine/wine-proton/Config.in rename to package/batocera/emulators/wine/wine-proton/Config.in diff --git a/package/emulators/wine/wine-proton/wine-proton.mk b/package/batocera/emulators/wine/wine-proton/wine-proton.mk similarity index 100% rename from package/emulators/wine/wine-proton/wine-proton.mk rename to package/batocera/emulators/wine/wine-proton/wine-proton.mk diff --git a/package/emulators/xemu/001-fix-optionrom-makefile.patch b/package/batocera/emulators/xemu/001-fix-optionrom-makefile.patch similarity index 100% rename from package/emulators/xemu/001-fix-optionrom-makefile.patch rename to package/batocera/emulators/xemu/001-fix-optionrom-makefile.patch diff --git a/package/emulators/xemu/002-eeprom.patch b/package/batocera/emulators/xemu/002-eeprom.patch similarity index 100% rename from package/emulators/xemu/002-eeprom.patch rename to package/batocera/emulators/xemu/002-eeprom.patch diff --git a/package/emulators/xemu/003-eeprom-path.patch b/package/batocera/emulators/xemu/003-eeprom-path.patch similarity index 100% rename from package/emulators/xemu/003-eeprom-path.patch rename to package/batocera/emulators/xemu/003-eeprom-path.patch diff --git a/package/emulators/xemu/004-hide-menu.patch b/package/batocera/emulators/xemu/004-hide-menu.patch similarity index 100% rename from package/emulators/xemu/004-hide-menu.patch rename to package/batocera/emulators/xemu/004-hide-menu.patch diff --git a/package/emulators/xemu/Config.in b/package/batocera/emulators/xemu/Config.in similarity index 100% rename from package/emulators/xemu/Config.in rename to package/batocera/emulators/xemu/Config.in diff --git a/package/emulators/xemu/chihiro.xemu.keys b/package/batocera/emulators/xemu/chihiro.xemu.keys similarity index 100% rename from package/emulators/xemu/chihiro.xemu.keys rename to package/batocera/emulators/xemu/chihiro.xemu.keys diff --git a/package/emulators/xemu/xbox.xemu.keys b/package/batocera/emulators/xemu/xbox.xemu.keys similarity index 100% rename from package/emulators/xemu/xbox.xemu.keys rename to package/batocera/emulators/xemu/xbox.xemu.keys diff --git a/package/emulators/xemu/xemu.hash b/package/batocera/emulators/xemu/xemu.hash similarity index 100% rename from package/emulators/xemu/xemu.hash rename to package/batocera/emulators/xemu/xemu.hash diff --git a/package/emulators/xemu/xemu.mk b/package/batocera/emulators/xemu/xemu.mk similarity index 98% rename from package/emulators/xemu/xemu.mk rename to package/batocera/emulators/xemu/xemu.mk index d27e1c2bf00..005eaa80854 100644 --- a/package/emulators/xemu/xemu.mk +++ b/package/batocera/emulators/xemu/xemu.mk @@ -102,7 +102,7 @@ endef define XEMU_EVMAPY mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/xemu/*.keys \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/xemu/*.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/emulators/xenia-canary/Config.in b/package/batocera/emulators/xenia-canary/Config.in similarity index 100% rename from package/emulators/xenia-canary/Config.in rename to package/batocera/emulators/xenia-canary/Config.in diff --git a/package/emulators/xenia-canary/xbox360.xenia-canary.keys b/package/batocera/emulators/xenia-canary/xbox360.xenia-canary.keys similarity index 100% rename from package/emulators/xenia-canary/xbox360.xenia-canary.keys rename to package/batocera/emulators/xenia-canary/xbox360.xenia-canary.keys diff --git a/package/emulators/xenia-canary/xenia-canary.mk b/package/batocera/emulators/xenia-canary/xenia-canary.mk similarity index 94% rename from package/emulators/xenia-canary/xenia-canary.mk rename to package/batocera/emulators/xenia-canary/xenia-canary.mk index ef14c9419c5..79db747d386 100644 --- a/package/emulators/xenia-canary/xenia-canary.mk +++ b/package/batocera/emulators/xenia-canary/xenia-canary.mk @@ -39,12 +39,12 @@ define XENIA_CANARY_POST_PROCESS $(GIT) pull --depth=1 origin main && \ mv -f patches/*.toml $(TARGET_DIR)/usr/xenia-canary/patches \ ) - + # Clean up the temporary directory rm -rf $(@D)/temp mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/xenia-canary/xbox360.xenia-canary.keys \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/xenia-canary/xbox360.xenia-canary.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/emulators/xenia/Config.in b/package/batocera/emulators/xenia/Config.in similarity index 100% rename from package/emulators/xenia/Config.in rename to package/batocera/emulators/xenia/Config.in diff --git a/package/emulators/xenia/xbox360.xenia.keys b/package/batocera/emulators/xenia/xbox360.xenia.keys similarity index 100% rename from package/emulators/xenia/xbox360.xenia.keys rename to package/batocera/emulators/xenia/xbox360.xenia.keys diff --git a/package/emulators/xenia/xenia.mk b/package/batocera/emulators/xenia/xenia.mk similarity index 92% rename from package/emulators/xenia/xenia.mk rename to package/batocera/emulators/xenia/xenia.mk index 84011a1f8bc..a9ac1a19db7 100644 --- a/package/emulators/xenia/xenia.mk +++ b/package/batocera/emulators/xenia/xenia.mk @@ -32,7 +32,7 @@ endef define XENIA_POST_PROCESS mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/xenia/xbox360.xenia.keys \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/xenia/xbox360.xenia.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/firmwares/alllinuxfirmwares/Config.in b/package/batocera/firmwares/alllinuxfirmwares/Config.in similarity index 100% rename from package/firmwares/alllinuxfirmwares/Config.in rename to package/batocera/firmwares/alllinuxfirmwares/Config.in diff --git a/package/firmwares/alllinuxfirmwares/QCA206X/hw2.1/amss.bin b/package/batocera/firmwares/alllinuxfirmwares/QCA206X/hw2.1/amss.bin similarity index 100% rename from package/firmwares/alllinuxfirmwares/QCA206X/hw2.1/amss.bin rename to package/batocera/firmwares/alllinuxfirmwares/QCA206X/hw2.1/amss.bin diff --git a/package/firmwares/alllinuxfirmwares/QCA206X/hw2.1/board-2.bin b/package/batocera/firmwares/alllinuxfirmwares/QCA206X/hw2.1/board-2.bin similarity index 100% rename from package/firmwares/alllinuxfirmwares/QCA206X/hw2.1/board-2.bin rename to package/batocera/firmwares/alllinuxfirmwares/QCA206X/hw2.1/board-2.bin diff --git a/package/firmwares/alllinuxfirmwares/QCA206X/hw2.1/board.bin b/package/batocera/firmwares/alllinuxfirmwares/QCA206X/hw2.1/board.bin similarity index 100% rename from package/firmwares/alllinuxfirmwares/QCA206X/hw2.1/board.bin rename to package/batocera/firmwares/alllinuxfirmwares/QCA206X/hw2.1/board.bin diff --git a/package/firmwares/alllinuxfirmwares/QCA206X/hw2.1/boardg.bin b/package/batocera/firmwares/alllinuxfirmwares/QCA206X/hw2.1/boardg.bin similarity index 100% rename from package/firmwares/alllinuxfirmwares/QCA206X/hw2.1/boardg.bin rename to package/batocera/firmwares/alllinuxfirmwares/QCA206X/hw2.1/boardg.bin diff --git a/package/firmwares/alllinuxfirmwares/QCA206X/hw2.1/m3.bin b/package/batocera/firmwares/alllinuxfirmwares/QCA206X/hw2.1/m3.bin similarity index 100% rename from package/firmwares/alllinuxfirmwares/QCA206X/hw2.1/m3.bin rename to package/batocera/firmwares/alllinuxfirmwares/QCA206X/hw2.1/m3.bin diff --git a/package/firmwares/alllinuxfirmwares/QCA206X/hw2.1/regdb.bin b/package/batocera/firmwares/alllinuxfirmwares/QCA206X/hw2.1/regdb.bin similarity index 100% rename from package/firmwares/alllinuxfirmwares/QCA206X/hw2.1/regdb.bin rename to package/batocera/firmwares/alllinuxfirmwares/QCA206X/hw2.1/regdb.bin diff --git a/package/firmwares/alllinuxfirmwares/alllinuxfirmwares.mk b/package/batocera/firmwares/alllinuxfirmwares/alllinuxfirmwares.mk similarity index 93% rename from package/firmwares/alllinuxfirmwares/alllinuxfirmwares.mk rename to package/batocera/firmwares/alllinuxfirmwares/alllinuxfirmwares.mk index 0e10d065d4e..5197fb124d1 100644 --- a/package/firmwares/alllinuxfirmwares/alllinuxfirmwares.mk +++ b/package/batocera/firmwares/alllinuxfirmwares/alllinuxfirmwares.mk @@ -64,12 +64,12 @@ define ALLLINUXFIRMWARES_LINK_QCA_WIFI_BT # wifi mkdir -p $(TARGET_DIR)/lib/firmware/ath11k/WCN6855/hw2.1 mkdir -p $(TARGET_DIR)/lib/firmware/ath11k/QCA2066 - cp -rf $(BR2_EXTERNAL_BATOCERA_PATH)/package/firmwares/alllinuxfirmwares/hw2.1/* \ + cp -rf $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/firmwares/alllinuxfirmwares/hw2.1/* \ $(TARGET_DIR)/lib/firmware/ath11k/WCN6855/hw2.1 - cp -rf $(BR2_EXTERNAL_BATOCERA_PATH)/package/firmwares/alllinuxfirmwares/QCA206X/* \ + cp -rf $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/firmwares/alllinuxfirmwares/QCA206X/* \ $(TARGET_DIR)/lib/firmware/ath11k/QCA2066 # bluetooth - cp -rf $(BR2_EXTERNAL_BATOCERA_PATH)/package/firmwares/alllinuxfirmwares/qca/* \ + cp -rf $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/firmwares/alllinuxfirmwares/qca/* \ $(TARGET_DIR)/lib/firmware/qca endef diff --git a/package/firmwares/alllinuxfirmwares/hw2.1/amss.bin b/package/batocera/firmwares/alllinuxfirmwares/hw2.1/amss.bin similarity index 100% rename from package/firmwares/alllinuxfirmwares/hw2.1/amss.bin rename to package/batocera/firmwares/alllinuxfirmwares/hw2.1/amss.bin diff --git a/package/firmwares/alllinuxfirmwares/hw2.1/board-2.bin b/package/batocera/firmwares/alllinuxfirmwares/hw2.1/board-2.bin similarity index 100% rename from package/firmwares/alllinuxfirmwares/hw2.1/board-2.bin rename to package/batocera/firmwares/alllinuxfirmwares/hw2.1/board-2.bin diff --git a/package/firmwares/alllinuxfirmwares/hw2.1/m3.bin b/package/batocera/firmwares/alllinuxfirmwares/hw2.1/m3.bin similarity index 100% rename from package/firmwares/alllinuxfirmwares/hw2.1/m3.bin rename to package/batocera/firmwares/alllinuxfirmwares/hw2.1/m3.bin diff --git a/package/firmwares/alllinuxfirmwares/hw2.1/regdb.bin b/package/batocera/firmwares/alllinuxfirmwares/hw2.1/regdb.bin similarity index 100% rename from package/firmwares/alllinuxfirmwares/hw2.1/regdb.bin rename to package/batocera/firmwares/alllinuxfirmwares/hw2.1/regdb.bin diff --git a/package/firmwares/alllinuxfirmwares/qca/hpbtfw21.tlv b/package/batocera/firmwares/alllinuxfirmwares/qca/hpbtfw21.tlv similarity index 100% rename from package/firmwares/alllinuxfirmwares/qca/hpbtfw21.tlv rename to package/batocera/firmwares/alllinuxfirmwares/qca/hpbtfw21.tlv diff --git a/package/firmwares/alllinuxfirmwares/qca/hpnv21.309 b/package/batocera/firmwares/alllinuxfirmwares/qca/hpnv21.309 similarity index 100% rename from package/firmwares/alllinuxfirmwares/qca/hpnv21.309 rename to package/batocera/firmwares/alllinuxfirmwares/qca/hpnv21.309 diff --git a/package/firmwares/alllinuxfirmwares/qca/hpnv21g.309 b/package/batocera/firmwares/alllinuxfirmwares/qca/hpnv21g.309 similarity index 100% rename from package/firmwares/alllinuxfirmwares/qca/hpnv21g.309 rename to package/batocera/firmwares/alllinuxfirmwares/qca/hpnv21g.309 diff --git a/package/firmwares/extralinuxfirmwares/Config.in b/package/batocera/firmwares/extralinuxfirmwares/Config.in similarity index 100% rename from package/firmwares/extralinuxfirmwares/Config.in rename to package/batocera/firmwares/extralinuxfirmwares/Config.in diff --git a/package/firmwares/extralinuxfirmwares/extralinuxfirmwares.mk b/package/batocera/firmwares/extralinuxfirmwares/extralinuxfirmwares.mk similarity index 100% rename from package/firmwares/extralinuxfirmwares/extralinuxfirmwares.mk rename to package/batocera/firmwares/extralinuxfirmwares/extralinuxfirmwares.mk diff --git a/package/firmwares/firmware-armbian/Config.in b/package/batocera/firmwares/firmware-armbian/Config.in similarity index 100% rename from package/firmwares/firmware-armbian/Config.in rename to package/batocera/firmwares/firmware-armbian/Config.in diff --git a/package/firmwares/firmware-armbian/firmware-armbian.mk b/package/batocera/firmwares/firmware-armbian/firmware-armbian.mk similarity index 100% rename from package/firmwares/firmware-armbian/firmware-armbian.mk rename to package/batocera/firmwares/firmware-armbian/firmware-armbian.mk diff --git a/package/firmwares/firmware-khadas-vim4/Config.in b/package/batocera/firmwares/firmware-khadas-vim4/Config.in similarity index 100% rename from package/firmwares/firmware-khadas-vim4/Config.in rename to package/batocera/firmwares/firmware-khadas-vim4/Config.in diff --git a/package/firmwares/firmware-khadas-vim4/firmware-khadas-vim4.mk b/package/batocera/firmwares/firmware-khadas-vim4/firmware-khadas-vim4.mk similarity index 79% rename from package/firmwares/firmware-khadas-vim4/firmware-khadas-vim4.mk rename to package/batocera/firmwares/firmware-khadas-vim4/firmware-khadas-vim4.mk index e2c73d45f82..22e90dd61fc 100644 --- a/package/firmwares/firmware-khadas-vim4/firmware-khadas-vim4.mk +++ b/package/batocera/firmwares/firmware-khadas-vim4/firmware-khadas-vim4.mk @@ -14,7 +14,7 @@ endef define FIRMWARE_KHADAS_VIM4_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/lib/firmware/ - cp -R $(BR2_EXTERNAL_BATOCERA_PATH)/package/firmwares/firmware-khadas-vim4/firmware/* $(FIRMWARE_KHADAS_VIM4_FIRMWARE_DIR)/ + cp -R $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/firmwares/firmware-khadas-vim4/firmware/* $(FIRMWARE_KHADAS_VIM4_FIRMWARE_DIR)/ endef $(eval $(generic-package)) diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/BCM43430A1.hcd b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/BCM43430A1.hcd similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/BCM43430A1.hcd rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/BCM43430A1.hcd diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/BCM43438A0.hcd b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/BCM43438A0.hcd similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/BCM43438A0.hcd rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/BCM43438A0.hcd diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/BCM43438A1.hcd b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/BCM43438A1.hcd similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/BCM43438A1.hcd rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/BCM43438A1.hcd diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4345C0.hcd b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4345C0.hcd similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4345C0.hcd rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4345C0.hcd diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4345C5.hcd b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4345C5.hcd similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4345C5.hcd rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4345C5.hcd diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4354A2.hcd b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4354A2.hcd similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4354A2.hcd rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4354A2.hcd diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4356A2.hcd b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4356A2.hcd similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4356A2.hcd rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4356A2.hcd diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4359C0.hcd b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4359C0.hcd similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4359C0.hcd rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4359C0.hcd diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4359C0_ap6398s.hcd b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4359C0_ap6398s.hcd similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4359C0_ap6398s.hcd rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4359C0_ap6398s.hcd diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4362A2.hcd b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4362A2.hcd similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4362A2.hcd rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/BCM4362A2.hcd diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac43430-sdio.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac43430-sdio.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac43430-sdio.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac43430-sdio.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac43430-sdio.txt b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac43430-sdio.txt similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac43430-sdio.txt rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac43430-sdio.txt diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac43455-sdio.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac43455-sdio.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac43455-sdio.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac43455-sdio.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac43455-sdio.txt b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac43455-sdio.txt similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac43455-sdio.txt rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac43455-sdio.txt diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac4356-sdio.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac4356-sdio.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac4356-sdio.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac4356-sdio.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac4356-sdio.txt b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac4356-sdio.txt similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac4356-sdio.txt rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac4356-sdio.txt diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac4359-sdio.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac4359-sdio.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac4359-sdio.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac4359-sdio.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac4359-sdio.txt b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac4359-sdio.txt similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac4359-sdio.txt rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac4359-sdio.txt diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac4359-sdio_ap6398s.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac4359-sdio_ap6398s.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac4359-sdio_ap6398s.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac4359-sdio_ap6398s.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac4359-sdio_ap6398s.txt b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac4359-sdio_ap6398s.txt similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac4359-sdio_ap6398s.txt rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/brcmfmac4359-sdio_ap6398s.txt diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/clm_bcm43752a2_ag.blob b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/clm_bcm43752a2_ag.blob similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/clm_bcm43752a2_ag.blob rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/clm_bcm43752a2_ag.blob diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/clm_bcm43752a2_pcie_ag.blob b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/clm_bcm43752a2_pcie_ag.blob similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/clm_bcm43752a2_pcie_ag.blob rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/clm_bcm43752a2_pcie_ag.blob diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/config.txt b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/config.txt similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/config.txt rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/config.txt diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/config_bcm43438a1.txt b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/config_bcm43438a1.txt similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/config_bcm43438a1.txt rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/config_bcm43438a1.txt diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/config_bcm43456c5_ag.txt b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/config_bcm43456c5_ag.txt similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/config_bcm43456c5_ag.txt rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/config_bcm43456c5_ag.txt diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/config_bcm4359c0_ag.txt b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/config_bcm4359c0_ag.txt similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/config_bcm4359c0_ag.txt rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/config_bcm4359c0_ag.txt diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/config_bcm43752a2_ag.txt b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/config_bcm43752a2_ag.txt similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/config_bcm43752a2_ag.txt rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/config_bcm43752a2_ag.txt diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/config_bcm43752a2_pcie_ag.txt b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/config_bcm43752a2_pcie_ag.txt similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/config_bcm43752a2_pcie_ag.txt rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/config_bcm43752a2_pcie_ag.txt diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43438a0.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43438a0.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43438a0.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43438a0.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43438a0_apsta.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43438a0_apsta.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43438a0_apsta.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43438a0_apsta.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43438a0_p2p.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43438a0_p2p.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43438a0_p2p.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43438a0_p2p.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43438a1.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43438a1.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43438a1.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43438a1.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43438a1_apsta.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43438a1_apsta.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43438a1_apsta.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43438a1_apsta.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43438a1_p2p.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43438a1_p2p.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43438a1_p2p.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43438a1_p2p.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43455c0_ag.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43455c0_ag.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43455c0_ag.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43455c0_ag.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43455c0_ag_apsta.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43455c0_ag_apsta.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43455c0_ag_apsta.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43455c0_ag_apsta.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43455c0_ag_p2p.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43455c0_ag_p2p.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43455c0_ag_p2p.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43455c0_ag_p2p.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43456c5_ag.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43456c5_ag.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43456c5_ag.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43456c5_ag.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43456c5_ag_apsta.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43456c5_ag_apsta.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43456c5_ag_apsta.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43456c5_ag_apsta.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4356a2_ag.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4356a2_ag.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4356a2_ag.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4356a2_ag.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4356a2_ag_apsta.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4356a2_ag_apsta.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4356a2_ag_apsta.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4356a2_ag_apsta.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4356a2_ag_p2p.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4356a2_ag_p2p.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4356a2_ag_p2p.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4356a2_ag_p2p.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4359c0_ag.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4359c0_ag.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4359c0_ag.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4359c0_ag.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4359c0_ag_ap6398s.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4359c0_ag_ap6398s.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4359c0_ag_ap6398s.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4359c0_ag_ap6398s.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4359c0_ag_apsta.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4359c0_ag_apsta.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4359c0_ag_apsta.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4359c0_ag_apsta.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4359c0_ag_apsta_ap6398s.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4359c0_ag_apsta_ap6398s.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4359c0_ag_apsta_ap6398s.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4359c0_ag_apsta_ap6398s.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4359c0_ag_p2p_ap6398s.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4359c0_ag_p2p_ap6398s.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4359c0_ag_p2p_ap6398s.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm4359c0_ag_p2p_ap6398s.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43752a2_ag.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43752a2_ag.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43752a2_ag.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43752a2_ag.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43752a2_ag_apsta.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43752a2_ag_apsta.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43752a2_ag_apsta.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43752a2_ag_apsta.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43752a2_ag_p2p.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43752a2_ag_p2p.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43752a2_ag_p2p.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43752a2_ag_p2p.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43752a2_pcie_ag.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43752a2_pcie_ag.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43752a2_pcie_ag.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43752a2_pcie_ag.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43752a2_pcie_ag_apsta.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43752a2_pcie_ag_apsta.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43752a2_pcie_ag_apsta.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43752a2_pcie_ag_apsta.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43752a2_pcie_ag_mfg.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43752a2_pcie_ag_mfg.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43752a2_pcie_ag_mfg.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/fw_bcm43752a2_pcie_ag_mfg.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_AP6275P.txt b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_AP6275P.txt similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_AP6275P.txt rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_AP6275P.txt diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6212.txt b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6212.txt similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6212.txt rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6212.txt diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6212a.txt b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6212a.txt similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6212a.txt rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6212a.txt diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6255.txt b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6255.txt similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6255.txt rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6255.txt diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6256.txt b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6256.txt similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6256.txt rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6256.txt diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6275s.txt b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6275s.txt similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6275s.txt rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6275s.txt diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6356.txt b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6356.txt similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6356.txt rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6356.txt diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6359sa.txt b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6359sa.txt similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6359sa.txt rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6359sa.txt diff --git a/package/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6398s.txt b/package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6398s.txt similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6398s.txt rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/brcm/nvram_ap6398s.txt diff --git a/package/firmwares/firmware-khadas-vim4/firmware/regulatory.db b/package/batocera/firmwares/firmware-khadas-vim4/firmware/regulatory.db similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/regulatory.db rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/regulatory.db diff --git a/package/firmwares/firmware-khadas-vim4/firmware/regulatory.db.p7s b/package/batocera/firmwares/firmware-khadas-vim4/firmware/regulatory.db.p7s similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/regulatory.db.p7s rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/regulatory.db.p7s diff --git a/package/firmwares/firmware-khadas-vim4/firmware/video/h264_enc.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/video/h264_enc.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/video/h264_enc.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/video/h264_enc.bin diff --git a/package/firmwares/firmware-khadas-vim4/firmware/video/video_ucode.bin b/package/batocera/firmwares/firmware-khadas-vim4/firmware/video/video_ucode.bin similarity index 100% rename from package/firmwares/firmware-khadas-vim4/firmware/video/video_ucode.bin rename to package/batocera/firmwares/firmware-khadas-vim4/firmware/video/video_ucode.bin diff --git a/package/firmwares/firmware-orangepi/Config.in b/package/batocera/firmwares/firmware-orangepi/Config.in similarity index 100% rename from package/firmwares/firmware-orangepi/Config.in rename to package/batocera/firmwares/firmware-orangepi/Config.in diff --git a/package/firmwares/firmware-orangepi/firmware-orangepi.mk b/package/batocera/firmwares/firmware-orangepi/firmware-orangepi.mk similarity index 100% rename from package/firmwares/firmware-orangepi/firmware-orangepi.mk rename to package/batocera/firmwares/firmware-orangepi/firmware-orangepi.mk diff --git a/package/firmwares/firmware-rk3588/Config.in b/package/batocera/firmwares/firmware-rk3588/Config.in similarity index 100% rename from package/firmwares/firmware-rk3588/Config.in rename to package/batocera/firmwares/firmware-rk3588/Config.in diff --git a/package/firmwares/firmware-rk3588/firmware-rk3588.mk b/package/batocera/firmwares/firmware-rk3588/firmware-rk3588.mk similarity index 100% rename from package/firmwares/firmware-rk3588/firmware-rk3588.mk rename to package/batocera/firmwares/firmware-rk3588/firmware-rk3588.mk diff --git a/package/firmwares/sound-open-firmware/Config.in b/package/batocera/firmwares/sound-open-firmware/Config.in similarity index 100% rename from package/firmwares/sound-open-firmware/Config.in rename to package/batocera/firmwares/sound-open-firmware/Config.in diff --git a/package/firmwares/sound-open-firmware/sound-open-firmware.mk b/package/batocera/firmwares/sound-open-firmware/sound-open-firmware.mk similarity index 100% rename from package/firmwares/sound-open-firmware/sound-open-firmware.mk rename to package/batocera/firmwares/sound-open-firmware/sound-open-firmware.mk diff --git a/package/fonts/nanum-font/Config.in b/package/batocera/fonts/nanum-font/Config.in similarity index 100% rename from package/fonts/nanum-font/Config.in rename to package/batocera/fonts/nanum-font/Config.in diff --git a/package/fonts/nanum-font/nanum_font.mk b/package/batocera/fonts/nanum-font/nanum_font.mk similarity index 100% rename from package/fonts/nanum-font/nanum_font.mk rename to package/batocera/fonts/nanum-font/nanum_font.mk diff --git a/package/fonts/noto-cjk-fonts/Config.in b/package/batocera/fonts/noto-cjk-fonts/Config.in similarity index 100% rename from package/fonts/noto-cjk-fonts/Config.in rename to package/batocera/fonts/noto-cjk-fonts/Config.in diff --git a/package/fonts/noto-cjk-fonts/noto-cjk-fonts.mk b/package/batocera/fonts/noto-cjk-fonts/noto-cjk-fonts.mk similarity index 100% rename from package/fonts/noto-cjk-fonts/noto-cjk-fonts.mk rename to package/batocera/fonts/noto-cjk-fonts/noto-cjk-fonts.mk diff --git a/package/gpu/batocera-amd/Config.in b/package/batocera/gpu/batocera-amd/Config.in similarity index 100% rename from package/gpu/batocera-amd/Config.in rename to package/batocera/gpu/batocera-amd/Config.in diff --git a/package/gpu/batocera-amd/S001amd-check b/package/batocera/gpu/batocera-amd/S001amd-check similarity index 100% rename from package/gpu/batocera-amd/S001amd-check rename to package/batocera/gpu/batocera-amd/S001amd-check diff --git a/package/batocera/gpu/batocera-amd/S05amd-check b/package/batocera/gpu/batocera-amd/S05amd-check new file mode 100644 index 00000000000..9105a6be5bf --- /dev/null +++ b/package/batocera/gpu/batocera-amd/S05amd-check @@ -0,0 +1,43 @@ +#!/bin/bash + +# S05amd-check forces the amdgpu over the legacy radeon driver(s) +# for supported AMD island cards only +# function can be turned off using system-boot.conf + +if test "$1" != "start"; then + exit 0 +fi + +# try to create the log dir +mkdir -p "/userdata/system/logs" +log="/userdata/system/logs/amd.log" + +if grep -qE "^[ ]*amdgpu[ ]*=[ ]*true[ ]*$" /boot/system-boot.conf +then + echo "Detecting AMD or Radeon GPU." > "$log" + gpu_name=$(lspci -nn | grep -iE "AMD/ATI" | grep -iE "VGA|3D|Display controller") + if [[ -n $gpu_name ]]; then + echo "Detected - $gpu_name." >> "$log" + vid_pid=$(echo "$gpu_name" | awk -F'[][]' '{print $(NF-1)}') + # Check the vid:pid is in the list file + if grep -q "$vid_pid" /usr/share/amd/islands.list; then + # Logging + echo "Supported AMD Islands card found - $vid_pid." >> "$log" + # Write module changes + mkdir -p /var/run/amd/modprobe || exit 1 + echo "options amdgpu si_support=1" > /var/run/amd/modprobe/amdgpu.conf + echo "options amdgpu cik_support=1" >> /var/run/amd/modprobe/amdgpu.conf + echo "options radeon si_support=0" > /var/run/amd/modprobe/radeon.conf + echo "options radeon cik_support=0" >> /var/run/amd/modprobe/radeon.conf + # load amdgpu module + modprobe amdgpu + else + # Logging + echo "No matching PCI ID of $vid_pid found in islands.list." >> "$log" + echo "Using Mesa driver defaults..." >> "$log" + fi + else + # Logging + echo "No AMD or Radeon GPU found." >> "$log" + fi +fi diff --git a/package/gpu/batocera-amd/batocera-amd.mk b/package/batocera/gpu/batocera-amd/batocera-amd.mk similarity index 87% rename from package/gpu/batocera-amd/batocera-amd.mk rename to package/batocera/gpu/batocera-amd/batocera-amd.mk index b22cc290a27..926de2346b8 100755 --- a/package/gpu/batocera-amd/batocera-amd.mk +++ b/package/batocera/gpu/batocera-amd/batocera-amd.mk @@ -12,7 +12,7 @@ define BATOCERA_AMD_INSTALL_TARGET_CMDS $(TARGET_DIR)/etc/init.d/ # List mkdir -p $(TARGET_DIR)/usr/share/amd - install -m 0644 $(BR2_EXTERNAL_BATOCERA_PATH)/package/gpu/batocera-amd/islands.list \ + install -m 0644 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/gpu/batocera-amd/islands.list \ $(TARGET_DIR)/usr/share/amd # Modules ln -sf /var/run/amd/modprobe/amdgpu.conf $(TARGET_DIR)/etc/modprobe.d/amdgpu.conf diff --git a/package/gpu/batocera-amd/islands.list b/package/batocera/gpu/batocera-amd/islands.list similarity index 100% rename from package/gpu/batocera-amd/islands.list rename to package/batocera/gpu/batocera-amd/islands.list diff --git a/package/gpu/batocera-nvidia-driver/0001-use-LDFLAGS.patch b/package/batocera/gpu/batocera-nvidia-driver/0001-use-LDFLAGS.patch similarity index 100% rename from package/gpu/batocera-nvidia-driver/0001-use-LDFLAGS.patch rename to package/batocera/gpu/batocera-nvidia-driver/0001-use-LDFLAGS.patch diff --git a/package/gpu/batocera-nvidia-driver/Config.in b/package/batocera/gpu/batocera-nvidia-driver/Config.in similarity index 100% rename from package/gpu/batocera-nvidia-driver/Config.in rename to package/batocera/gpu/batocera-nvidia-driver/Config.in diff --git a/package/gpu/batocera-nvidia-driver/batocera-nvidia-driver.hash b/package/batocera/gpu/batocera-nvidia-driver/batocera-nvidia-driver.hash similarity index 100% rename from package/gpu/batocera-nvidia-driver/batocera-nvidia-driver.hash rename to package/batocera/gpu/batocera-nvidia-driver/batocera-nvidia-driver.hash diff --git a/package/gpu/batocera-nvidia-driver/batocera-nvidia-driver.mk b/package/batocera/gpu/batocera-nvidia-driver/batocera-nvidia-driver.mk similarity index 100% rename from package/gpu/batocera-nvidia-driver/batocera-nvidia-driver.mk rename to package/batocera/gpu/batocera-nvidia-driver/batocera-nvidia-driver.mk diff --git a/package/gpu/batocera-nvidia-driver/egl.pc b/package/batocera/gpu/batocera-nvidia-driver/egl.pc similarity index 100% rename from package/gpu/batocera-nvidia-driver/egl.pc rename to package/batocera/gpu/batocera-nvidia-driver/egl.pc diff --git a/package/gpu/batocera-nvidia-driver/gl.pc b/package/batocera/gpu/batocera-nvidia-driver/gl.pc similarity index 100% rename from package/gpu/batocera-nvidia-driver/gl.pc rename to package/batocera/gpu/batocera-nvidia-driver/gl.pc diff --git a/package/gpu/batocera-nvidia-legacy-driver/0001-use-LDFLAGS.patch b/package/batocera/gpu/batocera-nvidia-legacy-driver/0001-use-LDFLAGS.patch similarity index 100% rename from package/gpu/batocera-nvidia-legacy-driver/0001-use-LDFLAGS.patch rename to package/batocera/gpu/batocera-nvidia-legacy-driver/0001-use-LDFLAGS.patch diff --git a/package/gpu/batocera-nvidia-legacy-driver/0002-kernel-6.10.patch b/package/batocera/gpu/batocera-nvidia-legacy-driver/0002-kernel-6.10.patch similarity index 100% rename from package/gpu/batocera-nvidia-legacy-driver/0002-kernel-6.10.patch rename to package/batocera/gpu/batocera-nvidia-legacy-driver/0002-kernel-6.10.patch diff --git a/package/gpu/batocera-nvidia-legacy-driver/Config.in b/package/batocera/gpu/batocera-nvidia-legacy-driver/Config.in similarity index 100% rename from package/gpu/batocera-nvidia-legacy-driver/Config.in rename to package/batocera/gpu/batocera-nvidia-legacy-driver/Config.in diff --git a/package/gpu/batocera-nvidia-legacy-driver/batocera-nvidia-legacy-driver.hash b/package/batocera/gpu/batocera-nvidia-legacy-driver/batocera-nvidia-legacy-driver.hash similarity index 100% rename from package/gpu/batocera-nvidia-legacy-driver/batocera-nvidia-legacy-driver.hash rename to package/batocera/gpu/batocera-nvidia-legacy-driver/batocera-nvidia-legacy-driver.hash diff --git a/package/gpu/batocera-nvidia-legacy-driver/batocera-nvidia-legacy-driver.mk b/package/batocera/gpu/batocera-nvidia-legacy-driver/batocera-nvidia-legacy-driver.mk similarity index 100% rename from package/gpu/batocera-nvidia-legacy-driver/batocera-nvidia-legacy-driver.mk rename to package/batocera/gpu/batocera-nvidia-legacy-driver/batocera-nvidia-legacy-driver.mk diff --git a/package/gpu/batocera-nvidia-legacy-driver/egl.pc b/package/batocera/gpu/batocera-nvidia-legacy-driver/egl.pc similarity index 100% rename from package/gpu/batocera-nvidia-legacy-driver/egl.pc rename to package/batocera/gpu/batocera-nvidia-legacy-driver/egl.pc diff --git a/package/gpu/batocera-nvidia-legacy-driver/gl.pc b/package/batocera/gpu/batocera-nvidia-legacy-driver/gl.pc similarity index 100% rename from package/gpu/batocera-nvidia-legacy-driver/gl.pc rename to package/batocera/gpu/batocera-nvidia-legacy-driver/gl.pc diff --git a/package/gpu/batocera-nvidia-lists/Config.in b/package/batocera/gpu/batocera-nvidia-lists/Config.in similarity index 100% rename from package/gpu/batocera-nvidia-lists/Config.in rename to package/batocera/gpu/batocera-nvidia-lists/Config.in diff --git a/package/gpu/batocera-nvidia-lists/batocera-nvidia-lists.mk b/package/batocera/gpu/batocera-nvidia-lists/batocera-nvidia-lists.mk similarity index 100% rename from package/gpu/batocera-nvidia-lists/batocera-nvidia-lists.mk rename to package/batocera/gpu/batocera-nvidia-lists/batocera-nvidia-lists.mk diff --git a/package/gpu/batocera-nvidia/Config.in b/package/batocera/gpu/batocera-nvidia/Config.in similarity index 100% rename from package/gpu/batocera-nvidia/Config.in rename to package/batocera/gpu/batocera-nvidia/Config.in diff --git a/package/gpu/batocera-nvidia/batocera-nvidia b/package/batocera/gpu/batocera-nvidia/batocera-nvidia similarity index 100% rename from package/gpu/batocera-nvidia/batocera-nvidia rename to package/batocera/gpu/batocera-nvidia/batocera-nvidia diff --git a/package/gpu/batocera-nvidia/batocera-nvidia.mk b/package/batocera/gpu/batocera-nvidia/batocera-nvidia.mk similarity index 89% rename from package/gpu/batocera-nvidia/batocera-nvidia.mk rename to package/batocera/gpu/batocera-nvidia/batocera-nvidia.mk index a4fa40c4845..3446f94185f 100755 --- a/package/gpu/batocera-nvidia/batocera-nvidia.mk +++ b/package/batocera/gpu/batocera-nvidia/batocera-nvidia.mk @@ -9,9 +9,9 @@ BATOCERA_NVIDIA_SOURCE = define BATOCERA_NVIDIA_INSTALL_TARGET_CMDS install -m 0755 \ - $(BR2_EXTERNAL_BATOCERA_PATH)/package/gpu/batocera-nvidia/batocera-nvidia \ + $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/gpu/batocera-nvidia/batocera-nvidia \ $(TARGET_DIR)/usr/bin/ - + # [Xorg] mkdir -p $(TARGET_DIR)/etc/X11/xorg.conf.d diff --git a/package/gpu/batocera-nvidia340-legacy-driver/0001-kernel-5.7.patch b/package/batocera/gpu/batocera-nvidia340-legacy-driver/0001-kernel-5.7.patch similarity index 100% rename from package/gpu/batocera-nvidia340-legacy-driver/0001-kernel-5.7.patch rename to package/batocera/gpu/batocera-nvidia340-legacy-driver/0001-kernel-5.7.patch diff --git a/package/gpu/batocera-nvidia340-legacy-driver/0002-kernel-5.8.patch b/package/batocera/gpu/batocera-nvidia340-legacy-driver/0002-kernel-5.8.patch similarity index 100% rename from package/gpu/batocera-nvidia340-legacy-driver/0002-kernel-5.8.patch rename to package/batocera/gpu/batocera-nvidia340-legacy-driver/0002-kernel-5.8.patch diff --git a/package/gpu/batocera-nvidia340-legacy-driver/0003-kernel-5.9.patch b/package/batocera/gpu/batocera-nvidia340-legacy-driver/0003-kernel-5.9.patch similarity index 100% rename from package/gpu/batocera-nvidia340-legacy-driver/0003-kernel-5.9.patch rename to package/batocera/gpu/batocera-nvidia340-legacy-driver/0003-kernel-5.9.patch diff --git a/package/gpu/batocera-nvidia340-legacy-driver/0004-kernel-5.10.patch b/package/batocera/gpu/batocera-nvidia340-legacy-driver/0004-kernel-5.10.patch similarity index 100% rename from package/gpu/batocera-nvidia340-legacy-driver/0004-kernel-5.10.patch rename to package/batocera/gpu/batocera-nvidia340-legacy-driver/0004-kernel-5.10.patch diff --git a/package/gpu/batocera-nvidia340-legacy-driver/0005-kernel-5.11.patch b/package/batocera/gpu/batocera-nvidia340-legacy-driver/0005-kernel-5.11.patch similarity index 100% rename from package/gpu/batocera-nvidia340-legacy-driver/0005-kernel-5.11.patch rename to package/batocera/gpu/batocera-nvidia340-legacy-driver/0005-kernel-5.11.patch diff --git a/package/gpu/batocera-nvidia340-legacy-driver/0006-kernel-5.14.patch b/package/batocera/gpu/batocera-nvidia340-legacy-driver/0006-kernel-5.14.patch similarity index 100% rename from package/gpu/batocera-nvidia340-legacy-driver/0006-kernel-5.14.patch rename to package/batocera/gpu/batocera-nvidia340-legacy-driver/0006-kernel-5.14.patch diff --git a/package/gpu/batocera-nvidia340-legacy-driver/0007-kernel-5.15.patch b/package/batocera/gpu/batocera-nvidia340-legacy-driver/0007-kernel-5.15.patch similarity index 100% rename from package/gpu/batocera-nvidia340-legacy-driver/0007-kernel-5.15.patch rename to package/batocera/gpu/batocera-nvidia340-legacy-driver/0007-kernel-5.15.patch diff --git a/package/gpu/batocera-nvidia340-legacy-driver/0008-kernel-5.16.patch b/package/batocera/gpu/batocera-nvidia340-legacy-driver/0008-kernel-5.16.patch similarity index 100% rename from package/gpu/batocera-nvidia340-legacy-driver/0008-kernel-5.16.patch rename to package/batocera/gpu/batocera-nvidia340-legacy-driver/0008-kernel-5.16.patch diff --git a/package/gpu/batocera-nvidia340-legacy-driver/0009-kernel-5.17.patch b/package/batocera/gpu/batocera-nvidia340-legacy-driver/0009-kernel-5.17.patch similarity index 100% rename from package/gpu/batocera-nvidia340-legacy-driver/0009-kernel-5.17.patch rename to package/batocera/gpu/batocera-nvidia340-legacy-driver/0009-kernel-5.17.patch diff --git a/package/gpu/batocera-nvidia340-legacy-driver/0010-kernel-5.18.patch b/package/batocera/gpu/batocera-nvidia340-legacy-driver/0010-kernel-5.18.patch similarity index 100% rename from package/gpu/batocera-nvidia340-legacy-driver/0010-kernel-5.18.patch rename to package/batocera/gpu/batocera-nvidia340-legacy-driver/0010-kernel-5.18.patch diff --git a/package/gpu/batocera-nvidia340-legacy-driver/0011-kernel-6.0.patch b/package/batocera/gpu/batocera-nvidia340-legacy-driver/0011-kernel-6.0.patch similarity index 100% rename from package/gpu/batocera-nvidia340-legacy-driver/0011-kernel-6.0.patch rename to package/batocera/gpu/batocera-nvidia340-legacy-driver/0011-kernel-6.0.patch diff --git a/package/gpu/batocera-nvidia340-legacy-driver/0012-kernel-6.2.patch b/package/batocera/gpu/batocera-nvidia340-legacy-driver/0012-kernel-6.2.patch similarity index 100% rename from package/gpu/batocera-nvidia340-legacy-driver/0012-kernel-6.2.patch rename to package/batocera/gpu/batocera-nvidia340-legacy-driver/0012-kernel-6.2.patch diff --git a/package/gpu/batocera-nvidia340-legacy-driver/0013-kernel-6.3.patch b/package/batocera/gpu/batocera-nvidia340-legacy-driver/0013-kernel-6.3.patch similarity index 100% rename from package/gpu/batocera-nvidia340-legacy-driver/0013-kernel-6.3.patch rename to package/batocera/gpu/batocera-nvidia340-legacy-driver/0013-kernel-6.3.patch diff --git a/package/gpu/batocera-nvidia340-legacy-driver/0014-kernel-6.5.patch b/package/batocera/gpu/batocera-nvidia340-legacy-driver/0014-kernel-6.5.patch similarity index 100% rename from package/gpu/batocera-nvidia340-legacy-driver/0014-kernel-6.5.patch rename to package/batocera/gpu/batocera-nvidia340-legacy-driver/0014-kernel-6.5.patch diff --git a/package/gpu/batocera-nvidia340-legacy-driver/0015-kernel-6.6.patch b/package/batocera/gpu/batocera-nvidia340-legacy-driver/0015-kernel-6.6.patch similarity index 100% rename from package/gpu/batocera-nvidia340-legacy-driver/0015-kernel-6.6.patch rename to package/batocera/gpu/batocera-nvidia340-legacy-driver/0015-kernel-6.6.patch diff --git a/package/gpu/batocera-nvidia340-legacy-driver/0016-kernel-6.8.patch b/package/batocera/gpu/batocera-nvidia340-legacy-driver/0016-kernel-6.8.patch similarity index 100% rename from package/gpu/batocera-nvidia340-legacy-driver/0016-kernel-6.8.patch rename to package/batocera/gpu/batocera-nvidia340-legacy-driver/0016-kernel-6.8.patch diff --git a/package/gpu/batocera-nvidia340-legacy-driver/0100-legacy.patch b/package/batocera/gpu/batocera-nvidia340-legacy-driver/0100-legacy.patch similarity index 100% rename from package/gpu/batocera-nvidia340-legacy-driver/0100-legacy.patch rename to package/batocera/gpu/batocera-nvidia340-legacy-driver/0100-legacy.patch diff --git a/package/gpu/batocera-nvidia340-legacy-driver/20-nvidia.conf b/package/batocera/gpu/batocera-nvidia340-legacy-driver/20-nvidia.conf similarity index 100% rename from package/gpu/batocera-nvidia340-legacy-driver/20-nvidia.conf rename to package/batocera/gpu/batocera-nvidia340-legacy-driver/20-nvidia.conf diff --git a/package/gpu/batocera-nvidia340-legacy-driver/Config.in b/package/batocera/gpu/batocera-nvidia340-legacy-driver/Config.in similarity index 100% rename from package/gpu/batocera-nvidia340-legacy-driver/Config.in rename to package/batocera/gpu/batocera-nvidia340-legacy-driver/Config.in diff --git a/package/gpu/batocera-nvidia340-legacy-driver/batocera-nvidia340-legacy-driver.hash b/package/batocera/gpu/batocera-nvidia340-legacy-driver/batocera-nvidia340-legacy-driver.hash similarity index 100% rename from package/gpu/batocera-nvidia340-legacy-driver/batocera-nvidia340-legacy-driver.hash rename to package/batocera/gpu/batocera-nvidia340-legacy-driver/batocera-nvidia340-legacy-driver.hash diff --git a/package/gpu/batocera-nvidia340-legacy-driver/batocera-nvidia340-legacy-driver.mk b/package/batocera/gpu/batocera-nvidia340-legacy-driver/batocera-nvidia340-legacy-driver.mk similarity index 99% rename from package/gpu/batocera-nvidia340-legacy-driver/batocera-nvidia340-legacy-driver.mk rename to package/batocera/gpu/batocera-nvidia340-legacy-driver/batocera-nvidia340-legacy-driver.mk index c9f3d73eeff..19f335d4d38 100755 --- a/package/gpu/batocera-nvidia340-legacy-driver/batocera-nvidia340-legacy-driver.mk +++ b/package/batocera/gpu/batocera-nvidia340-legacy-driver/batocera-nvidia340-legacy-driver.mk @@ -190,7 +190,7 @@ define BATOCERA_NVIDIA340_LEGACY_DRIVER_INSTALL_COMMON mkdir -p $(TARGET_DIR)/usr/share/nvidia mkdir -p $(TARGET_DIR)/usr/share/nvidia/X11 $(INSTALL) -D -m 0644 \ - $(BR2_EXTERNAL_BATOCERA_PATH)/package/gpu/batocera-nvidia340-legacy-driver/20-nvidia.conf \ + $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/gpu/batocera-nvidia340-legacy-driver/20-nvidia.conf \ $(TARGET_DIR)/usr/share/nvidia/X11/20-nvidia.conf endef diff --git a/package/gpu/batocera-nvidia340-legacy-driver/egl.pc b/package/batocera/gpu/batocera-nvidia340-legacy-driver/egl.pc similarity index 100% rename from package/gpu/batocera-nvidia340-legacy-driver/egl.pc rename to package/batocera/gpu/batocera-nvidia340-legacy-driver/egl.pc diff --git a/package/gpu/batocera-nvidia340-legacy-driver/gl.pc b/package/batocera/gpu/batocera-nvidia340-legacy-driver/gl.pc similarity index 100% rename from package/gpu/batocera-nvidia340-legacy-driver/gl.pc rename to package/batocera/gpu/batocera-nvidia340-legacy-driver/gl.pc diff --git a/package/gpu/batocera-nvidia390-legacy-driver/0001-use-LDFLAGS.patch b/package/batocera/gpu/batocera-nvidia390-legacy-driver/0001-use-LDFLAGS.patch similarity index 100% rename from package/gpu/batocera-nvidia390-legacy-driver/0001-use-LDFLAGS.patch rename to package/batocera/gpu/batocera-nvidia390-legacy-driver/0001-use-LDFLAGS.patch diff --git a/package/gpu/batocera-nvidia390-legacy-driver/0002-kernel-5.18.patch b/package/batocera/gpu/batocera-nvidia390-legacy-driver/0002-kernel-5.18.patch similarity index 100% rename from package/gpu/batocera-nvidia390-legacy-driver/0002-kernel-5.18.patch rename to package/batocera/gpu/batocera-nvidia390-legacy-driver/0002-kernel-5.18.patch diff --git a/package/gpu/batocera-nvidia390-legacy-driver/0003-kernel-6.0.patch b/package/batocera/gpu/batocera-nvidia390-legacy-driver/0003-kernel-6.0.patch similarity index 100% rename from package/gpu/batocera-nvidia390-legacy-driver/0003-kernel-6.0.patch rename to package/batocera/gpu/batocera-nvidia390-legacy-driver/0003-kernel-6.0.patch diff --git a/package/gpu/batocera-nvidia390-legacy-driver/0004-kernel-6.2.patch b/package/batocera/gpu/batocera-nvidia390-legacy-driver/0004-kernel-6.2.patch similarity index 100% rename from package/gpu/batocera-nvidia390-legacy-driver/0004-kernel-6.2.patch rename to package/batocera/gpu/batocera-nvidia390-legacy-driver/0004-kernel-6.2.patch diff --git a/package/gpu/batocera-nvidia390-legacy-driver/0005-kernel-6.3.patch b/package/batocera/gpu/batocera-nvidia390-legacy-driver/0005-kernel-6.3.patch similarity index 100% rename from package/gpu/batocera-nvidia390-legacy-driver/0005-kernel-6.3.patch rename to package/batocera/gpu/batocera-nvidia390-legacy-driver/0005-kernel-6.3.patch diff --git a/package/gpu/batocera-nvidia390-legacy-driver/0006-kernel-6.4.patch b/package/batocera/gpu/batocera-nvidia390-legacy-driver/0006-kernel-6.4.patch similarity index 100% rename from package/gpu/batocera-nvidia390-legacy-driver/0006-kernel-6.4.patch rename to package/batocera/gpu/batocera-nvidia390-legacy-driver/0006-kernel-6.4.patch diff --git a/package/gpu/batocera-nvidia390-legacy-driver/0007-kernel-6.5.patch b/package/batocera/gpu/batocera-nvidia390-legacy-driver/0007-kernel-6.5.patch similarity index 100% rename from package/gpu/batocera-nvidia390-legacy-driver/0007-kernel-6.5.patch rename to package/batocera/gpu/batocera-nvidia390-legacy-driver/0007-kernel-6.5.patch diff --git a/package/gpu/batocera-nvidia390-legacy-driver/0008-kernel-6.6.patch b/package/batocera/gpu/batocera-nvidia390-legacy-driver/0008-kernel-6.6.patch similarity index 100% rename from package/gpu/batocera-nvidia390-legacy-driver/0008-kernel-6.6.patch rename to package/batocera/gpu/batocera-nvidia390-legacy-driver/0008-kernel-6.6.patch diff --git a/package/gpu/batocera-nvidia390-legacy-driver/0009-kernel-6.8.patch b/package/batocera/gpu/batocera-nvidia390-legacy-driver/0009-kernel-6.8.patch similarity index 100% rename from package/gpu/batocera-nvidia390-legacy-driver/0009-kernel-6.8.patch rename to package/batocera/gpu/batocera-nvidia390-legacy-driver/0009-kernel-6.8.patch diff --git a/package/gpu/batocera-nvidia390-legacy-driver/0010-kernel-6.10.patch b/package/batocera/gpu/batocera-nvidia390-legacy-driver/0010-kernel-6.10.patch similarity index 100% rename from package/gpu/batocera-nvidia390-legacy-driver/0010-kernel-6.10.patch rename to package/batocera/gpu/batocera-nvidia390-legacy-driver/0010-kernel-6.10.patch diff --git a/package/gpu/batocera-nvidia390-legacy-driver/Config.in b/package/batocera/gpu/batocera-nvidia390-legacy-driver/Config.in similarity index 100% rename from package/gpu/batocera-nvidia390-legacy-driver/Config.in rename to package/batocera/gpu/batocera-nvidia390-legacy-driver/Config.in diff --git a/package/gpu/batocera-nvidia390-legacy-driver/batocera-nvidia390-legacy-driver.hash b/package/batocera/gpu/batocera-nvidia390-legacy-driver/batocera-nvidia390-legacy-driver.hash similarity index 100% rename from package/gpu/batocera-nvidia390-legacy-driver/batocera-nvidia390-legacy-driver.hash rename to package/batocera/gpu/batocera-nvidia390-legacy-driver/batocera-nvidia390-legacy-driver.hash diff --git a/package/gpu/batocera-nvidia390-legacy-driver/batocera-nvidia390-legacy-driver.mk b/package/batocera/gpu/batocera-nvidia390-legacy-driver/batocera-nvidia390-legacy-driver.mk similarity index 100% rename from package/gpu/batocera-nvidia390-legacy-driver/batocera-nvidia390-legacy-driver.mk rename to package/batocera/gpu/batocera-nvidia390-legacy-driver/batocera-nvidia390-legacy-driver.mk diff --git a/package/gpu/batocera-nvidia390-legacy-driver/egl.pc b/package/batocera/gpu/batocera-nvidia390-legacy-driver/egl.pc similarity index 100% rename from package/gpu/batocera-nvidia390-legacy-driver/egl.pc rename to package/batocera/gpu/batocera-nvidia390-legacy-driver/egl.pc diff --git a/package/gpu/batocera-nvidia390-legacy-driver/gl.pc b/package/batocera/gpu/batocera-nvidia390-legacy-driver/gl.pc similarity index 100% rename from package/gpu/batocera-nvidia390-legacy-driver/gl.pc rename to package/batocera/gpu/batocera-nvidia390-legacy-driver/gl.pc diff --git a/package/gpu/gl4es/Config.in b/package/batocera/gpu/gl4es/Config.in similarity index 100% rename from package/gpu/gl4es/Config.in rename to package/batocera/gpu/gl4es/Config.in diff --git a/package/gpu/gl4es/gl4es.mk b/package/batocera/gpu/gl4es/gl4es.mk similarity index 100% rename from package/gpu/gl4es/gl4es.mk rename to package/batocera/gpu/gl4es/gl4es.mk diff --git a/package/gpu/img-gpu-powervr/Config.in b/package/batocera/gpu/img-gpu-powervr/Config.in similarity index 100% rename from package/gpu/img-gpu-powervr/Config.in rename to package/batocera/gpu/img-gpu-powervr/Config.in diff --git a/package/gpu/img-gpu-powervr/img-gpu-powervr.mk b/package/batocera/gpu/img-gpu-powervr/img-gpu-powervr.mk similarity index 100% rename from package/gpu/img-gpu-powervr/img-gpu-powervr.mk rename to package/batocera/gpu/img-gpu-powervr/img-gpu-powervr.mk diff --git a/package/gpu/img-mesa3d/0001-Add-PVR-Gallium-driver.patch b/package/batocera/gpu/img-mesa3d/0001-Add-PVR-Gallium-driver.patch similarity index 100% rename from package/gpu/img-mesa3d/0001-Add-PVR-Gallium-driver.patch rename to package/batocera/gpu/img-mesa3d/0001-Add-PVR-Gallium-driver.patch diff --git a/package/gpu/img-mesa3d/0002-Force-Mesa-to-use-the-PVR-driver-for-platform-device.patch b/package/batocera/gpu/img-mesa3d/0002-Force-Mesa-to-use-the-PVR-driver-for-platform-device.patch similarity index 100% rename from package/gpu/img-mesa3d/0002-Force-Mesa-to-use-the-PVR-driver-for-platform-device.patch rename to package/batocera/gpu/img-mesa3d/0002-Force-Mesa-to-use-the-PVR-driver-for-platform-device.patch diff --git a/package/gpu/img-mesa3d/0002-dri-Add-some-new-DRI-formats-and-fourccs.patch b/package/batocera/gpu/img-mesa3d/0002-dri-Add-some-new-DRI-formats-and-fourccs.patch similarity index 100% rename from package/gpu/img-mesa3d/0002-dri-Add-some-new-DRI-formats-and-fourccs.patch rename to package/batocera/gpu/img-mesa3d/0002-dri-Add-some-new-DRI-formats-and-fourccs.patch diff --git a/package/gpu/img-mesa3d/0003-GL_EXT_sparse_texture-entry-points.patch b/package/batocera/gpu/img-mesa3d/0003-GL_EXT_sparse_texture-entry-points.patch similarity index 100% rename from package/gpu/img-mesa3d/0003-GL_EXT_sparse_texture-entry-points.patch rename to package/batocera/gpu/img-mesa3d/0003-GL_EXT_sparse_texture-entry-points.patch diff --git a/package/gpu/img-mesa3d/0004-Add-support-for-various-GLES-extensions.patch b/package/batocera/gpu/img-mesa3d/0004-Add-support-for-various-GLES-extensions.patch similarity index 100% rename from package/gpu/img-mesa3d/0004-Add-support-for-various-GLES-extensions.patch rename to package/batocera/gpu/img-mesa3d/0004-Add-support-for-various-GLES-extensions.patch diff --git a/package/gpu/img-mesa3d/0005-Add-EGL_IMG_cl_image-extension.patch b/package/batocera/gpu/img-mesa3d/0005-Add-EGL_IMG_cl_image-extension.patch similarity index 100% rename from package/gpu/img-mesa3d/0005-Add-EGL_IMG_cl_image-extension.patch rename to package/batocera/gpu/img-mesa3d/0005-Add-EGL_IMG_cl_image-extension.patch diff --git a/package/gpu/img-mesa3d/0006-egl-optimise-eglMakeCurrent-for-the-case-where-nothi.patch b/package/batocera/gpu/img-mesa3d/0006-egl-optimise-eglMakeCurrent-for-the-case-where-nothi.patch similarity index 100% rename from package/gpu/img-mesa3d/0006-egl-optimise-eglMakeCurrent-for-the-case-where-nothi.patch rename to package/batocera/gpu/img-mesa3d/0006-egl-optimise-eglMakeCurrent-for-the-case-where-nothi.patch diff --git a/package/gpu/img-mesa3d/0007-GL_EXT_shader_pixel_local_storage2-entry-points.patch b/package/batocera/gpu/img-mesa3d/0007-GL_EXT_shader_pixel_local_storage2-entry-points.patch similarity index 100% rename from package/gpu/img-mesa3d/0007-GL_EXT_shader_pixel_local_storage2-entry-points.patch rename to package/batocera/gpu/img-mesa3d/0007-GL_EXT_shader_pixel_local_storage2-entry-points.patch diff --git a/package/gpu/img-mesa3d/0008-GL_IMG_framebuffer_downsample-entry-points.patch b/package/batocera/gpu/img-mesa3d/0008-GL_IMG_framebuffer_downsample-entry-points.patch similarity index 100% rename from package/gpu/img-mesa3d/0008-GL_IMG_framebuffer_downsample-entry-points.patch rename to package/batocera/gpu/img-mesa3d/0008-GL_IMG_framebuffer_downsample-entry-points.patch diff --git a/package/gpu/img-mesa3d/0009-GL_OVR_multiview-entry-points.patch b/package/batocera/gpu/img-mesa3d/0009-GL_OVR_multiview-entry-points.patch similarity index 100% rename from package/gpu/img-mesa3d/0009-GL_OVR_multiview-entry-points.patch rename to package/batocera/gpu/img-mesa3d/0009-GL_OVR_multiview-entry-points.patch diff --git a/package/gpu/img-mesa3d/0010-Add-OVR_multiview_multisampled_render_to_texture.patch b/package/batocera/gpu/img-mesa3d/0010-Add-OVR_multiview_multisampled_render_to_texture.patch similarity index 100% rename from package/gpu/img-mesa3d/0010-Add-OVR_multiview_multisampled_render_to_texture.patch rename to package/batocera/gpu/img-mesa3d/0010-Add-OVR_multiview_multisampled_render_to_texture.patch diff --git a/package/gpu/img-mesa3d/0011-wayland-drm-install-wayland-drm.xml-to-the-configure.patch b/package/batocera/gpu/img-mesa3d/0011-wayland-drm-install-wayland-drm.xml-to-the-configure.patch similarity index 100% rename from package/gpu/img-mesa3d/0011-wayland-drm-install-wayland-drm.xml-to-the-configure.patch rename to package/batocera/gpu/img-mesa3d/0011-wayland-drm-install-wayland-drm.xml-to-the-configure.patch diff --git a/package/gpu/img-mesa3d/0012-Enable-buffer-sharing-in-the-kms_swrast-driver.patch b/package/batocera/gpu/img-mesa3d/0012-Enable-buffer-sharing-in-the-kms_swrast-driver.patch similarity index 100% rename from package/gpu/img-mesa3d/0012-Enable-buffer-sharing-in-the-kms_swrast-driver.patch rename to package/batocera/gpu/img-mesa3d/0012-Enable-buffer-sharing-in-the-kms_swrast-driver.patch diff --git a/package/gpu/img-mesa3d/0013-egl-wayland-add-support-for-RGB565-back-buffers.patch b/package/batocera/gpu/img-mesa3d/0013-egl-wayland-add-support-for-RGB565-back-buffers.patch similarity index 100% rename from package/gpu/img-mesa3d/0013-egl-wayland-add-support-for-RGB565-back-buffers.patch rename to package/batocera/gpu/img-mesa3d/0013-egl-wayland-add-support-for-RGB565-back-buffers.patch diff --git a/package/gpu/img-mesa3d/0014-egl-automatically-call-eglReleaseThread-on-thread-te.patch b/package/batocera/gpu/img-mesa3d/0014-egl-automatically-call-eglReleaseThread-on-thread-te.patch similarity index 100% rename from package/gpu/img-mesa3d/0014-egl-automatically-call-eglReleaseThread-on-thread-te.patch rename to package/batocera/gpu/img-mesa3d/0014-egl-automatically-call-eglReleaseThread-on-thread-te.patch diff --git a/package/gpu/img-mesa3d/0015-egl-wayland-post-maximum-damage-when-blitting.patch b/package/batocera/gpu/img-mesa3d/0015-egl-wayland-post-maximum-damage-when-blitting.patch similarity index 100% rename from package/gpu/img-mesa3d/0015-egl-wayland-post-maximum-damage-when-blitting.patch rename to package/batocera/gpu/img-mesa3d/0015-egl-wayland-post-maximum-damage-when-blitting.patch diff --git a/package/gpu/img-mesa3d/0016-egl-wayland-flush-the-drawable-before-blitting.patch b/package/batocera/gpu/img-mesa3d/0016-egl-wayland-flush-the-drawable-before-blitting.patch similarity index 100% rename from package/gpu/img-mesa3d/0016-egl-wayland-flush-the-drawable-before-blitting.patch rename to package/batocera/gpu/img-mesa3d/0016-egl-wayland-flush-the-drawable-before-blitting.patch diff --git a/package/gpu/img-mesa3d/0017-dri-use-a-supported-API-in-driCreateNewContext.patch b/package/batocera/gpu/img-mesa3d/0017-dri-use-a-supported-API-in-driCreateNewContext.patch similarity index 100% rename from package/gpu/img-mesa3d/0017-dri-use-a-supported-API-in-driCreateNewContext.patch rename to package/batocera/gpu/img-mesa3d/0017-dri-use-a-supported-API-in-driCreateNewContext.patch diff --git a/package/gpu/img-mesa3d/0018-gbm-add-gbm_bo_blit.patch b/package/batocera/gpu/img-mesa3d/0018-gbm-add-gbm_bo_blit.patch similarity index 100% rename from package/gpu/img-mesa3d/0018-gbm-add-gbm_bo_blit.patch rename to package/batocera/gpu/img-mesa3d/0018-gbm-add-gbm_bo_blit.patch diff --git a/package/gpu/img-mesa3d/0019-gbm-don-t-assert-if-DRI-context-creation-fails.patch b/package/batocera/gpu/img-mesa3d/0019-gbm-don-t-assert-if-DRI-context-creation-fails.patch similarity index 100% rename from package/gpu/img-mesa3d/0019-gbm-don-t-assert-if-DRI-context-creation-fails.patch rename to package/batocera/gpu/img-mesa3d/0019-gbm-don-t-assert-if-DRI-context-creation-fails.patch diff --git a/package/gpu/img-mesa3d/0020-egl-wayland-add-pbuffer-support.patch b/package/batocera/gpu/img-mesa3d/0020-egl-wayland-add-pbuffer-support.patch similarity index 100% rename from package/gpu/img-mesa3d/0020-egl-wayland-add-pbuffer-support.patch rename to package/batocera/gpu/img-mesa3d/0020-egl-wayland-add-pbuffer-support.patch diff --git a/package/gpu/img-mesa3d/0021-egl-eglBindAPI-workaround-for-dEQP-bug.patch b/package/batocera/gpu/img-mesa3d/0021-egl-eglBindAPI-workaround-for-dEQP-bug.patch similarity index 100% rename from package/gpu/img-mesa3d/0021-egl-eglBindAPI-workaround-for-dEQP-bug.patch rename to package/batocera/gpu/img-mesa3d/0021-egl-eglBindAPI-workaround-for-dEQP-bug.patch diff --git a/package/gpu/img-mesa3d/0022-GL_EXT_multi_draw_indirect-entry-points.patch b/package/batocera/gpu/img-mesa3d/0022-GL_EXT_multi_draw_indirect-entry-points.patch similarity index 100% rename from package/gpu/img-mesa3d/0022-GL_EXT_multi_draw_indirect-entry-points.patch rename to package/batocera/gpu/img-mesa3d/0022-GL_EXT_multi_draw_indirect-entry-points.patch diff --git a/package/gpu/img-mesa3d/0023-dri-add-support-for-YUV-DRI-config.patch b/package/batocera/gpu/img-mesa3d/0023-dri-add-support-for-YUV-DRI-config.patch similarity index 100% rename from package/gpu/img-mesa3d/0023-dri-add-support-for-YUV-DRI-config.patch rename to package/batocera/gpu/img-mesa3d/0023-dri-add-support-for-YUV-DRI-config.patch diff --git a/package/gpu/img-mesa3d/0024-egl-add-support-for-EXT_yuv_surface.patch b/package/batocera/gpu/img-mesa3d/0024-egl-add-support-for-EXT_yuv_surface.patch similarity index 100% rename from package/gpu/img-mesa3d/0024-egl-add-support-for-EXT_yuv_surface.patch rename to package/batocera/gpu/img-mesa3d/0024-egl-add-support-for-EXT_yuv_surface.patch diff --git a/package/gpu/img-mesa3d/0025-dri-add-missing-__DRI_IMAGE_COMPONENTS-define-for-EG.patch b/package/batocera/gpu/img-mesa3d/0025-dri-add-missing-__DRI_IMAGE_COMPONENTS-define-for-EG.patch similarity index 100% rename from package/gpu/img-mesa3d/0025-dri-add-missing-__DRI_IMAGE_COMPONENTS-define-for-EG.patch rename to package/batocera/gpu/img-mesa3d/0025-dri-add-missing-__DRI_IMAGE_COMPONENTS-define-for-EG.patch diff --git a/package/gpu/img-mesa3d/0026-egl-wayland-expose-EXT_yuv_surface-support.patch b/package/batocera/gpu/img-mesa3d/0026-egl-wayland-expose-EXT_yuv_surface-support.patch similarity index 100% rename from package/gpu/img-mesa3d/0026-egl-wayland-expose-EXT_yuv_surface-support.patch rename to package/batocera/gpu/img-mesa3d/0026-egl-wayland-expose-EXT_yuv_surface-support.patch diff --git a/package/gpu/img-mesa3d/0027-gbm-add-some-new-GBM-formats.patch b/package/batocera/gpu/img-mesa3d/0027-gbm-add-some-new-GBM-formats.patch similarity index 100% rename from package/gpu/img-mesa3d/0027-gbm-add-some-new-GBM-formats.patch rename to package/batocera/gpu/img-mesa3d/0027-gbm-add-some-new-GBM-formats.patch diff --git a/package/gpu/img-mesa3d/0028-egl-add-null-platform.patch b/package/batocera/gpu/img-mesa3d/0028-egl-add-null-platform.patch similarity index 100% rename from package/gpu/img-mesa3d/0028-egl-add-null-platform.patch rename to package/batocera/gpu/img-mesa3d/0028-egl-add-null-platform.patch diff --git a/package/gpu/img-mesa3d/0029-egl-add-support-for-EXT_image_gl_colorspace.patch b/package/batocera/gpu/img-mesa3d/0029-egl-add-support-for-EXT_image_gl_colorspace.patch similarity index 100% rename from package/gpu/img-mesa3d/0029-egl-add-support-for-EXT_image_gl_colorspace.patch rename to package/batocera/gpu/img-mesa3d/0029-egl-add-support-for-EXT_image_gl_colorspace.patch diff --git a/package/gpu/img-mesa3d/0030-meson-force-C-2011-for-thread_local.patch b/package/batocera/gpu/img-mesa3d/0030-meson-force-C-2011-for-thread_local.patch similarity index 100% rename from package/gpu/img-mesa3d/0030-meson-force-C-2011-for-thread_local.patch rename to package/batocera/gpu/img-mesa3d/0030-meson-force-C-2011-for-thread_local.patch diff --git a/package/gpu/img-mesa3d/0031-dri2-add-support-for-swap-intervals-other-than-1.patch b/package/batocera/gpu/img-mesa3d/0031-dri2-add-support-for-swap-intervals-other-than-1.patch similarity index 100% rename from package/gpu/img-mesa3d/0031-dri2-add-support-for-swap-intervals-other-than-1.patch rename to package/batocera/gpu/img-mesa3d/0031-dri2-add-support-for-swap-intervals-other-than-1.patch diff --git a/package/gpu/img-mesa3d/0032-null_platform-add-support-for-explicit-synchronisati.patch b/package/batocera/gpu/img-mesa3d/0032-null_platform-add-support-for-explicit-synchronisati.patch similarity index 100% rename from package/gpu/img-mesa3d/0032-null_platform-add-support-for-explicit-synchronisati.patch rename to package/batocera/gpu/img-mesa3d/0032-null_platform-add-support-for-explicit-synchronisati.patch diff --git a/package/gpu/img-mesa3d/0033-egl-null-add-support-for-DRM-image-format-modifiers.patch b/package/batocera/gpu/img-mesa3d/0033-egl-null-add-support-for-DRM-image-format-modifiers.patch similarity index 100% rename from package/gpu/img-mesa3d/0033-egl-null-add-support-for-DRM-image-format-modifiers.patch rename to package/batocera/gpu/img-mesa3d/0033-egl-null-add-support-for-DRM-image-format-modifiers.patch diff --git a/package/gpu/img-mesa3d/0034-egl-query-the-supported-ES2-context-version.patch b/package/batocera/gpu/img-mesa3d/0034-egl-query-the-supported-ES2-context-version.patch similarity index 100% rename from package/gpu/img-mesa3d/0034-egl-query-the-supported-ES2-context-version.patch rename to package/batocera/gpu/img-mesa3d/0034-egl-query-the-supported-ES2-context-version.patch diff --git a/package/gpu/img-mesa3d/0035-meson-allow-libGL-to-be-built-without-GLX.patch b/package/batocera/gpu/img-mesa3d/0035-meson-allow-libGL-to-be-built-without-GLX.patch similarity index 100% rename from package/gpu/img-mesa3d/0035-meson-allow-libGL-to-be-built-without-GLX.patch rename to package/batocera/gpu/img-mesa3d/0035-meson-allow-libGL-to-be-built-without-GLX.patch diff --git a/package/gpu/img-mesa3d/0036-egl-wayland-process-non-resized-window-movement.patch b/package/batocera/gpu/img-mesa3d/0036-egl-wayland-process-non-resized-window-movement.patch similarity index 100% rename from package/gpu/img-mesa3d/0036-egl-wayland-process-non-resized-window-movement.patch rename to package/batocera/gpu/img-mesa3d/0036-egl-wayland-process-non-resized-window-movement.patch diff --git a/package/gpu/img-mesa3d/0037-Separate-EXT_framebuffer_object-from-ARB-version.patch b/package/batocera/gpu/img-mesa3d/0037-Separate-EXT_framebuffer_object-from-ARB-version.patch similarity index 100% rename from package/gpu/img-mesa3d/0037-Separate-EXT_framebuffer_object-from-ARB-version.patch rename to package/batocera/gpu/img-mesa3d/0037-Separate-EXT_framebuffer_object-from-ARB-version.patch diff --git a/package/gpu/img-mesa3d/0038-egl-null-add-support-for-async-flip-with-front-buffe.patch b/package/batocera/gpu/img-mesa3d/0038-egl-null-add-support-for-async-flip-with-front-buffe.patch similarity index 100% rename from package/gpu/img-mesa3d/0038-egl-null-add-support-for-async-flip-with-front-buffe.patch rename to package/batocera/gpu/img-mesa3d/0038-egl-null-add-support-for-async-flip-with-front-buffe.patch diff --git a/package/gpu/img-mesa3d/0039-gbm-add-pbuffer-support.patch b/package/batocera/gpu/img-mesa3d/0039-gbm-add-pbuffer-support.patch similarity index 100% rename from package/gpu/img-mesa3d/0039-gbm-add-pbuffer-support.patch rename to package/batocera/gpu/img-mesa3d/0039-gbm-add-pbuffer-support.patch diff --git a/package/gpu/img-mesa3d/0040-egl-null-expose-EXT_yuv_surface-support.patch b/package/batocera/gpu/img-mesa3d/0040-egl-null-expose-EXT_yuv_surface-support.patch similarity index 100% rename from package/gpu/img-mesa3d/0040-egl-null-expose-EXT_yuv_surface-support.patch rename to package/batocera/gpu/img-mesa3d/0040-egl-null-expose-EXT_yuv_surface-support.patch diff --git a/package/gpu/img-mesa3d/0041-dri-preserve-the-original-FD-for-driver-use.patch b/package/batocera/gpu/img-mesa3d/0041-dri-preserve-the-original-FD-for-driver-use.patch similarity index 100% rename from package/gpu/img-mesa3d/0041-dri-preserve-the-original-FD-for-driver-use.patch rename to package/batocera/gpu/img-mesa3d/0041-dri-preserve-the-original-FD-for-driver-use.patch diff --git a/package/gpu/img-mesa3d/0042-egl-wayland-a-linear-buffer-is-not-needed-with-DRM-f.patch b/package/batocera/gpu/img-mesa3d/0042-egl-wayland-a-linear-buffer-is-not-needed-with-DRM-f.patch similarity index 100% rename from package/gpu/img-mesa3d/0042-egl-wayland-a-linear-buffer-is-not-needed-with-DRM-f.patch rename to package/batocera/gpu/img-mesa3d/0042-egl-wayland-a-linear-buffer-is-not-needed-with-DRM-f.patch diff --git a/package/gpu/img-mesa3d/0043-dri3-a-linear-buffer-is-not-needed-with-DRM-format-m.patch b/package/batocera/gpu/img-mesa3d/0043-dri3-a-linear-buffer-is-not-needed-with-DRM-format-m.patch similarity index 100% rename from package/gpu/img-mesa3d/0043-dri3-a-linear-buffer-is-not-needed-with-DRM-format-m.patch rename to package/batocera/gpu/img-mesa3d/0043-dri3-a-linear-buffer-is-not-needed-with-DRM-format-m.patch diff --git a/package/gpu/img-mesa3d/0044-egl-drm-add-support-for-DRI_PRIME-GPU-selection.patch b/package/batocera/gpu/img-mesa3d/0044-egl-drm-add-support-for-DRI_PRIME-GPU-selection.patch similarity index 100% rename from package/gpu/img-mesa3d/0044-egl-drm-add-support-for-DRI_PRIME-GPU-selection.patch rename to package/batocera/gpu/img-mesa3d/0044-egl-drm-add-support-for-DRI_PRIME-GPU-selection.patch diff --git a/package/gpu/img-mesa3d/0045-egl-null-add-support-for-DRI_PRIME-GPU-selection.patch b/package/batocera/gpu/img-mesa3d/0045-egl-null-add-support-for-DRI_PRIME-GPU-selection.patch similarity index 100% rename from package/gpu/img-mesa3d/0045-egl-null-add-support-for-DRI_PRIME-GPU-selection.patch rename to package/batocera/gpu/img-mesa3d/0045-egl-null-add-support-for-DRI_PRIME-GPU-selection.patch diff --git a/package/gpu/img-mesa3d/0046-egl-null-introduce-NULL_DRM_DISPLAY.patch b/package/batocera/gpu/img-mesa3d/0046-egl-null-introduce-NULL_DRM_DISPLAY.patch similarity index 100% rename from package/gpu/img-mesa3d/0046-egl-null-introduce-NULL_DRM_DISPLAY.patch rename to package/batocera/gpu/img-mesa3d/0046-egl-null-introduce-NULL_DRM_DISPLAY.patch diff --git a/package/gpu/img-mesa3d/0047-vulkan-wsi-check-the-DRI3-and-Present-XCB-reply-poin.patch b/package/batocera/gpu/img-mesa3d/0047-vulkan-wsi-check-the-DRI3-and-Present-XCB-reply-poin.patch similarity index 100% rename from package/gpu/img-mesa3d/0047-vulkan-wsi-check-the-DRI3-and-Present-XCB-reply-poin.patch rename to package/batocera/gpu/img-mesa3d/0047-vulkan-wsi-check-the-DRI3-and-Present-XCB-reply-poin.patch diff --git a/package/gpu/img-mesa3d/0048-vulkan-wsi-make-the-display-FD-available.patch b/package/batocera/gpu/img-mesa3d/0048-vulkan-wsi-make-the-display-FD-available.patch similarity index 100% rename from package/gpu/img-mesa3d/0048-vulkan-wsi-make-the-display-FD-available.patch rename to package/batocera/gpu/img-mesa3d/0048-vulkan-wsi-make-the-display-FD-available.patch diff --git a/package/gpu/img-mesa3d/0049-pvr-wsi-add-PowerVR-Vulkan-WSI-library.patch b/package/batocera/gpu/img-mesa3d/0049-pvr-wsi-add-PowerVR-Vulkan-WSI-library.patch similarity index 100% rename from package/gpu/img-mesa3d/0049-pvr-wsi-add-PowerVR-Vulkan-WSI-library.patch rename to package/batocera/gpu/img-mesa3d/0049-pvr-wsi-add-PowerVR-Vulkan-WSI-library.patch diff --git a/package/gpu/img-mesa3d/0050-vulkan-wsi-Disable-use-of-VK_EXT_pci_bus_info.patch b/package/batocera/gpu/img-mesa3d/0050-vulkan-wsi-Disable-use-of-VK_EXT_pci_bus_info.patch similarity index 100% rename from package/gpu/img-mesa3d/0050-vulkan-wsi-Disable-use-of-VK_EXT_pci_bus_info.patch rename to package/batocera/gpu/img-mesa3d/0050-vulkan-wsi-Disable-use-of-VK_EXT_pci_bus_info.patch diff --git a/package/gpu/img-mesa3d/0051-vulkan-wsi-default-to-force_bgra8_unorm_first-true.patch b/package/batocera/gpu/img-mesa3d/0051-vulkan-wsi-default-to-force_bgra8_unorm_first-true.patch similarity index 100% rename from package/gpu/img-mesa3d/0051-vulkan-wsi-default-to-force_bgra8_unorm_first-true.patch rename to package/batocera/gpu/img-mesa3d/0051-vulkan-wsi-default-to-force_bgra8_unorm_first-true.patch diff --git a/package/gpu/img-mesa3d/0052-vulkan-wsi-enable-additional-formats-for-Display.patch b/package/batocera/gpu/img-mesa3d/0052-vulkan-wsi-enable-additional-formats-for-Display.patch similarity index 100% rename from package/gpu/img-mesa3d/0052-vulkan-wsi-enable-additional-formats-for-Display.patch rename to package/batocera/gpu/img-mesa3d/0052-vulkan-wsi-enable-additional-formats-for-Display.patch diff --git a/package/gpu/img-mesa3d/0053-mesa-partially-revert-pbuffer-attribute-removal.patch b/package/batocera/gpu/img-mesa3d/0053-mesa-partially-revert-pbuffer-attribute-removal.patch similarity index 100% rename from package/gpu/img-mesa3d/0053-mesa-partially-revert-pbuffer-attribute-removal.patch rename to package/batocera/gpu/img-mesa3d/0053-mesa-partially-revert-pbuffer-attribute-removal.patch diff --git a/package/gpu/img-mesa3d/0054-egl_dri2-set-pbuffer-config-attribs-to-0-for-non-pbu.patch b/package/batocera/gpu/img-mesa3d/0054-egl_dri2-set-pbuffer-config-attribs-to-0-for-non-pbu.patch similarity index 100% rename from package/gpu/img-mesa3d/0054-egl_dri2-set-pbuffer-config-attribs-to-0-for-non-pbu.patch rename to package/batocera/gpu/img-mesa3d/0054-egl_dri2-set-pbuffer-config-attribs-to-0-for-non-pbu.patch diff --git a/package/gpu/img-mesa3d/0055-GL_ARB_geometry_shader4-entry-points.patch b/package/batocera/gpu/img-mesa3d/0055-GL_ARB_geometry_shader4-entry-points.patch similarity index 100% rename from package/gpu/img-mesa3d/0055-GL_ARB_geometry_shader4-entry-points.patch rename to package/batocera/gpu/img-mesa3d/0055-GL_ARB_geometry_shader4-entry-points.patch diff --git a/package/gpu/img-mesa3d/0056-egl-wayland-add-EGL_BUFFER_PRESERVED-support.patch b/package/batocera/gpu/img-mesa3d/0056-egl-wayland-add-EGL_BUFFER_PRESERVED-support.patch similarity index 100% rename from package/gpu/img-mesa3d/0056-egl-wayland-add-EGL_BUFFER_PRESERVED-support.patch rename to package/batocera/gpu/img-mesa3d/0056-egl-wayland-add-EGL_BUFFER_PRESERVED-support.patch diff --git a/package/gpu/img-mesa3d/0057-glapi-restore-exec-dynamic.patch b/package/batocera/gpu/img-mesa3d/0057-glapi-restore-exec-dynamic.patch similarity index 100% rename from package/gpu/img-mesa3d/0057-glapi-restore-exec-dynamic.patch rename to package/batocera/gpu/img-mesa3d/0057-glapi-restore-exec-dynamic.patch diff --git a/package/gpu/img-mesa3d/0058-Revert-meson-check-mtls-if-has_exe_wrapper.patch b/package/batocera/gpu/img-mesa3d/0058-Revert-meson-check-mtls-if-has_exe_wrapper.patch similarity index 100% rename from package/gpu/img-mesa3d/0058-Revert-meson-check-mtls-if-has_exe_wrapper.patch rename to package/batocera/gpu/img-mesa3d/0058-Revert-meson-check-mtls-if-has_exe_wrapper.patch diff --git a/package/gpu/img-mesa3d/0059-gbm-add-GBM_FORMAT_AXBXGXRX106106106106.patch b/package/batocera/gpu/img-mesa3d/0059-gbm-add-GBM_FORMAT_AXBXGXRX106106106106.patch similarity index 100% rename from package/gpu/img-mesa3d/0059-gbm-add-GBM_FORMAT_AXBXGXRX106106106106.patch rename to package/batocera/gpu/img-mesa3d/0059-gbm-add-GBM_FORMAT_AXBXGXRX106106106106.patch diff --git a/package/gpu/img-mesa3d/0060-gallium-pvr-Add-DRM_FORMAT_AXBXGXRX106106106106.patch b/package/batocera/gpu/img-mesa3d/0060-gallium-pvr-Add-DRM_FORMAT_AXBXGXRX106106106106.patch similarity index 100% rename from package/gpu/img-mesa3d/0060-gallium-pvr-Add-DRM_FORMAT_AXBXGXRX106106106106.patch rename to package/batocera/gpu/img-mesa3d/0060-gallium-pvr-Add-DRM_FORMAT_AXBXGXRX106106106106.patch diff --git a/package/gpu/img-mesa3d/0061-gallium-pvr-add-the-DRIconfigOptions-extension.patch b/package/batocera/gpu/img-mesa3d/0061-gallium-pvr-add-the-DRIconfigOptions-extension.patch similarity index 100% rename from package/gpu/img-mesa3d/0061-gallium-pvr-add-the-DRIconfigOptions-extension.patch rename to package/batocera/gpu/img-mesa3d/0061-gallium-pvr-add-the-DRIconfigOptions-extension.patch diff --git a/package/gpu/img-mesa3d/0062-gallium-pvr-support-DRI-Image-extension-v21.patch b/package/batocera/gpu/img-mesa3d/0062-gallium-pvr-support-DRI-Image-extension-v21.patch similarity index 100% rename from package/gpu/img-mesa3d/0062-gallium-pvr-support-DRI-Image-extension-v21.patch rename to package/batocera/gpu/img-mesa3d/0062-gallium-pvr-support-DRI-Image-extension-v21.patch diff --git a/package/gpu/img-mesa3d/Config.in b/package/batocera/gpu/img-mesa3d/Config.in similarity index 100% rename from package/gpu/img-mesa3d/Config.in rename to package/batocera/gpu/img-mesa3d/Config.in diff --git a/package/gpu/img-mesa3d/img-mesa3d.hash b/package/batocera/gpu/img-mesa3d/img-mesa3d.hash similarity index 100% rename from package/gpu/img-mesa3d/img-mesa3d.hash rename to package/batocera/gpu/img-mesa3d/img-mesa3d.hash diff --git a/package/gpu/img-mesa3d/img-mesa3d.mk b/package/batocera/gpu/img-mesa3d/img-mesa3d.mk similarity index 100% rename from package/gpu/img-mesa3d/img-mesa3d.mk rename to package/batocera/gpu/img-mesa3d/img-mesa3d.mk diff --git a/package/gpu/intel-clc/001-fix-build.patch b/package/batocera/gpu/intel-clc/001-fix-build.patch similarity index 100% rename from package/gpu/intel-clc/001-fix-build.patch rename to package/batocera/gpu/intel-clc/001-fix-build.patch diff --git a/package/gpu/intel-clc/Config.in b/package/batocera/gpu/intel-clc/Config.in similarity index 100% rename from package/gpu/intel-clc/Config.in rename to package/batocera/gpu/intel-clc/Config.in diff --git a/package/gpu/intel-clc/intel-clc.mk b/package/batocera/gpu/intel-clc/intel-clc.mk similarity index 100% rename from package/gpu/intel-clc/intel-clc.mk rename to package/batocera/gpu/intel-clc/intel-clc.mk diff --git a/package/gpu/libmali/Config.in b/package/batocera/gpu/libmali/Config.in similarity index 100% rename from package/gpu/libmali/Config.in rename to package/batocera/gpu/libmali/Config.in diff --git a/package/gpu/libmali/mali.mk b/package/batocera/gpu/libmali/mali.mk similarity index 100% rename from package/gpu/libmali/mali.mk rename to package/batocera/gpu/libmali/mali.mk diff --git a/package/gpu/mali-G31/Config.in b/package/batocera/gpu/mali-G31/Config.in similarity index 100% rename from package/gpu/mali-G31/Config.in rename to package/batocera/gpu/mali-G31/Config.in diff --git a/package/gpu/mali-G31/mali-G31.mk b/package/batocera/gpu/mali-G31/mali-G31.mk similarity index 100% rename from package/gpu/mali-G31/mali-G31.mk rename to package/batocera/gpu/mali-G31/mali-G31.mk diff --git a/package/gpu/mali-G52/Config.in b/package/batocera/gpu/mali-G52/Config.in similarity index 100% rename from package/gpu/mali-G52/Config.in rename to package/batocera/gpu/mali-G52/Config.in diff --git a/package/gpu/mali-G52/mali-G52.mk b/package/batocera/gpu/mali-G52/mali-G52.mk similarity index 100% rename from package/gpu/mali-G52/mali-G52.mk rename to package/batocera/gpu/mali-G52/mali-G52.mk diff --git a/package/gpu/mali-g31-gbm/001-gbm.patch b/package/batocera/gpu/mali-g31-gbm/001-gbm.patch similarity index 100% rename from package/gpu/mali-g31-gbm/001-gbm.patch rename to package/batocera/gpu/mali-g31-gbm/001-gbm.patch diff --git a/package/gpu/mali-g31-gbm/Config.in b/package/batocera/gpu/mali-g31-gbm/Config.in similarity index 100% rename from package/gpu/mali-g31-gbm/Config.in rename to package/batocera/gpu/mali-g31-gbm/Config.in diff --git a/package/gpu/mali-g31-gbm/mali-g31-gbm.hash b/package/batocera/gpu/mali-g31-gbm/mali-g31-gbm.hash similarity index 100% rename from package/gpu/mali-g31-gbm/mali-g31-gbm.hash rename to package/batocera/gpu/mali-g31-gbm/mali-g31-gbm.hash diff --git a/package/gpu/mali-g31-gbm/mali-g31-gbm.mk b/package/batocera/gpu/mali-g31-gbm/mali-g31-gbm.mk similarity index 93% rename from package/gpu/mali-g31-gbm/mali-g31-gbm.mk rename to package/batocera/gpu/mali-g31-gbm/mali-g31-gbm.mk index 4060ff2b80e..a4d520ff964 100644 --- a/package/gpu/mali-g31-gbm/mali-g31-gbm.mk +++ b/package/batocera/gpu/mali-g31-gbm/mali-g31-gbm.mk @@ -45,7 +45,7 @@ define MALI_G31_GBM_RK3326_INSTALL # Install Vulkan driver as ICD through vulkan-loader mkdir -p $(TARGET_DIR)/usr/share/vulkan/icd.d - $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/gpu/mali-g31-gbm/mali_icd.json $(TARGET_DIR)/usr/share/vulkan/icd.d/ + $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/gpu/mali-g31-gbm/mali_icd.json $(TARGET_DIR)/usr/share/vulkan/icd.d/ # Ugly workaround to fix duckstation compilation rm $(STAGING_DIR)/usr/lib/libEGL.so diff --git a/package/gpu/mali-g31-gbm/mali_icd.json b/package/batocera/gpu/mali-g31-gbm/mali_icd.json similarity index 100% rename from package/gpu/mali-g31-gbm/mali_icd.json rename to package/batocera/gpu/mali-g31-gbm/mali_icd.json diff --git a/package/gpu/mali-mp400-gbm/001-add-EGL_NO_X11_eglplatform.patch b/package/batocera/gpu/mali-mp400-gbm/001-add-EGL_NO_X11_eglplatform.patch similarity index 100% rename from package/gpu/mali-mp400-gbm/001-add-EGL_NO_X11_eglplatform.patch rename to package/batocera/gpu/mali-mp400-gbm/001-add-EGL_NO_X11_eglplatform.patch diff --git a/package/gpu/mali-mp400-gbm/Config.in b/package/batocera/gpu/mali-mp400-gbm/Config.in similarity index 100% rename from package/gpu/mali-mp400-gbm/Config.in rename to package/batocera/gpu/mali-mp400-gbm/Config.in diff --git a/package/gpu/mali-mp400-gbm/mali-mp400-gbm.mk b/package/batocera/gpu/mali-mp400-gbm/mali-mp400-gbm.mk similarity index 94% rename from package/gpu/mali-mp400-gbm/mali-mp400-gbm.mk rename to package/batocera/gpu/mali-mp400-gbm/mali-mp400-gbm.mk index 2a2cf99a03d..e3ad506bea2 100644 --- a/package/gpu/mali-mp400-gbm/mali-mp400-gbm.mk +++ b/package/batocera/gpu/mali-mp400-gbm/mali-mp400-gbm.mk @@ -37,7 +37,7 @@ define MALI_MP400_GBM_INSTALL_STAGING_CMDS for X in gbm egl glesv1_cm glesv2; \ do \ - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/gpu/mali-mp400-gbm/pkgconfig/$${X}.pc.cmake $(STAGING_DIR)/usr/lib/pkgconfig/$${X}.pc; \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/gpu/mali-mp400-gbm/pkgconfig/$${X}.pc.cmake $(STAGING_DIR)/usr/lib/pkgconfig/$${X}.pc; \ sed -i -e s+@CMAKE_INSTALL_INCLUDEDIR@+include+g $(STAGING_DIR)/usr/lib/pkgconfig/$${X}.pc; \ sed -i -e s+@CMAKE_INSTALL_LIBDIR@+lib+g $(STAGING_DIR)/usr/lib/pkgconfig/$${X}.pc; \ done @@ -47,7 +47,7 @@ endef define MALI_MP400_GBM_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/lib - + cp $(@D)/lib/arm-linux-gnueabihf/libmali-utgard-400-r7p0-r1p1-gbm.so \ $(TARGET_DIR)/usr/lib/libmali.so diff --git a/package/gpu/mali-mp400-gbm/pkgconfig/egl.pc.cmake b/package/batocera/gpu/mali-mp400-gbm/pkgconfig/egl.pc.cmake similarity index 100% rename from package/gpu/mali-mp400-gbm/pkgconfig/egl.pc.cmake rename to package/batocera/gpu/mali-mp400-gbm/pkgconfig/egl.pc.cmake diff --git a/package/gpu/mali-mp400-gbm/pkgconfig/gbm.pc.cmake b/package/batocera/gpu/mali-mp400-gbm/pkgconfig/gbm.pc.cmake similarity index 100% rename from package/gpu/mali-mp400-gbm/pkgconfig/gbm.pc.cmake rename to package/batocera/gpu/mali-mp400-gbm/pkgconfig/gbm.pc.cmake diff --git a/package/gpu/mali-mp400-gbm/pkgconfig/glesv1_cm.pc.cmake b/package/batocera/gpu/mali-mp400-gbm/pkgconfig/glesv1_cm.pc.cmake similarity index 100% rename from package/gpu/mali-mp400-gbm/pkgconfig/glesv1_cm.pc.cmake rename to package/batocera/gpu/mali-mp400-gbm/pkgconfig/glesv1_cm.pc.cmake diff --git a/package/gpu/mali-mp400-gbm/pkgconfig/glesv2.pc.cmake b/package/batocera/gpu/mali-mp400-gbm/pkgconfig/glesv2.pc.cmake similarity index 100% rename from package/gpu/mali-mp400-gbm/pkgconfig/glesv2.pc.cmake rename to package/batocera/gpu/mali-mp400-gbm/pkgconfig/glesv2.pc.cmake diff --git a/package/gpu/mali-mp400-wayland/001-add-EGL_NO_X11_eglplatform.patch b/package/batocera/gpu/mali-mp400-wayland/001-add-EGL_NO_X11_eglplatform.patch similarity index 100% rename from package/gpu/mali-mp400-wayland/001-add-EGL_NO_X11_eglplatform.patch rename to package/batocera/gpu/mali-mp400-wayland/001-add-EGL_NO_X11_eglplatform.patch diff --git a/package/gpu/mali-mp400-wayland/Config.in b/package/batocera/gpu/mali-mp400-wayland/Config.in similarity index 100% rename from package/gpu/mali-mp400-wayland/Config.in rename to package/batocera/gpu/mali-mp400-wayland/Config.in diff --git a/package/gpu/mali-mp400-wayland/mali-mp400-wayland.mk b/package/batocera/gpu/mali-mp400-wayland/mali-mp400-wayland.mk similarity index 94% rename from package/gpu/mali-mp400-wayland/mali-mp400-wayland.mk rename to package/batocera/gpu/mali-mp400-wayland/mali-mp400-wayland.mk index 4476ed1bf7a..7cc9cea84d5 100644 --- a/package/gpu/mali-mp400-wayland/mali-mp400-wayland.mk +++ b/package/batocera/gpu/mali-mp400-wayland/mali-mp400-wayland.mk @@ -37,7 +37,7 @@ define MALI_MP400_WAYLAND_INSTALL_STAGING_CMDS for X in gbm egl glesv1_cm glesv2; \ do \ - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/gpu/mali-mp400-wayland/pkgconfig/$${X}.pc.cmake $(STAGING_DIR)/usr/lib/pkgconfig/$${X}.pc; \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/gpu/mali-mp400-wayland/pkgconfig/$${X}.pc.cmake $(STAGING_DIR)/usr/lib/pkgconfig/$${X}.pc; \ sed -i -e s+@CMAKE_INSTALL_INCLUDEDIR@+include+g $(STAGING_DIR)/usr/lib/pkgconfig/$${X}.pc; \ sed -i -e s+@CMAKE_INSTALL_LIBDIR@+lib+g $(STAGING_DIR)/usr/lib/pkgconfig/$${X}.pc; \ done @@ -47,7 +47,7 @@ endef define MALI_MP400_WAYLAND_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/lib - + cp $(@D)/lib/arm-linux-gnueabihf/libmali-utgard-400-r7p0-r1p1-wayland.so \ $(TARGET_DIR)/usr/lib/libmali.so diff --git a/package/gpu/mali-mp400-wayland/pkgconfig/egl.pc.cmake b/package/batocera/gpu/mali-mp400-wayland/pkgconfig/egl.pc.cmake similarity index 100% rename from package/gpu/mali-mp400-wayland/pkgconfig/egl.pc.cmake rename to package/batocera/gpu/mali-mp400-wayland/pkgconfig/egl.pc.cmake diff --git a/package/gpu/mali-mp400-wayland/pkgconfig/gbm.pc.cmake b/package/batocera/gpu/mali-mp400-wayland/pkgconfig/gbm.pc.cmake similarity index 100% rename from package/gpu/mali-mp400-wayland/pkgconfig/gbm.pc.cmake rename to package/batocera/gpu/mali-mp400-wayland/pkgconfig/gbm.pc.cmake diff --git a/package/gpu/mali-mp400-wayland/pkgconfig/glesv1_cm.pc.cmake b/package/batocera/gpu/mali-mp400-wayland/pkgconfig/glesv1_cm.pc.cmake similarity index 100% rename from package/gpu/mali-mp400-wayland/pkgconfig/glesv1_cm.pc.cmake rename to package/batocera/gpu/mali-mp400-wayland/pkgconfig/glesv1_cm.pc.cmake diff --git a/package/gpu/mali-mp400-wayland/pkgconfig/glesv2.pc.cmake b/package/batocera/gpu/mali-mp400-wayland/pkgconfig/glesv2.pc.cmake similarity index 100% rename from package/gpu/mali-mp400-wayland/pkgconfig/glesv2.pc.cmake rename to package/batocera/gpu/mali-mp400-wayland/pkgconfig/glesv2.pc.cmake diff --git a/package/gpu/nv-codec-headers/Config.in b/package/batocera/gpu/nv-codec-headers/Config.in similarity index 100% rename from package/gpu/nv-codec-headers/Config.in rename to package/batocera/gpu/nv-codec-headers/Config.in diff --git a/package/gpu/nv-codec-headers/nv-codec-headers.mk b/package/batocera/gpu/nv-codec-headers/nv-codec-headers.mk similarity index 100% rename from package/gpu/nv-codec-headers/nv-codec-headers.mk rename to package/batocera/gpu/nv-codec-headers/nv-codec-headers.mk diff --git a/package/gpu/rockchip-mpp/Config.in b/package/batocera/gpu/rockchip-mpp/Config.in similarity index 100% rename from package/gpu/rockchip-mpp/Config.in rename to package/batocera/gpu/rockchip-mpp/Config.in diff --git a/package/gpu/rockchip-mpp/rkmpp-0001-fix-32-bit-mmap-issue-on-64-bit-kernels.patch b/package/batocera/gpu/rockchip-mpp/rkmpp-0001-fix-32-bit-mmap-issue-on-64-bit-kernels.patch similarity index 100% rename from package/gpu/rockchip-mpp/rkmpp-0001-fix-32-bit-mmap-issue-on-64-bit-kernels.patch rename to package/batocera/gpu/rockchip-mpp/rkmpp-0001-fix-32-bit-mmap-issue-on-64-bit-kernels.patch diff --git a/package/gpu/rockchip-mpp/rockchip-mpp.mk b/package/batocera/gpu/rockchip-mpp/rockchip-mpp.mk similarity index 100% rename from package/gpu/rockchip-mpp/rockchip-mpp.mk rename to package/batocera/gpu/rockchip-mpp/rockchip-mpp.mk diff --git a/package/gpu/rockchip-rga/Config.in b/package/batocera/gpu/rockchip-rga/Config.in similarity index 100% rename from package/gpu/rockchip-rga/Config.in rename to package/batocera/gpu/rockchip-rga/Config.in diff --git a/package/gpu/rockchip-rga/rockchip-rga.mk b/package/batocera/gpu/rockchip-rga/rockchip-rga.mk similarity index 100% rename from package/gpu/rockchip-rga/rockchip-rga.mk rename to package/batocera/gpu/rockchip-rga/rockchip-rga.mk diff --git a/package/gpu/vulkan/glslang/001-fix-headers.patch b/package/batocera/gpu/vulkan/glslang/001-fix-headers.patch similarity index 100% rename from package/gpu/vulkan/glslang/001-fix-headers.patch rename to package/batocera/gpu/vulkan/glslang/001-fix-headers.patch diff --git a/package/gpu/vulkan/glslang/Config.in b/package/batocera/gpu/vulkan/glslang/Config.in similarity index 100% rename from package/gpu/vulkan/glslang/Config.in rename to package/batocera/gpu/vulkan/glslang/Config.in diff --git a/package/gpu/vulkan/glslang/glslang.mk b/package/batocera/gpu/vulkan/glslang/glslang.mk similarity index 100% rename from package/gpu/vulkan/glslang/glslang.mk rename to package/batocera/gpu/vulkan/glslang/glslang.mk diff --git a/package/gpu/vulkan/spirv-cross/Config.in b/package/batocera/gpu/vulkan/spirv-cross/Config.in similarity index 100% rename from package/gpu/vulkan/spirv-cross/Config.in rename to package/batocera/gpu/vulkan/spirv-cross/Config.in diff --git a/package/gpu/vulkan/spirv-cross/spirv-cross.mk b/package/batocera/gpu/vulkan/spirv-cross/spirv-cross.mk similarity index 100% rename from package/gpu/vulkan/spirv-cross/spirv-cross.mk rename to package/batocera/gpu/vulkan/spirv-cross/spirv-cross.mk diff --git a/package/gpu/vulkan/vulkan-samples/Config.in b/package/batocera/gpu/vulkan/vulkan-samples/Config.in similarity index 100% rename from package/gpu/vulkan/vulkan-samples/Config.in rename to package/batocera/gpu/vulkan/vulkan-samples/Config.in diff --git a/package/gpu/vulkan/vulkan-samples/vulkan-samples.mk b/package/batocera/gpu/vulkan/vulkan-samples/vulkan-samples.mk similarity index 100% rename from package/gpu/vulkan/vulkan-samples/vulkan-samples.mk rename to package/batocera/gpu/vulkan/vulkan-samples/vulkan-samples.mk diff --git a/package/leds/ayaneo-platform/001-kernel-6.10.patch b/package/batocera/leds/ayaneo-platform/001-kernel-6.10.patch similarity index 100% rename from package/leds/ayaneo-platform/001-kernel-6.10.patch rename to package/batocera/leds/ayaneo-platform/001-kernel-6.10.patch diff --git a/package/leds/ayaneo-platform/Config.in b/package/batocera/leds/ayaneo-platform/Config.in similarity index 100% rename from package/leds/ayaneo-platform/Config.in rename to package/batocera/leds/ayaneo-platform/Config.in diff --git a/package/leds/ayaneo-platform/ayaneo-platform.mk b/package/batocera/leds/ayaneo-platform/ayaneo-platform.mk similarity index 100% rename from package/leds/ayaneo-platform/ayaneo-platform.mk rename to package/batocera/leds/ayaneo-platform/ayaneo-platform.mk diff --git a/package/leds/ayn-platform/001-kernel-6.10.patch b/package/batocera/leds/ayn-platform/001-kernel-6.10.patch similarity index 100% rename from package/leds/ayn-platform/001-kernel-6.10.patch rename to package/batocera/leds/ayn-platform/001-kernel-6.10.patch diff --git a/package/leds/ayn-platform/Config.in b/package/batocera/leds/ayn-platform/Config.in similarity index 100% rename from package/leds/ayn-platform/Config.in rename to package/batocera/leds/ayn-platform/Config.in diff --git a/package/leds/ayn-platform/ayn-platform.mk b/package/batocera/leds/ayn-platform/ayn-platform.mk similarity index 100% rename from package/leds/ayn-platform/ayn-platform.mk rename to package/batocera/leds/ayn-platform/ayn-platform.mk diff --git a/package/libraries/cargs/Config.in b/package/batocera/libraries/cargs/Config.in similarity index 100% rename from package/libraries/cargs/Config.in rename to package/batocera/libraries/cargs/Config.in diff --git a/package/libraries/cargs/cargs.mk b/package/batocera/libraries/cargs/cargs.mk similarity index 100% rename from package/libraries/cargs/cargs.mk rename to package/batocera/libraries/cargs/cargs.mk diff --git a/package/libraries/ecm/Config.in b/package/batocera/libraries/ecm/Config.in similarity index 100% rename from package/libraries/ecm/Config.in rename to package/batocera/libraries/ecm/Config.in diff --git a/package/libraries/ecm/ecm.mk b/package/batocera/libraries/ecm/ecm.mk similarity index 100% rename from package/libraries/ecm/ecm.mk rename to package/batocera/libraries/ecm/ecm.mk diff --git a/package/libraries/faudio/001-enable-pie.patch b/package/batocera/libraries/faudio/001-enable-pie.patch similarity index 100% rename from package/libraries/faudio/001-enable-pie.patch rename to package/batocera/libraries/faudio/001-enable-pie.patch diff --git a/package/libraries/faudio/Config.in b/package/batocera/libraries/faudio/Config.in similarity index 100% rename from package/libraries/faudio/Config.in rename to package/batocera/libraries/faudio/Config.in diff --git a/package/libraries/faudio/faudio.mk b/package/batocera/libraries/faudio/faudio.mk similarity index 100% rename from package/libraries/faudio/faudio.mk rename to package/batocera/libraries/faudio/faudio.mk diff --git a/package/libraries/ffmpeg-python/Config.in b/package/batocera/libraries/ffmpeg-python/Config.in similarity index 100% rename from package/libraries/ffmpeg-python/Config.in rename to package/batocera/libraries/ffmpeg-python/Config.in diff --git a/package/libraries/ffmpeg-python/ffmpeg-python.mk b/package/batocera/libraries/ffmpeg-python/ffmpeg-python.mk similarity index 100% rename from package/libraries/ffmpeg-python/ffmpeg-python.mk rename to package/batocera/libraries/ffmpeg-python/ffmpeg-python.mk diff --git a/package/libraries/iir/Config.in b/package/batocera/libraries/iir/Config.in similarity index 100% rename from package/libraries/iir/Config.in rename to package/batocera/libraries/iir/Config.in diff --git a/package/libraries/iir/iir.mk b/package/batocera/libraries/iir/iir.mk similarity index 100% rename from package/libraries/iir/iir.mk rename to package/batocera/libraries/iir/iir.mk diff --git a/package/libraries/libaltsound/Config.in b/package/batocera/libraries/libaltsound/Config.in similarity index 100% rename from package/libraries/libaltsound/Config.in rename to package/batocera/libraries/libaltsound/Config.in diff --git a/package/libraries/libaltsound/libaltsound.mk b/package/batocera/libraries/libaltsound/libaltsound.mk similarity index 100% rename from package/libraries/libaltsound/libaltsound.mk rename to package/batocera/libraries/libaltsound/libaltsound.mk diff --git a/package/libraries/libcapsimage/Config.in b/package/batocera/libraries/libcapsimage/Config.in similarity index 100% rename from package/libraries/libcapsimage/Config.in rename to package/batocera/libraries/libcapsimage/Config.in diff --git a/package/libraries/libcapsimage/libcapsimage.mk b/package/batocera/libraries/libcapsimage/libcapsimage.mk similarity index 100% rename from package/libraries/libcapsimage/libcapsimage.mk rename to package/batocera/libraries/libcapsimage/libcapsimage.mk diff --git a/package/libraries/libdmdutil/99-pixelcade.rules b/package/batocera/libraries/libdmdutil/99-pixelcade.rules similarity index 100% rename from package/libraries/libdmdutil/99-pixelcade.rules rename to package/batocera/libraries/libdmdutil/99-pixelcade.rules diff --git a/package/libraries/libdmdutil/Config.in b/package/batocera/libraries/libdmdutil/Config.in similarity index 100% rename from package/libraries/libdmdutil/Config.in rename to package/batocera/libraries/libdmdutil/Config.in diff --git a/package/libraries/libdmdutil/dmd_server.service b/package/batocera/libraries/libdmdutil/dmd_server.service similarity index 100% rename from package/libraries/libdmdutil/dmd_server.service rename to package/batocera/libraries/libdmdutil/dmd_server.service diff --git a/package/libraries/libdmdutil/dmdserver-config.py b/package/batocera/libraries/libdmdutil/dmdserver-config.py similarity index 100% rename from package/libraries/libdmdutil/dmdserver-config.py rename to package/batocera/libraries/libdmdutil/dmdserver-config.py diff --git a/package/libraries/libdmdutil/libdmdutil.mk b/package/batocera/libraries/libdmdutil/libdmdutil.mk similarity index 70% rename from package/libraries/libdmdutil/libdmdutil.mk rename to package/batocera/libraries/libdmdutil/libdmdutil.mk index 037ba8c4410..82387622176 100644 --- a/package/libraries/libdmdutil/libdmdutil.mk +++ b/package/batocera/libraries/libdmdutil/libdmdutil.mk @@ -37,11 +37,11 @@ define LIBDMDUTIL_INSTALL_SERVER $(INSTALL) -D -m 0755 $(LIBDMDUTIL_BUILDDIR)/dmdserver $(TARGET_DIR)/usr/bin/dmdserver mkdir -p $(TARGET_DIR)/usr/share/reglinux/services - install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/libraries/libdmdutil/dmd_server.service $(TARGET_DIR)/usr/share/reglinux/services/dmd_real - install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/libraries/libdmdutil/dmdserver-config.py $(TARGET_DIR)/usr/bin/dmdserver-config + install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/libraries/libdmdutil/dmd_server.service $(TARGET_DIR)/usr/share/reglinux/services/dmd_real + install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/libraries/libdmdutil/dmdserver-config.py $(TARGET_DIR)/usr/bin/dmdserver-config # pixelcade - install -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/libraries/libdmdutil/99-pixelcade.rules $(TARGET_DIR)/etc/udev/rules.d/99-pixelcade.rules - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/libraries/libdmdutil/pixelcade-add $(TARGET_DIR)/usr/bin/pixelcade-add + install -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/libraries/libdmdutil/99-pixelcade.rules $(TARGET_DIR)/etc/udev/rules.d/99-pixelcade.rules + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/libraries/libdmdutil/pixelcade-add $(TARGET_DIR)/usr/bin/pixelcade-add endef LIBDMDUTIL_POST_INSTALL_TARGET_HOOKS += LIBDMDUTIL_INSTALL_SERVER diff --git a/package/libraries/libdmdutil/pixelcade-add b/package/batocera/libraries/libdmdutil/pixelcade-add similarity index 100% rename from package/libraries/libdmdutil/pixelcade-add rename to package/batocera/libraries/libdmdutil/pixelcade-add diff --git a/package/libraries/libdof/Config.in b/package/batocera/libraries/libdof/Config.in similarity index 100% rename from package/libraries/libdof/Config.in rename to package/batocera/libraries/libdof/Config.in diff --git a/package/libraries/libdof/libdof.mk b/package/batocera/libraries/libdof/libdof.mk similarity index 100% rename from package/libraries/libdof/libdof.mk rename to package/batocera/libraries/libdof/libdof.mk diff --git a/package/libraries/libenet/Config.in b/package/batocera/libraries/libenet/Config.in similarity index 100% rename from package/libraries/libenet/Config.in rename to package/batocera/libraries/libenet/Config.in diff --git a/package/libraries/libenet/libenet.mk b/package/batocera/libraries/libenet/libenet.mk similarity index 100% rename from package/libraries/libenet/libenet.mk rename to package/batocera/libraries/libenet/libenet.mk diff --git a/package/libraries/libgraphene/Config.in b/package/batocera/libraries/libgraphene/Config.in similarity index 100% rename from package/libraries/libgraphene/Config.in rename to package/batocera/libraries/libgraphene/Config.in diff --git a/package/libraries/libgraphene/libgraphene.mk b/package/batocera/libraries/libgraphene/libgraphene.mk similarity index 100% rename from package/libraries/libgraphene/libgraphene.mk rename to package/batocera/libraries/libgraphene/libgraphene.mk diff --git a/package/libraries/libjpeg-bato/Config.in b/package/batocera/libraries/libjpeg-bato/Config.in similarity index 100% rename from package/libraries/libjpeg-bato/Config.in rename to package/batocera/libraries/libjpeg-bato/Config.in diff --git a/package/libraries/libjpeg-bato/libjpeg-bato.hash b/package/batocera/libraries/libjpeg-bato/libjpeg-bato.hash similarity index 100% rename from package/libraries/libjpeg-bato/libjpeg-bato.hash rename to package/batocera/libraries/libjpeg-bato/libjpeg-bato.hash diff --git a/package/libraries/libjpeg-bato/libjpeg-bato.mk b/package/batocera/libraries/libjpeg-bato/libjpeg-bato.mk similarity index 100% rename from package/libraries/libjpeg-bato/libjpeg-bato.mk rename to package/batocera/libraries/libjpeg-bato/libjpeg-bato.mk diff --git a/package/libraries/liblgpio/Config.in b/package/batocera/libraries/liblgpio/Config.in similarity index 100% rename from package/libraries/liblgpio/Config.in rename to package/batocera/libraries/liblgpio/Config.in diff --git a/package/libraries/liblgpio/liblgpio.mk b/package/batocera/libraries/liblgpio/liblgpio.mk similarity index 100% rename from package/libraries/liblgpio/liblgpio.mk rename to package/batocera/libraries/liblgpio/liblgpio.mk diff --git a/package/libraries/libliftoff/Config.in b/package/batocera/libraries/libliftoff/Config.in similarity index 100% rename from package/libraries/libliftoff/Config.in rename to package/batocera/libraries/libliftoff/Config.in diff --git a/package/libraries/libliftoff/libliftoff.hash b/package/batocera/libraries/libliftoff/libliftoff.hash similarity index 100% rename from package/libraries/libliftoff/libliftoff.hash rename to package/batocera/libraries/libliftoff/libliftoff.hash diff --git a/package/libraries/libliftoff/libliftoff.mk b/package/batocera/libraries/libliftoff/libliftoff.mk similarity index 100% rename from package/libraries/libliftoff/libliftoff.mk rename to package/batocera/libraries/libliftoff/libliftoff.mk diff --git a/package/libraries/libopenmpt/Config.in b/package/batocera/libraries/libopenmpt/Config.in similarity index 100% rename from package/libraries/libopenmpt/Config.in rename to package/batocera/libraries/libopenmpt/Config.in diff --git a/package/libraries/libopenmpt/libopenmpt.hash b/package/batocera/libraries/libopenmpt/libopenmpt.hash similarity index 100% rename from package/libraries/libopenmpt/libopenmpt.hash rename to package/batocera/libraries/libopenmpt/libopenmpt.hash diff --git a/package/libraries/libopenmpt/libopenmpt.mk b/package/batocera/libraries/libopenmpt/libopenmpt.mk similarity index 100% rename from package/libraries/libopenmpt/libopenmpt.mk rename to package/batocera/libraries/libopenmpt/libopenmpt.mk diff --git a/package/libraries/libpinmame/Config.in b/package/batocera/libraries/libpinmame/Config.in similarity index 100% rename from package/libraries/libpinmame/Config.in rename to package/batocera/libraries/libpinmame/Config.in diff --git a/package/libraries/libpinmame/libpinmame.mk b/package/batocera/libraries/libpinmame/libpinmame.mk similarity index 100% rename from package/libraries/libpinmame/libpinmame.mk rename to package/batocera/libraries/libpinmame/libpinmame.mk diff --git a/package/libraries/libportmidi/Config.in b/package/batocera/libraries/libportmidi/Config.in similarity index 100% rename from package/libraries/libportmidi/Config.in rename to package/batocera/libraries/libportmidi/Config.in diff --git a/package/libraries/libportmidi/libportmidi.mk b/package/batocera/libraries/libportmidi/libportmidi.mk similarity index 100% rename from package/libraries/libportmidi/libportmidi.mk rename to package/batocera/libraries/libportmidi/libportmidi.mk diff --git a/package/libraries/libpupdmd/Config.in b/package/batocera/libraries/libpupdmd/Config.in similarity index 100% rename from package/libraries/libpupdmd/Config.in rename to package/batocera/libraries/libpupdmd/Config.in diff --git a/package/libraries/libpupdmd/libpupdmd.mk b/package/batocera/libraries/libpupdmd/libpupdmd.mk similarity index 100% rename from package/libraries/libpupdmd/libpupdmd.mk rename to package/batocera/libraries/libpupdmd/libpupdmd.mk diff --git a/package/libraries/libserum/Config.in b/package/batocera/libraries/libserum/Config.in similarity index 100% rename from package/libraries/libserum/Config.in rename to package/batocera/libraries/libserum/Config.in diff --git a/package/libraries/libserum/libserum.mk b/package/batocera/libraries/libserum/libserum.mk similarity index 100% rename from package/libraries/libserum/libserum.mk rename to package/batocera/libraries/libserum/libserum.mk diff --git a/package/libraries/libxmp/Config.in b/package/batocera/libraries/libxmp/Config.in similarity index 100% rename from package/libraries/libxmp/Config.in rename to package/batocera/libraries/libxmp/Config.in diff --git a/package/libraries/libxmp/libxmp.mk b/package/batocera/libraries/libxmp/libxmp.mk similarity index 100% rename from package/libraries/libxmp/libxmp.mk rename to package/batocera/libraries/libxmp/libxmp.mk diff --git a/package/libraries/libzedmd/Config.in b/package/batocera/libraries/libzedmd/Config.in similarity index 100% rename from package/libraries/libzedmd/Config.in rename to package/batocera/libraries/libzedmd/Config.in diff --git a/package/libraries/libzedmd/libzedmd.mk b/package/batocera/libraries/libzedmd/libzedmd.mk similarity index 100% rename from package/libraries/libzedmd/libzedmd.mk rename to package/batocera/libraries/libzedmd/libzedmd.mk diff --git a/package/libraries/pm_auto/001-fix-dependency.patch b/package/batocera/libraries/pm_auto/001-fix-dependency.patch similarity index 100% rename from package/libraries/pm_auto/001-fix-dependency.patch rename to package/batocera/libraries/pm_auto/001-fix-dependency.patch diff --git a/package/libraries/pm_auto/Config.in b/package/batocera/libraries/pm_auto/Config.in similarity index 100% rename from package/libraries/pm_auto/Config.in rename to package/batocera/libraries/pm_auto/Config.in diff --git a/package/libraries/pm_auto/pm_auto.mk b/package/batocera/libraries/pm_auto/pm_auto.mk similarity index 100% rename from package/libraries/pm_auto/pm_auto.mk rename to package/batocera/libraries/pm_auto/pm_auto.mk diff --git a/package/libraries/pm_dashboard/001-fix-classifier.patch b/package/batocera/libraries/pm_dashboard/001-fix-classifier.patch similarity index 100% rename from package/libraries/pm_dashboard/001-fix-classifier.patch rename to package/batocera/libraries/pm_dashboard/001-fix-classifier.patch diff --git a/package/libraries/pm_dashboard/002-fix-deprecated-method.patch b/package/batocera/libraries/pm_dashboard/002-fix-deprecated-method.patch similarity index 100% rename from package/libraries/pm_dashboard/002-fix-deprecated-method.patch rename to package/batocera/libraries/pm_dashboard/002-fix-deprecated-method.patch diff --git a/package/libraries/pm_dashboard/003-fix-packages.patch b/package/batocera/libraries/pm_dashboard/003-fix-packages.patch similarity index 100% rename from package/libraries/pm_dashboard/003-fix-packages.patch rename to package/batocera/libraries/pm_dashboard/003-fix-packages.patch diff --git a/package/libraries/pm_dashboard/Config.in b/package/batocera/libraries/pm_dashboard/Config.in similarity index 100% rename from package/libraries/pm_dashboard/Config.in rename to package/batocera/libraries/pm_dashboard/Config.in diff --git a/package/libraries/pm_dashboard/pm_dashboard.mk b/package/batocera/libraries/pm_dashboard/pm_dashboard.mk similarity index 100% rename from package/libraries/pm_dashboard/pm_dashboard.mk rename to package/batocera/libraries/pm_dashboard/pm_dashboard.mk diff --git a/package/libraries/projectm/0001-Makefile.am-skip-the-sdl-tests.patch b/package/batocera/libraries/projectm/0001-Makefile.am-skip-the-sdl-tests.patch similarity index 100% rename from package/libraries/projectm/0001-Makefile.am-skip-the-sdl-tests.patch rename to package/batocera/libraries/projectm/0001-Makefile.am-skip-the-sdl-tests.patch diff --git a/package/libraries/projectm/0002-Configure.ac-Remove-pthreads-check.patch b/package/batocera/libraries/projectm/0002-Configure.ac-Remove-pthreads-check.patch similarity index 100% rename from package/libraries/projectm/0002-Configure.ac-Remove-pthreads-check.patch rename to package/batocera/libraries/projectm/0002-Configure.ac-Remove-pthreads-check.patch diff --git a/package/libraries/projectm/0003-SOIL2.c-Modified-to-respect-USE_GLES.patch b/package/batocera/libraries/projectm/0003-SOIL2.c-Modified-to-respect-USE_GLES.patch similarity index 100% rename from package/libraries/projectm/0003-SOIL2.c-Modified-to-respect-USE_GLES.patch rename to package/batocera/libraries/projectm/0003-SOIL2.c-Modified-to-respect-USE_GLES.patch diff --git a/package/libraries/projectm/Config.in b/package/batocera/libraries/projectm/Config.in similarity index 100% rename from package/libraries/projectm/Config.in rename to package/batocera/libraries/projectm/Config.in diff --git a/package/libraries/projectm/projectm.mk b/package/batocera/libraries/projectm/projectm.mk similarity index 100% rename from package/libraries/projectm/projectm.mk rename to package/batocera/libraries/projectm/projectm.mk diff --git a/package/libraries/python-adafruit-blinka/Config.in b/package/batocera/libraries/python-adafruit-blinka/Config.in similarity index 100% rename from package/libraries/python-adafruit-blinka/Config.in rename to package/batocera/libraries/python-adafruit-blinka/Config.in diff --git a/package/libraries/python-adafruit-blinka/python-adafruit-blinka.mk b/package/batocera/libraries/python-adafruit-blinka/python-adafruit-blinka.mk similarity index 100% rename from package/libraries/python-adafruit-blinka/python-adafruit-blinka.mk rename to package/batocera/libraries/python-adafruit-blinka/python-adafruit-blinka.mk diff --git a/package/libraries/python-adafruit-circuitpython-busdevice/Config.in b/package/batocera/libraries/python-adafruit-circuitpython-busdevice/Config.in similarity index 100% rename from package/libraries/python-adafruit-circuitpython-busdevice/Config.in rename to package/batocera/libraries/python-adafruit-circuitpython-busdevice/Config.in diff --git a/package/libraries/python-adafruit-circuitpython-busdevice/python-adafruit-circuitpython-busdevice.mk b/package/batocera/libraries/python-adafruit-circuitpython-busdevice/python-adafruit-circuitpython-busdevice.mk similarity index 100% rename from package/libraries/python-adafruit-circuitpython-busdevice/python-adafruit-circuitpython-busdevice.mk rename to package/batocera/libraries/python-adafruit-circuitpython-busdevice/python-adafruit-circuitpython-busdevice.mk diff --git a/package/libraries/python-adafruit-circuitpython-connectionmanager/Config.in b/package/batocera/libraries/python-adafruit-circuitpython-connectionmanager/Config.in similarity index 100% rename from package/libraries/python-adafruit-circuitpython-connectionmanager/Config.in rename to package/batocera/libraries/python-adafruit-circuitpython-connectionmanager/Config.in diff --git a/package/libraries/python-adafruit-circuitpython-connectionmanager/python-adafruit-circuitpython-connectionmanager.mk b/package/batocera/libraries/python-adafruit-circuitpython-connectionmanager/python-adafruit-circuitpython-connectionmanager.mk similarity index 100% rename from package/libraries/python-adafruit-circuitpython-connectionmanager/python-adafruit-circuitpython-connectionmanager.mk rename to package/batocera/libraries/python-adafruit-circuitpython-connectionmanager/python-adafruit-circuitpython-connectionmanager.mk diff --git a/package/libraries/python-adafruit-circuitpython-neopixel-spi/Config.in b/package/batocera/libraries/python-adafruit-circuitpython-neopixel-spi/Config.in similarity index 100% rename from package/libraries/python-adafruit-circuitpython-neopixel-spi/Config.in rename to package/batocera/libraries/python-adafruit-circuitpython-neopixel-spi/Config.in diff --git a/package/libraries/python-adafruit-circuitpython-neopixel-spi/python-adafruit-circuitpython-neopixel-spi.mk b/package/batocera/libraries/python-adafruit-circuitpython-neopixel-spi/python-adafruit-circuitpython-neopixel-spi.mk similarity index 100% rename from package/libraries/python-adafruit-circuitpython-neopixel-spi/python-adafruit-circuitpython-neopixel-spi.mk rename to package/batocera/libraries/python-adafruit-circuitpython-neopixel-spi/python-adafruit-circuitpython-neopixel-spi.mk diff --git a/package/libraries/python-adafruit-circuitpython-pixelbuf/Config.in b/package/batocera/libraries/python-adafruit-circuitpython-pixelbuf/Config.in similarity index 100% rename from package/libraries/python-adafruit-circuitpython-pixelbuf/Config.in rename to package/batocera/libraries/python-adafruit-circuitpython-pixelbuf/Config.in diff --git a/package/libraries/python-adafruit-circuitpython-pixelbuf/python-adafruit-circuitpython-pixelbuf.mk b/package/batocera/libraries/python-adafruit-circuitpython-pixelbuf/python-adafruit-circuitpython-pixelbuf.mk similarity index 100% rename from package/libraries/python-adafruit-circuitpython-pixelbuf/python-adafruit-circuitpython-pixelbuf.mk rename to package/batocera/libraries/python-adafruit-circuitpython-pixelbuf/python-adafruit-circuitpython-pixelbuf.mk diff --git a/package/libraries/python-adafruit-circuitpython-requests/Config.in b/package/batocera/libraries/python-adafruit-circuitpython-requests/Config.in similarity index 100% rename from package/libraries/python-adafruit-circuitpython-requests/Config.in rename to package/batocera/libraries/python-adafruit-circuitpython-requests/Config.in diff --git a/package/libraries/python-adafruit-circuitpython-requests/python-adafruit-circuitpython-requests.mk b/package/batocera/libraries/python-adafruit-circuitpython-requests/python-adafruit-circuitpython-requests.mk similarity index 100% rename from package/libraries/python-adafruit-circuitpython-requests/python-adafruit-circuitpython-requests.mk rename to package/batocera/libraries/python-adafruit-circuitpython-requests/python-adafruit-circuitpython-requests.mk diff --git a/package/libraries/python-adafruit-circuitpython-typing/Config.in b/package/batocera/libraries/python-adafruit-circuitpython-typing/Config.in similarity index 100% rename from package/libraries/python-adafruit-circuitpython-typing/Config.in rename to package/batocera/libraries/python-adafruit-circuitpython-typing/Config.in diff --git a/package/libraries/python-adafruit-circuitpython-typing/python-adafruit-circuitpython-typing.mk b/package/batocera/libraries/python-adafruit-circuitpython-typing/python-adafruit-circuitpython-typing.mk similarity index 100% rename from package/libraries/python-adafruit-circuitpython-typing/python-adafruit-circuitpython-typing.mk rename to package/batocera/libraries/python-adafruit-circuitpython-typing/python-adafruit-circuitpython-typing.mk diff --git a/package/libraries/python-adafruit-circuitpython-ws2801/Config.in b/package/batocera/libraries/python-adafruit-circuitpython-ws2801/Config.in similarity index 100% rename from package/libraries/python-adafruit-circuitpython-ws2801/Config.in rename to package/batocera/libraries/python-adafruit-circuitpython-ws2801/Config.in diff --git a/package/libraries/python-adafruit-circuitpython-ws2801/python-adafruit-circuitpython-ws2801.hash b/package/batocera/libraries/python-adafruit-circuitpython-ws2801/python-adafruit-circuitpython-ws2801.hash similarity index 100% rename from package/libraries/python-adafruit-circuitpython-ws2801/python-adafruit-circuitpython-ws2801.hash rename to package/batocera/libraries/python-adafruit-circuitpython-ws2801/python-adafruit-circuitpython-ws2801.hash diff --git a/package/libraries/python-adafruit-circuitpython-ws2801/python-adafruit-circuitpython-ws2801.mk b/package/batocera/libraries/python-adafruit-circuitpython-ws2801/python-adafruit-circuitpython-ws2801.mk similarity index 100% rename from package/libraries/python-adafruit-circuitpython-ws2801/python-adafruit-circuitpython-ws2801.mk rename to package/batocera/libraries/python-adafruit-circuitpython-ws2801/python-adafruit-circuitpython-ws2801.mk diff --git a/package/libraries/python-adafruit-platformdetect/Config.in b/package/batocera/libraries/python-adafruit-platformdetect/Config.in similarity index 100% rename from package/libraries/python-adafruit-platformdetect/Config.in rename to package/batocera/libraries/python-adafruit-platformdetect/Config.in diff --git a/package/libraries/python-adafruit-platformdetect/python-adafruit-platformdetect.mk b/package/batocera/libraries/python-adafruit-platformdetect/python-adafruit-platformdetect.mk similarity index 100% rename from package/libraries/python-adafruit-platformdetect/python-adafruit-platformdetect.mk rename to package/batocera/libraries/python-adafruit-platformdetect/python-adafruit-platformdetect.mk diff --git a/package/libraries/python-adafruit-pureio/Config.in b/package/batocera/libraries/python-adafruit-pureio/Config.in similarity index 100% rename from package/libraries/python-adafruit-pureio/Config.in rename to package/batocera/libraries/python-adafruit-pureio/Config.in diff --git a/package/libraries/python-adafruit-pureio/python-adafruit-pureio.mk b/package/batocera/libraries/python-adafruit-pureio/python-adafruit-pureio.mk similarity index 100% rename from package/libraries/python-adafruit-pureio/python-adafruit-pureio.mk rename to package/batocera/libraries/python-adafruit-pureio/python-adafruit-pureio.mk diff --git a/package/libraries/python-autobreadcrumbs/Config.in b/package/batocera/libraries/python-autobreadcrumbs/Config.in similarity index 100% rename from package/libraries/python-autobreadcrumbs/Config.in rename to package/batocera/libraries/python-autobreadcrumbs/Config.in diff --git a/package/libraries/python-autobreadcrumbs/python-autobreadcrumbs.mk b/package/batocera/libraries/python-autobreadcrumbs/python-autobreadcrumbs.mk similarity index 100% rename from package/libraries/python-autobreadcrumbs/python-autobreadcrumbs.mk rename to package/batocera/libraries/python-autobreadcrumbs/python-autobreadcrumbs.mk diff --git a/package/libraries/python-autobreadcrumbs/python-autobreadcrumbs.mk.bak b/package/batocera/libraries/python-autobreadcrumbs/python-autobreadcrumbs.mk.bak similarity index 100% rename from package/libraries/python-autobreadcrumbs/python-autobreadcrumbs.mk.bak rename to package/batocera/libraries/python-autobreadcrumbs/python-autobreadcrumbs.mk.bak diff --git a/package/libraries/python-binho-host-adapter/Config.in b/package/batocera/libraries/python-binho-host-adapter/Config.in similarity index 100% rename from package/libraries/python-binho-host-adapter/Config.in rename to package/batocera/libraries/python-binho-host-adapter/Config.in diff --git a/package/libraries/python-binho-host-adapter/python-binho-host-adapter.mk b/package/batocera/libraries/python-binho-host-adapter/python-binho-host-adapter.mk similarity index 100% rename from package/libraries/python-binho-host-adapter/python-binho-host-adapter.mk rename to package/batocera/libraries/python-binho-host-adapter/python-binho-host-adapter.mk diff --git a/package/libraries/python-hidapi/Config.in b/package/batocera/libraries/python-hidapi/Config.in similarity index 100% rename from package/libraries/python-hidapi/Config.in rename to package/batocera/libraries/python-hidapi/Config.in diff --git a/package/libraries/python-hidapi/python-hidapi.mk b/package/batocera/libraries/python-hidapi/python-hidapi.mk similarity index 100% rename from package/libraries/python-hidapi/python-hidapi.mk rename to package/batocera/libraries/python-hidapi/python-hidapi.mk diff --git a/package/libraries/python-lgpio/Config.in b/package/batocera/libraries/python-lgpio/Config.in similarity index 100% rename from package/libraries/python-lgpio/Config.in rename to package/batocera/libraries/python-lgpio/Config.in diff --git a/package/libraries/python-lgpio/python-lgpio.mk b/package/batocera/libraries/python-lgpio/python-lgpio.mk similarity index 100% rename from package/libraries/python-lgpio/python-lgpio.mk rename to package/batocera/libraries/python-lgpio/python-lgpio.mk diff --git a/package/libraries/python-proxy-tools/Config.in b/package/batocera/libraries/python-proxy-tools/Config.in similarity index 100% rename from package/libraries/python-proxy-tools/Config.in rename to package/batocera/libraries/python-proxy-tools/Config.in diff --git a/package/libraries/python-proxy-tools/python-proxy-tools.mk b/package/batocera/libraries/python-proxy-tools/python-proxy-tools.mk similarity index 100% rename from package/libraries/python-proxy-tools/python-proxy-tools.mk rename to package/batocera/libraries/python-proxy-tools/python-proxy-tools.mk diff --git a/package/libraries/python-pyftdi/Config.in b/package/batocera/libraries/python-pyftdi/Config.in similarity index 100% rename from package/libraries/python-pyftdi/Config.in rename to package/batocera/libraries/python-pyftdi/Config.in diff --git a/package/libraries/python-pyftdi/python-pyftdi.hash b/package/batocera/libraries/python-pyftdi/python-pyftdi.hash similarity index 100% rename from package/libraries/python-pyftdi/python-pyftdi.hash rename to package/batocera/libraries/python-pyftdi/python-pyftdi.hash diff --git a/package/libraries/python-pyftdi/python-pyftdi.mk b/package/batocera/libraries/python-pyftdi/python-pyftdi.mk similarity index 100% rename from package/libraries/python-pyftdi/python-pyftdi.mk rename to package/batocera/libraries/python-pyftdi/python-pyftdi.mk diff --git a/package/libraries/python-pyqt5-sip/Config.in b/package/batocera/libraries/python-pyqt5-sip/Config.in similarity index 100% rename from package/libraries/python-pyqt5-sip/Config.in rename to package/batocera/libraries/python-pyqt5-sip/Config.in diff --git a/package/libraries/python-pyqt5-sip/python-pyqt5-sip.mk b/package/batocera/libraries/python-pyqt5-sip/python-pyqt5-sip.mk similarity index 100% rename from package/libraries/python-pyqt5-sip/python-pyqt5-sip.mk rename to package/batocera/libraries/python-pyqt5-sip/python-pyqt5-sip.mk diff --git a/package/libraries/python-smbus2/Config.in b/package/batocera/libraries/python-smbus2/Config.in similarity index 100% rename from package/libraries/python-smbus2/Config.in rename to package/batocera/libraries/python-smbus2/Config.in diff --git a/package/libraries/python-smbus2/python-smbus2.mk b/package/batocera/libraries/python-smbus2/python-smbus2.mk similarity index 100% rename from package/libraries/python-smbus2/python-smbus2.mk rename to package/batocera/libraries/python-smbus2/python-smbus2.mk diff --git a/package/libraries/python-sysv-ipc/Config.in b/package/batocera/libraries/python-sysv-ipc/Config.in similarity index 100% rename from package/libraries/python-sysv-ipc/Config.in rename to package/batocera/libraries/python-sysv-ipc/Config.in diff --git a/package/libraries/python-sysv-ipc/python-sysv-ipc.hash b/package/batocera/libraries/python-sysv-ipc/python-sysv-ipc.hash similarity index 100% rename from package/libraries/python-sysv-ipc/python-sysv-ipc.hash rename to package/batocera/libraries/python-sysv-ipc/python-sysv-ipc.hash diff --git a/package/libraries/python-sysv-ipc/python-sysv-ipc.mk b/package/batocera/libraries/python-sysv-ipc/python-sysv-ipc.mk similarity index 100% rename from package/libraries/python-sysv-ipc/python-sysv-ipc.mk rename to package/batocera/libraries/python-sysv-ipc/python-sysv-ipc.mk diff --git a/package/libraries/python3-configobj/Config.in b/package/batocera/libraries/python3-configobj/Config.in similarity index 100% rename from package/libraries/python3-configobj/Config.in rename to package/batocera/libraries/python3-configobj/Config.in diff --git a/package/libraries/python3-configobj/python3-configobj.mk b/package/batocera/libraries/python3-configobj/python3-configobj.mk similarity index 100% rename from package/libraries/python3-configobj/python3-configobj.mk rename to package/batocera/libraries/python3-configobj/python3-configobj.mk diff --git a/package/libraries/python3-gpiod/Config.in b/package/batocera/libraries/python3-gpiod/Config.in similarity index 100% rename from package/libraries/python3-gpiod/Config.in rename to package/batocera/libraries/python3-gpiod/Config.in diff --git a/package/libraries/python3-gpiod/python3-gpiod.mk b/package/batocera/libraries/python3-gpiod/python3-gpiod.mk similarity index 100% rename from package/libraries/python3-gpiod/python3-gpiod.mk rename to package/batocera/libraries/python3-gpiod/python3-gpiod.mk diff --git a/package/libraries/python3-pyparsing/Config.in b/package/batocera/libraries/python3-pyparsing/Config.in similarity index 100% rename from package/libraries/python3-pyparsing/Config.in rename to package/batocera/libraries/python3-pyparsing/Config.in diff --git a/package/libraries/python3-pyparsing/python-pyparsing.hash b/package/batocera/libraries/python3-pyparsing/python-pyparsing.hash similarity index 100% rename from package/libraries/python3-pyparsing/python-pyparsing.hash rename to package/batocera/libraries/python3-pyparsing/python-pyparsing.hash diff --git a/package/libraries/python3-pyparsing/python3-pyparsing.mk b/package/batocera/libraries/python3-pyparsing/python3-pyparsing.mk similarity index 100% rename from package/libraries/python3-pyparsing/python3-pyparsing.mk rename to package/batocera/libraries/python3-pyparsing/python3-pyparsing.mk diff --git a/package/libraries/pywebview/Config.in b/package/batocera/libraries/pywebview/Config.in similarity index 100% rename from package/libraries/pywebview/Config.in rename to package/batocera/libraries/pywebview/Config.in diff --git a/package/libraries/pywebview/pywebview.hash b/package/batocera/libraries/pywebview/pywebview.hash similarity index 100% rename from package/libraries/pywebview/pywebview.hash rename to package/batocera/libraries/pywebview/pywebview.hash diff --git a/package/libraries/pywebview/pywebview.mk b/package/batocera/libraries/pywebview/pywebview.mk similarity index 100% rename from package/libraries/pywebview/pywebview.mk rename to package/batocera/libraries/pywebview/pywebview.mk diff --git a/package/libraries/sf_rpi_status/Config.in b/package/batocera/libraries/sf_rpi_status/Config.in similarity index 100% rename from package/libraries/sf_rpi_status/Config.in rename to package/batocera/libraries/sf_rpi_status/Config.in diff --git a/package/libraries/sf_rpi_status/sf_rpi_status.mk b/package/batocera/libraries/sf_rpi_status/sf_rpi_status.mk similarity index 100% rename from package/libraries/sf_rpi_status/sf_rpi_status.mk rename to package/batocera/libraries/sf_rpi_status/sf_rpi_status.mk diff --git a/package/libraries/shaderc/Config.in b/package/batocera/libraries/shaderc/Config.in similarity index 100% rename from package/libraries/shaderc/Config.in rename to package/batocera/libraries/shaderc/Config.in diff --git a/package/libraries/shaderc/shaderc-changes.patch b/package/batocera/libraries/shaderc/shaderc-changes.patch similarity index 100% rename from package/libraries/shaderc/shaderc-changes.patch rename to package/batocera/libraries/shaderc/shaderc-changes.patch diff --git a/package/libraries/shaderc/shaderc.mk b/package/batocera/libraries/shaderc/shaderc.mk similarity index 100% rename from package/libraries/shaderc/shaderc.mk rename to package/batocera/libraries/shaderc/shaderc.mk diff --git a/package/libraries/sockpp/Config.in b/package/batocera/libraries/sockpp/Config.in similarity index 100% rename from package/libraries/sockpp/Config.in rename to package/batocera/libraries/sockpp/Config.in diff --git a/package/libraries/sockpp/sockpp.mk b/package/batocera/libraries/sockpp/sockpp.mk similarity index 100% rename from package/libraries/sockpp/sockpp.mk rename to package/batocera/libraries/sockpp/sockpp.mk diff --git a/package/libraries/wildmidi/Config.in b/package/batocera/libraries/wildmidi/Config.in similarity index 100% rename from package/libraries/wildmidi/Config.in rename to package/batocera/libraries/wildmidi/Config.in diff --git a/package/libraries/wildmidi/wildmidi.mk b/package/batocera/libraries/wildmidi/wildmidi.mk similarity index 100% rename from package/libraries/wildmidi/wildmidi.mk rename to package/batocera/libraries/wildmidi/wildmidi.mk diff --git a/package/libraries/wxwidgets/Config.in b/package/batocera/libraries/wxwidgets/Config.in similarity index 100% rename from package/libraries/wxwidgets/Config.in rename to package/batocera/libraries/wxwidgets/Config.in diff --git a/package/libraries/wxwidgets/wxwidgets.mk b/package/batocera/libraries/wxwidgets/wxwidgets.mk similarity index 100% rename from package/libraries/wxwidgets/wxwidgets.mk rename to package/batocera/libraries/wxwidgets/wxwidgets.mk diff --git a/package/looks/adwaita-icon-theme-light/Config.in b/package/batocera/looks/adwaita-icon-theme-light/Config.in similarity index 100% rename from package/looks/adwaita-icon-theme-light/Config.in rename to package/batocera/looks/adwaita-icon-theme-light/Config.in diff --git a/package/looks/adwaita-icon-theme-light/adwaita-icon-theme-light.hash b/package/batocera/looks/adwaita-icon-theme-light/adwaita-icon-theme-light.hash similarity index 100% rename from package/looks/adwaita-icon-theme-light/adwaita-icon-theme-light.hash rename to package/batocera/looks/adwaita-icon-theme-light/adwaita-icon-theme-light.hash diff --git a/package/looks/adwaita-icon-theme-light/adwaita-icon-theme-light.mk b/package/batocera/looks/adwaita-icon-theme-light/adwaita-icon-theme-light.mk similarity index 100% rename from package/looks/adwaita-icon-theme-light/adwaita-icon-theme-light.mk rename to package/batocera/looks/adwaita-icon-theme-light/adwaita-icon-theme-light.mk diff --git a/package/looks/hypseus-singe-bezels/Config.in b/package/batocera/looks/hypseus-singe-bezels/Config.in similarity index 100% rename from package/looks/hypseus-singe-bezels/Config.in rename to package/batocera/looks/hypseus-singe-bezels/Config.in diff --git a/package/looks/hypseus-singe-bezels/hypseus-singe-bezels.mk b/package/batocera/looks/hypseus-singe-bezels/hypseus-singe-bezels.mk similarity index 100% rename from package/looks/hypseus-singe-bezels/hypseus-singe-bezels.mk rename to package/batocera/looks/hypseus-singe-bezels/hypseus-singe-bezels.mk diff --git a/package/network/aic8800/Config.in b/package/batocera/network/aic8800/Config.in similarity index 100% rename from package/network/aic8800/Config.in rename to package/batocera/network/aic8800/Config.in diff --git a/package/network/aic8800/aic8800.mk b/package/batocera/network/aic8800/aic8800.mk similarity index 100% rename from package/network/aic8800/aic8800.mk rename to package/batocera/network/aic8800/aic8800.mk diff --git a/package/network/qualcomm/pd-mapper/Config.in b/package/batocera/network/qualcomm/pd-mapper/Config.in similarity index 100% rename from package/network/qualcomm/pd-mapper/Config.in rename to package/batocera/network/qualcomm/pd-mapper/Config.in diff --git a/package/network/qualcomm/pd-mapper/pd-mapper.mk b/package/batocera/network/qualcomm/pd-mapper/pd-mapper.mk similarity index 100% rename from package/network/qualcomm/pd-mapper/pd-mapper.mk rename to package/batocera/network/qualcomm/pd-mapper/pd-mapper.mk diff --git a/package/network/qualcomm/qrtr/Config.in b/package/batocera/network/qualcomm/qrtr/Config.in similarity index 100% rename from package/network/qualcomm/qrtr/Config.in rename to package/batocera/network/qualcomm/qrtr/Config.in diff --git a/package/network/qualcomm/qrtr/qrtr.mk b/package/batocera/network/qualcomm/qrtr/qrtr.mk similarity index 100% rename from package/network/qualcomm/qrtr/qrtr.mk rename to package/batocera/network/qualcomm/qrtr/qrtr.mk diff --git a/package/network/qualcomm/rmtfs/Config.in b/package/batocera/network/qualcomm/rmtfs/Config.in similarity index 100% rename from package/network/qualcomm/rmtfs/Config.in rename to package/batocera/network/qualcomm/rmtfs/Config.in diff --git a/package/network/qualcomm/rmtfs/rmtfs.mk b/package/batocera/network/qualcomm/rmtfs/rmtfs.mk similarity index 100% rename from package/network/qualcomm/rmtfs/rmtfs.mk rename to package/batocera/network/qualcomm/rmtfs/rmtfs.mk diff --git a/package/network/qualcomm/tqftpserv/Config.in b/package/batocera/network/qualcomm/tqftpserv/Config.in similarity index 100% rename from package/network/qualcomm/tqftpserv/Config.in rename to package/batocera/network/qualcomm/tqftpserv/Config.in diff --git a/package/network/qualcomm/tqftpserv/tqftpserv.mk b/package/batocera/network/qualcomm/tqftpserv/tqftpserv.mk similarity index 100% rename from package/network/qualcomm/tqftpserv/tqftpserv.mk rename to package/batocera/network/qualcomm/tqftpserv/tqftpserv.mk diff --git a/package/network/r8125/Config.in b/package/batocera/network/r8125/Config.in similarity index 100% rename from package/network/r8125/Config.in rename to package/batocera/network/r8125/Config.in diff --git a/package/network/r8125/blacklist-r8169.conf b/package/batocera/network/r8125/blacklist-r8169.conf similarity index 100% rename from package/network/r8125/blacklist-r8169.conf rename to package/batocera/network/r8125/blacklist-r8169.conf diff --git a/package/network/r8125/r8125.mk b/package/batocera/network/r8125/r8125.mk similarity index 90% rename from package/network/r8125/r8125.mk rename to package/batocera/network/r8125/r8125.mk index 4e7b8f0e33d..31ecc82fe0e 100644 --- a/package/network/r8125/r8125.mk +++ b/package/batocera/network/r8125/r8125.mk @@ -18,7 +18,7 @@ define R8125_MAKE_SUBDIR endef define R8125_BLACKLIST_R8169 - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/network/r8125/blacklist-r8169.conf \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/network/r8125/blacklist-r8169.conf \ $(TARGET_DIR)/etc/modprobe.d/ endef diff --git a/package/network/r8168/Config.in b/package/batocera/network/r8168/Config.in similarity index 100% rename from package/network/r8168/Config.in rename to package/batocera/network/r8168/Config.in diff --git a/package/network/r8168/r8168.mk b/package/batocera/network/r8168/r8168.mk similarity index 92% rename from package/network/r8168/r8168.mk rename to package/batocera/network/r8168/r8168.mk index d325c213871..bc07fee125d 100644 --- a/package/network/r8168/r8168.mk +++ b/package/batocera/network/r8168/r8168.mk @@ -24,7 +24,7 @@ define R8168_MAKE_SUBDIR endef define R8168_BLACKLIST_R8168 - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/network/r8168/r816x.conf \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/network/r8168/r816x.conf \ $(TARGET_DIR)/etc/modprobe.d/ endef diff --git a/package/network/r8168/r816x.conf b/package/batocera/network/r8168/r816x.conf similarity index 100% rename from package/network/r8168/r816x.conf rename to package/batocera/network/r8168/r816x.conf diff --git a/package/network/rtl8812au/Config.in b/package/batocera/network/rtl8812au/Config.in similarity index 100% rename from package/network/rtl8812au/Config.in rename to package/batocera/network/rtl8812au/Config.in diff --git a/package/network/rtl8812au/rtl8812au.mk b/package/batocera/network/rtl8812au/rtl8812au.mk similarity index 100% rename from package/network/rtl8812au/rtl8812au.mk rename to package/batocera/network/rtl8812au/rtl8812au.mk diff --git a/package/network/rtl8821au-morrownr/Config.in b/package/batocera/network/rtl8821au-morrownr/Config.in similarity index 100% rename from package/network/rtl8821au-morrownr/Config.in rename to package/batocera/network/rtl8821au-morrownr/Config.in diff --git a/package/network/rtl8821au-morrownr/rtl8821au-morrownr.mk b/package/batocera/network/rtl8821au-morrownr/rtl8821au-morrownr.mk similarity index 100% rename from package/network/rtl8821au-morrownr/rtl8821au-morrownr.mk rename to package/batocera/network/rtl8821au-morrownr/rtl8821au-morrownr.mk diff --git a/package/network/rtl88x2bu/Config.in b/package/batocera/network/rtl88x2bu/Config.in similarity index 100% rename from package/network/rtl88x2bu/Config.in rename to package/batocera/network/rtl88x2bu/Config.in diff --git a/package/network/rtl88x2bu/rtl88x2bu.mk b/package/batocera/network/rtl88x2bu/rtl88x2bu.mk similarity index 100% rename from package/network/rtl88x2bu/rtl88x2bu.mk rename to package/batocera/network/rtl88x2bu/rtl88x2bu.mk diff --git a/package/ports/abuse-data/Config.in b/package/batocera/ports/abuse-data/Config.in similarity index 100% rename from package/ports/abuse-data/Config.in rename to package/batocera/ports/abuse-data/Config.in diff --git a/package/ports/abuse-data/abuse-data.mk b/package/batocera/ports/abuse-data/abuse-data.mk similarity index 100% rename from package/ports/abuse-data/abuse-data.mk rename to package/batocera/ports/abuse-data/abuse-data.mk diff --git a/package/ports/abuse/Config.in b/package/batocera/ports/abuse/Config.in similarity index 100% rename from package/ports/abuse/Config.in rename to package/batocera/ports/abuse/Config.in diff --git a/package/ports/abuse/abuse.keys b/package/batocera/ports/abuse/abuse.keys similarity index 100% rename from package/ports/abuse/abuse.keys rename to package/batocera/ports/abuse/abuse.keys diff --git a/package/ports/abuse/abuse.mk b/package/batocera/ports/abuse/abuse.mk similarity index 100% rename from package/ports/abuse/abuse.mk rename to package/batocera/ports/abuse/abuse.mk diff --git a/package/ports/cannonball/0001-Make-roms-folder-configurable.patch b/package/batocera/ports/cannonball/0001-Make-roms-folder-configurable.patch similarity index 100% rename from package/ports/cannonball/0001-Make-roms-folder-configurable.patch rename to package/batocera/ports/cannonball/0001-Make-roms-folder-configurable.patch diff --git a/package/ports/cannonball/0002-Allow-various-paths-not-to-be-hardcoded-anymore-but-.patch b/package/batocera/ports/cannonball/0002-Allow-various-paths-not-to-be-hardcoded-anymore-but-.patch similarity index 100% rename from package/ports/cannonball/0002-Allow-various-paths-not-to-be-hardcoded-anymore-but-.patch rename to package/batocera/ports/cannonball/0002-Allow-various-paths-not-to-be-hardcoded-anymore-but-.patch diff --git a/package/ports/cannonball/0003-hotkey.patch b/package/batocera/ports/cannonball/0003-hotkey.patch similarity index 100% rename from package/ports/cannonball/0003-hotkey.patch rename to package/batocera/ports/cannonball/0003-hotkey.patch diff --git a/package/ports/cannonball/Config.in b/package/batocera/ports/cannonball/Config.in similarity index 100% rename from package/ports/cannonball/Config.in rename to package/batocera/ports/cannonball/Config.in diff --git a/package/ports/cannonball/cannonball.mk b/package/batocera/ports/cannonball/cannonball.mk similarity index 100% rename from package/ports/cannonball/cannonball.mk rename to package/batocera/ports/cannonball/cannonball.mk diff --git a/package/ports/cdogs/000-fix-cmake.patch b/package/batocera/ports/cdogs/000-fix-cmake.patch similarity index 100% rename from package/ports/cdogs/000-fix-cmake.patch rename to package/batocera/ports/cdogs/000-fix-cmake.patch diff --git a/package/ports/cdogs/001-disable-werror.patch b/package/batocera/ports/cdogs/001-disable-werror.patch similarity index 100% rename from package/ports/cdogs/001-disable-werror.patch rename to package/batocera/ports/cdogs/001-disable-werror.patch diff --git a/package/ports/cdogs/002-fix-cmake.patch b/package/batocera/ports/cdogs/002-fix-cmake.patch similarity index 100% rename from package/ports/cdogs/002-fix-cmake.patch rename to package/batocera/ports/cdogs/002-fix-cmake.patch diff --git a/package/ports/cdogs/Config.in b/package/batocera/ports/cdogs/Config.in similarity index 100% rename from package/ports/cdogs/Config.in rename to package/batocera/ports/cdogs/Config.in diff --git a/package/ports/cdogs/cdogs.keys b/package/batocera/ports/cdogs/cdogs.keys similarity index 100% rename from package/ports/cdogs/cdogs.keys rename to package/batocera/ports/cdogs/cdogs.keys diff --git a/package/ports/cdogs/cdogs.mk b/package/batocera/ports/cdogs/cdogs.mk similarity index 86% rename from package/ports/cdogs/cdogs.mk rename to package/batocera/ports/cdogs/cdogs.mk index ffb77e21c7b..60cf40094f3 100644 --- a/package/ports/cdogs/cdogs.mk +++ b/package/batocera/ports/cdogs/cdogs.mk @@ -33,11 +33,11 @@ define CDOGS_INSTALL_TARGET_CMDS # cp -pav $(@D)/missions $(TARGET_DIR)/usr/share/reglinux/datainit/roms/cdogs # cp -pav $(@D)/music $(TARGET_DIR)/usr/share/reglinux/datainit/roms/cdogs # cp -pav $(@D)/sounds $(TARGET_DIR)/usr/share/reglinux/datainit/roms/cdogs - # cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/ports/cdogs/gamecontrollerdb.txt $(TARGET_DIR)/usr/share/reglinux/datainit/roms/cdogs/data + # cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/ports/cdogs/gamecontrollerdb.txt $(TARGET_DIR)/usr/share/reglinux/datainit/roms/cdogs/data # evmap config mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/ports/cdogs/cdogs.keys $(TARGET_DIR)/usr/share/evmapy + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/ports/cdogs/cdogs.keys $(TARGET_DIR)/usr/share/evmapy endef CDOGS_PRE_CONFIGURE_HOOKS += CDOGS_REMOVE_TESTS diff --git a/package/ports/cdogs/gamecontrollerdb.txt b/package/batocera/ports/cdogs/gamecontrollerdb.txt similarity index 100% rename from package/ports/cdogs/gamecontrollerdb.txt rename to package/batocera/ports/cdogs/gamecontrollerdb.txt diff --git a/package/ports/corsixth/001-install-path.patch b/package/batocera/ports/corsixth/001-install-path.patch similarity index 100% rename from package/ports/corsixth/001-install-path.patch rename to package/batocera/ports/corsixth/001-install-path.patch diff --git a/package/ports/corsixth/Config.in b/package/batocera/ports/corsixth/Config.in similarity index 100% rename from package/ports/corsixth/Config.in rename to package/batocera/ports/corsixth/Config.in diff --git a/package/ports/corsixth/corsixth.keys b/package/batocera/ports/corsixth/corsixth.keys similarity index 100% rename from package/ports/corsixth/corsixth.keys rename to package/batocera/ports/corsixth/corsixth.keys diff --git a/package/ports/corsixth/corsixth.mk b/package/batocera/ports/corsixth/corsixth.mk similarity index 82% rename from package/ports/corsixth/corsixth.mk rename to package/batocera/ports/corsixth/corsixth.mk index a86c74aa8d2..b3de8581d29 100644 --- a/package/ports/corsixth/corsixth.mk +++ b/package/batocera/ports/corsixth/corsixth.mk @@ -11,7 +11,7 @@ CORSIXTH_DEPENDENCIES = sdl2 sdl2_image lua luafilesystem lpeg luasocket luasec define CORSIXTH_INSTALL_EVMAPY # evmap config mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/ports/corsixth/corsixth.keys $(TARGET_DIR)/usr/share/evmapy + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/ports/corsixth/corsixth.keys $(TARGET_DIR)/usr/share/evmapy endef CORSIXTH_POST_INSTALL_TARGET_HOOKS += CORSIXTH_INSTALL_EVMAPY diff --git a/package/ports/ecwolf/001-ecwolf-remove-vendored-sdl-libs.patch b/package/batocera/ports/ecwolf/001-ecwolf-remove-vendored-sdl-libs.patch similarity index 100% rename from package/ports/ecwolf/001-ecwolf-remove-vendored-sdl-libs.patch rename to package/batocera/ports/ecwolf/001-ecwolf-remove-vendored-sdl-libs.patch diff --git a/package/ports/ecwolf/Config.in b/package/batocera/ports/ecwolf/Config.in similarity index 100% rename from package/ports/ecwolf/Config.in rename to package/batocera/ports/ecwolf/Config.in diff --git a/package/ports/ecwolf/Config.in.host b/package/batocera/ports/ecwolf/Config.in.host similarity index 100% rename from package/ports/ecwolf/Config.in.host rename to package/batocera/ports/ecwolf/Config.in.host diff --git a/package/ports/ecwolf/arith_32.h b/package/batocera/ports/ecwolf/arith_32.h similarity index 100% rename from package/ports/ecwolf/arith_32.h rename to package/batocera/ports/ecwolf/arith_32.h diff --git a/package/ports/ecwolf/arith_64.h b/package/batocera/ports/ecwolf/arith_64.h similarity index 100% rename from package/ports/ecwolf/arith_64.h rename to package/batocera/ports/ecwolf/arith_64.h diff --git a/package/ports/ecwolf/ecwolf.keys b/package/batocera/ports/ecwolf/ecwolf.keys similarity index 100% rename from package/ports/ecwolf/ecwolf.keys rename to package/batocera/ports/ecwolf/ecwolf.keys diff --git a/package/ports/ecwolf/ecwolf.mk b/package/batocera/ports/ecwolf/ecwolf.mk similarity index 82% rename from package/ports/ecwolf/ecwolf.mk rename to package/batocera/ports/ecwolf/ecwolf.mk index db7a541265c..aec1468dbbb 100644 --- a/package/ports/ecwolf/ecwolf.mk +++ b/package/batocera/ports/ecwolf/ecwolf.mk @@ -41,8 +41,8 @@ ECWOLF_GENERATED_HEADER_SUFFIX = 32 endif define ECWOLF_COPY_GENERATED_HEADERS - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/ports/ecwolf/arith_$(ECWOLF_GENERATED_HEADER_SUFFIX).h $(ECWOLF_BUILDDIR)/deps/gdtoa/arith.h - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/ports/ecwolf/gd_qnan_$(ECWOLF_GENERATED_HEADER_SUFFIX).h $(ECWOLF_BUILDDIR)/deps/gdtoa/gd_qnan.h + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/ports/ecwolf/arith_$(ECWOLF_GENERATED_HEADER_SUFFIX).h $(ECWOLF_BUILDDIR)/deps/gdtoa/arith.h + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/ports/ecwolf/gd_qnan_$(ECWOLF_GENERATED_HEADER_SUFFIX).h $(ECWOLF_BUILDDIR)/deps/gdtoa/gd_qnan.h endef ECWOLF_POST_CONFIGURE_HOOKS += ECWOLF_COPY_GENERATED_HEADERS @@ -56,7 +56,7 @@ define ECWOLF_INSTALL_TARGET_CMDS # evmap config mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/ports/ecwolf/ecwolf.keys $(TARGET_DIR)/usr/share/evmapy + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/ports/ecwolf/ecwolf.keys $(TARGET_DIR)/usr/share/evmapy endef $(eval $(cmake-package)) diff --git a/package/ports/ecwolf/gd_qnan_32.h b/package/batocera/ports/ecwolf/gd_qnan_32.h similarity index 100% rename from package/ports/ecwolf/gd_qnan_32.h rename to package/batocera/ports/ecwolf/gd_qnan_32.h diff --git a/package/ports/ecwolf/gd_qnan_64.h b/package/batocera/ports/ecwolf/gd_qnan_64.h similarity index 100% rename from package/ports/ecwolf/gd_qnan_64.h rename to package/batocera/ports/ecwolf/gd_qnan_64.h diff --git a/package/ports/eduke32/000-fix-sdl2-paths.patch b/package/batocera/ports/eduke32/000-fix-sdl2-paths.patch similarity index 100% rename from package/ports/eduke32/000-fix-sdl2-paths.patch rename to package/batocera/ports/eduke32/000-fix-sdl2-paths.patch diff --git a/package/ports/eduke32/001-fix-file-paths.patch b/package/batocera/ports/eduke32/001-fix-file-paths.patch similarity index 100% rename from package/ports/eduke32/001-fix-file-paths.patch rename to package/batocera/ports/eduke32/001-fix-file-paths.patch diff --git a/package/ports/eduke32/002-do-not-link-mapster32.patch b/package/batocera/ports/eduke32/002-do-not-link-mapster32.patch similarity index 100% rename from package/ports/eduke32/002-do-not-link-mapster32.patch rename to package/batocera/ports/eduke32/002-do-not-link-mapster32.patch diff --git a/package/ports/eduke32/003-fixrpath.patch b/package/batocera/ports/eduke32/003-fixrpath.patch similarity index 100% rename from package/ports/eduke32/003-fixrpath.patch rename to package/batocera/ports/eduke32/003-fixrpath.patch diff --git a/package/ports/eduke32/Config.in b/package/batocera/ports/eduke32/Config.in similarity index 100% rename from package/ports/eduke32/Config.in rename to package/batocera/ports/eduke32/Config.in diff --git a/package/ports/eduke32/eduke32.keys b/package/batocera/ports/eduke32/eduke32.keys similarity index 100% rename from package/ports/eduke32/eduke32.keys rename to package/batocera/ports/eduke32/eduke32.keys diff --git a/package/ports/eduke32/eduke32.mk b/package/batocera/ports/eduke32/eduke32.mk similarity index 88% rename from package/ports/eduke32/eduke32.mk rename to package/batocera/ports/eduke32/eduke32.mk index 4d0b6de7092..06183601e19 100644 --- a/package/ports/eduke32/eduke32.mk +++ b/package/batocera/ports/eduke32/eduke32.mk @@ -28,9 +28,9 @@ define EDUKE32_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/eduke32 $(TARGET_DIR)/usr/bin/eduke32 $(INSTALL) -D -m 0755 $(@D)/fury $(TARGET_DIR)/usr/bin/fury mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/ports/eduke32/eduke32.keys \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/ports/eduke32/eduke32.keys \ $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/ports/eduke32/eduke32.keys \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/ports/eduke32/eduke32.keys \ $(TARGET_DIR)/usr/share/evmapy/fury.keys endef diff --git a/package/ports/fallout1-ce/001-gamepad-stick.patch b/package/batocera/ports/fallout1-ce/001-gamepad-stick.patch similarity index 100% rename from package/ports/fallout1-ce/001-gamepad-stick.patch rename to package/batocera/ports/fallout1-ce/001-gamepad-stick.patch diff --git a/package/ports/fallout1-ce/002-fix-movie.patch b/package/batocera/ports/fallout1-ce/002-fix-movie.patch similarity index 100% rename from package/ports/fallout1-ce/002-fix-movie.patch rename to package/batocera/ports/fallout1-ce/002-fix-movie.patch diff --git a/package/ports/fallout1-ce/003-set-config-path.patch b/package/batocera/ports/fallout1-ce/003-set-config-path.patch similarity index 100% rename from package/ports/fallout1-ce/003-set-config-path.patch rename to package/batocera/ports/fallout1-ce/003-set-config-path.patch diff --git a/package/ports/fallout1-ce/004-set-ini-path.patch b/package/batocera/ports/fallout1-ce/004-set-ini-path.patch similarity index 100% rename from package/ports/fallout1-ce/004-set-ini-path.patch rename to package/batocera/ports/fallout1-ce/004-set-ini-path.patch diff --git a/package/ports/fallout1-ce/Config.in b/package/batocera/ports/fallout1-ce/Config.in similarity index 100% rename from package/ports/fallout1-ce/Config.in rename to package/batocera/ports/fallout1-ce/Config.in diff --git a/package/ports/fallout1-ce/fallout1-ce.keys b/package/batocera/ports/fallout1-ce/fallout1-ce.keys similarity index 100% rename from package/ports/fallout1-ce/fallout1-ce.keys rename to package/batocera/ports/fallout1-ce/fallout1-ce.keys diff --git a/package/ports/fallout1-ce/fallout1-ce.mk b/package/batocera/ports/fallout1-ce/fallout1-ce.mk similarity index 88% rename from package/ports/fallout1-ce/fallout1-ce.mk rename to package/batocera/ports/fallout1-ce/fallout1-ce.mk index 49b2b3f21c3..dbca0fe7940 100644 --- a/package/ports/fallout1-ce/fallout1-ce.mk +++ b/package/batocera/ports/fallout1-ce/fallout1-ce.mk @@ -14,7 +14,7 @@ endef define FALLOUT1_CE_EVMAPY mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/ports/fallout1-ce/fallout1-ce.keys \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/ports/fallout1-ce/fallout1-ce.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/ports/fallout2-ce/Config.in b/package/batocera/ports/fallout2-ce/Config.in similarity index 100% rename from package/ports/fallout2-ce/Config.in rename to package/batocera/ports/fallout2-ce/Config.in diff --git a/package/ports/fallout2-ce/fallout2-ce.keys b/package/batocera/ports/fallout2-ce/fallout2-ce.keys similarity index 100% rename from package/ports/fallout2-ce/fallout2-ce.keys rename to package/batocera/ports/fallout2-ce/fallout2-ce.keys diff --git a/package/ports/fallout2-ce/fallout2-ce.mk b/package/batocera/ports/fallout2-ce/fallout2-ce.mk similarity index 87% rename from package/ports/fallout2-ce/fallout2-ce.mk rename to package/batocera/ports/fallout2-ce/fallout2-ce.mk index 51ec150b49a..f945586b7c9 100644 --- a/package/ports/fallout2-ce/fallout2-ce.mk +++ b/package/batocera/ports/fallout2-ce/fallout2-ce.mk @@ -14,7 +14,7 @@ endef define FALLOUT2_CE_EVMAPY mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/ports/fallout2-ce/fallout2-ce.keys \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/ports/fallout2-ce/fallout2-ce.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/ports/gzdoom/0001-Fix-file-paths.patch b/package/batocera/ports/gzdoom/0001-Fix-file-paths.patch similarity index 100% rename from package/ports/gzdoom/0001-Fix-file-paths.patch rename to package/batocera/ports/gzdoom/0001-Fix-file-paths.patch diff --git a/package/ports/gzdoom/0002-Add-an-option-to-only-build-the-tools.patch b/package/batocera/ports/gzdoom/0002-Add-an-option-to-only-build-the-tools.patch similarity index 100% rename from package/ports/gzdoom/0002-Add-an-option-to-only-build-the-tools.patch rename to package/batocera/ports/gzdoom/0002-Add-an-option-to-only-build-the-tools.patch diff --git a/package/ports/gzdoom/0003-Fix-tools-build.patch b/package/batocera/ports/gzdoom/0003-Fix-tools-build.patch similarity index 100% rename from package/ports/gzdoom/0003-Fix-tools-build.patch rename to package/batocera/ports/gzdoom/0003-Fix-tools-build.patch diff --git a/package/ports/gzdoom/Config.in b/package/batocera/ports/gzdoom/Config.in similarity index 100% rename from package/ports/gzdoom/Config.in rename to package/batocera/ports/gzdoom/Config.in diff --git a/package/ports/gzdoom/Config.in.host b/package/batocera/ports/gzdoom/Config.in.host similarity index 100% rename from package/ports/gzdoom/Config.in.host rename to package/batocera/ports/gzdoom/Config.in.host diff --git a/package/ports/gzdoom/gzdoom.hash b/package/batocera/ports/gzdoom/gzdoom.hash similarity index 100% rename from package/ports/gzdoom/gzdoom.hash rename to package/batocera/ports/gzdoom/gzdoom.hash diff --git a/package/ports/gzdoom/gzdoom.keys b/package/batocera/ports/gzdoom/gzdoom.keys similarity index 100% rename from package/ports/gzdoom/gzdoom.keys rename to package/batocera/ports/gzdoom/gzdoom.keys diff --git a/package/ports/gzdoom/gzdoom.mk b/package/batocera/ports/gzdoom/gzdoom.mk similarity index 97% rename from package/ports/gzdoom/gzdoom.mk rename to package/batocera/ports/gzdoom/gzdoom.mk index e9e00f0a782..049f41e6f24 100644 --- a/package/ports/gzdoom/gzdoom.mk +++ b/package/batocera/ports/gzdoom/gzdoom.mk @@ -72,7 +72,7 @@ define GZDOOM_INSTALL_TARGET_CMDS cp -pr $(@D)/buildroot-build/fm_banks $(TARGET_DIR)/usr/share/gzdoom cp -pr $(@D)/buildroot-build/soundfonts $(TARGET_DIR)/usr/share/gzdoom mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/ports/gzdoom/gzdoom.keys \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/ports/gzdoom/gzdoom.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/ports/hcl/001-cmake.patch b/package/batocera/ports/hcl/001-cmake.patch similarity index 100% rename from package/ports/hcl/001-cmake.patch rename to package/batocera/ports/hcl/001-cmake.patch diff --git a/package/ports/hcl/002-sdl2_pad.patch b/package/batocera/ports/hcl/002-sdl2_pad.patch similarity index 100% rename from package/ports/hcl/002-sdl2_pad.patch rename to package/batocera/ports/hcl/002-sdl2_pad.patch diff --git a/package/ports/hcl/Config.in b/package/batocera/ports/hcl/Config.in similarity index 100% rename from package/ports/hcl/Config.in rename to package/batocera/ports/hcl/Config.in diff --git a/package/ports/hcl/hcl.keys b/package/batocera/ports/hcl/hcl.keys similarity index 100% rename from package/ports/hcl/hcl.keys rename to package/batocera/ports/hcl/hcl.keys diff --git a/package/ports/hcl/hcl.mk b/package/batocera/ports/hcl/hcl.mk similarity index 87% rename from package/ports/hcl/hcl.mk rename to package/batocera/ports/hcl/hcl.mk index 871eaf5a58b..d658dfe2d2a 100644 --- a/package/ports/hcl/hcl.mk +++ b/package/batocera/ports/hcl/hcl.mk @@ -17,7 +17,7 @@ define HCL_INSTALL_TARGET_CMDS chmod 0754 $(TARGET_DIR)/usr/bin/hcl # evmap config mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/ports/hcl/hcl.keys $(TARGET_DIR)/usr/share/evmapy + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/ports/hcl/hcl.keys $(TARGET_DIR)/usr/share/evmapy endef $(eval $(cmake-package)) diff --git a/package/ports/raze/001-fix-file-paths.patch b/package/batocera/ports/raze/001-fix-file-paths.patch similarity index 100% rename from package/ports/raze/001-fix-file-paths.patch rename to package/batocera/ports/raze/001-fix-file-paths.patch diff --git a/package/ports/raze/002-Add-option-for-tools-only.patch b/package/batocera/ports/raze/002-Add-option-for-tools-only.patch similarity index 100% rename from package/ports/raze/002-Add-option-for-tools-only.patch rename to package/batocera/ports/raze/002-Add-option-for-tools-only.patch diff --git a/package/ports/raze/003-fix-host-build.patch b/package/batocera/ports/raze/003-fix-host-build.patch similarity index 100% rename from package/ports/raze/003-fix-host-build.patch rename to package/batocera/ports/raze/003-fix-host-build.patch diff --git a/package/ports/raze/Config.in b/package/batocera/ports/raze/Config.in similarity index 100% rename from package/ports/raze/Config.in rename to package/batocera/ports/raze/Config.in diff --git a/package/ports/raze/Config.in.host b/package/batocera/ports/raze/Config.in.host similarity index 100% rename from package/ports/raze/Config.in.host rename to package/batocera/ports/raze/Config.in.host diff --git a/package/ports/raze/raze.keys b/package/batocera/ports/raze/raze.keys similarity index 100% rename from package/ports/raze/raze.keys rename to package/batocera/ports/raze/raze.keys diff --git a/package/ports/raze/raze.mk b/package/batocera/ports/raze/raze.mk similarity index 96% rename from package/ports/raze/raze.mk rename to package/batocera/ports/raze/raze.mk index da1762c23cb..6bc80c02deb 100644 --- a/package/ports/raze/raze.mk +++ b/package/batocera/ports/raze/raze.mk @@ -59,7 +59,7 @@ define RAZE_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/buildroot-build/soundfonts/raze.sf2 \ $(TARGET_DIR)/usr/share/raze/soundfonts/raze.sf2 mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/ports/raze/raze.keys \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/ports/raze/raze.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/ports/sdlpop/001-datapath.patch b/package/batocera/ports/sdlpop/001-datapath.patch similarity index 100% rename from package/ports/sdlpop/001-datapath.patch rename to package/batocera/ports/sdlpop/001-datapath.patch diff --git a/package/ports/sdlpop/002-padnum.patch b/package/batocera/ports/sdlpop/002-padnum.patch similarity index 100% rename from package/ports/sdlpop/002-padnum.patch rename to package/batocera/ports/sdlpop/002-padnum.patch diff --git a/package/ports/sdlpop/003-fullscreen.patch b/package/batocera/ports/sdlpop/003-fullscreen.patch similarity index 100% rename from package/ports/sdlpop/003-fullscreen.patch rename to package/batocera/ports/sdlpop/003-fullscreen.patch diff --git a/package/ports/sdlpop/Config.in b/package/batocera/ports/sdlpop/Config.in similarity index 100% rename from package/ports/sdlpop/Config.in rename to package/batocera/ports/sdlpop/Config.in diff --git a/package/ports/sdlpop/sdlpop.keys b/package/batocera/ports/sdlpop/sdlpop.keys similarity index 100% rename from package/ports/sdlpop/sdlpop.keys rename to package/batocera/ports/sdlpop/sdlpop.keys diff --git a/package/ports/sdlpop/sdlpop.mk b/package/batocera/ports/sdlpop/sdlpop.mk similarity index 88% rename from package/ports/sdlpop/sdlpop.mk rename to package/batocera/ports/sdlpop/sdlpop.mk index dad05a839d3..daadac2a3c5 100644 --- a/package/ports/sdlpop/sdlpop.mk +++ b/package/batocera/ports/sdlpop/sdlpop.mk @@ -19,7 +19,7 @@ define SDLPOP_INSTALL_TARGET_CMDS echo "# Blank cfg file for advanced configuration" > \ $(TARGET_DIR)/usr/share/sdlpop/cfg/SDLPoP.cfg cp -pr $(@D)/data $(TARGET_DIR)/usr/share/sdlpop/ - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/ports/sdlpop/sdlpop.keys $(TARGET_DIR)/usr/share/evmapy + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/ports/sdlpop/sdlpop.keys $(TARGET_DIR)/usr/share/evmapy endef $(eval $(cmake-package)) diff --git a/package/ports/sonic2013/Config.in b/package/batocera/ports/sonic2013/Config.in similarity index 100% rename from package/ports/sonic2013/Config.in rename to package/batocera/ports/sonic2013/Config.in diff --git a/package/ports/sonic2013/sonic2013.mk b/package/batocera/ports/sonic2013/sonic2013.mk similarity index 92% rename from package/ports/sonic2013/sonic2013.mk rename to package/batocera/ports/sonic2013/sonic2013.mk index 930c277d383..60b98892627 100755 --- a/package/ports/sonic2013/sonic2013.mk +++ b/package/batocera/ports/sonic2013/sonic2013.mk @@ -29,7 +29,7 @@ endef define SONIC2013_POST_PROCESS mkdir -p $(TARGET_DIR)/usr/share/evmapy $(TARGET_DIR)/usr/share/sonic2013 - cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/ports/sonic2013/sonicretro.sonic2013.keys \ + cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/ports/sonic2013/sonicretro.sonic2013.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/ports/sonic2013/sonicretro.sonic2013.keys b/package/batocera/ports/sonic2013/sonicretro.sonic2013.keys similarity index 100% rename from package/ports/sonic2013/sonicretro.sonic2013.keys rename to package/batocera/ports/sonic2013/sonicretro.sonic2013.keys diff --git a/package/ports/sonic3-air/001-fix-paths.patch b/package/batocera/ports/sonic3-air/001-fix-paths.patch similarity index 100% rename from package/ports/sonic3-air/001-fix-paths.patch rename to package/batocera/ports/sonic3-air/001-fix-paths.patch diff --git a/package/ports/sonic3-air/002-no-discord.patch b/package/batocera/ports/sonic3-air/002-no-discord.patch similarity index 100% rename from package/ports/sonic3-air/002-no-discord.patch rename to package/batocera/ports/sonic3-air/002-no-discord.patch diff --git a/package/ports/sonic3-air/003-use-system-zlib.patch b/package/batocera/ports/sonic3-air/003-use-system-zlib.patch similarity index 100% rename from package/ports/sonic3-air/003-use-system-zlib.patch rename to package/batocera/ports/sonic3-air/003-use-system-zlib.patch diff --git a/package/ports/sonic3-air/004-gles2-fix.patch b/package/batocera/ports/sonic3-air/004-gles2-fix.patch similarity index 100% rename from package/ports/sonic3-air/004-gles2-fix.patch rename to package/batocera/ports/sonic3-air/004-gles2-fix.patch diff --git a/package/ports/sonic3-air/CMakeLists.txt.gles2 b/package/batocera/ports/sonic3-air/CMakeLists.txt.gles2 similarity index 100% rename from package/ports/sonic3-air/CMakeLists.txt.gles2 rename to package/batocera/ports/sonic3-air/CMakeLists.txt.gles2 diff --git a/package/ports/sonic3-air/Config.in b/package/batocera/ports/sonic3-air/Config.in similarity index 100% rename from package/ports/sonic3-air/Config.in rename to package/batocera/ports/sonic3-air/Config.in diff --git a/package/ports/sonic3-air/sonic3-air.keys b/package/batocera/ports/sonic3-air/sonic3-air.keys similarity index 100% rename from package/ports/sonic3-air/sonic3-air.keys rename to package/batocera/ports/sonic3-air/sonic3-air.keys diff --git a/package/ports/sonic3-air/sonic3-air.mk b/package/batocera/ports/sonic3-air/sonic3-air.mk similarity index 91% rename from package/ports/sonic3-air/sonic3-air.mk rename to package/batocera/ports/sonic3-air/sonic3-air.mk index 13fb6f682ef..62a31eaddb9 100644 --- a/package/ports/sonic3-air/sonic3-air.mk +++ b/package/batocera/ports/sonic3-air/sonic3-air.mk @@ -14,7 +14,7 @@ SONIC3_AIR_LICENSE_FILE = COPYING.txt # Custom GLES 2.0 cmake define SONIC3_AIR_ADD_GLES2_CMAKE mkdir -p $(@D)/Oxygen/sonic3air/build/_gles2/ - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/ports/sonic3-air/CMakeLists.txt.gles2 $(@D)/Oxygen/sonic3air/build/_gles2/CMakeLists.txt + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/ports/sonic3-air/CMakeLists.txt.gles2 $(@D)/Oxygen/sonic3air/build/_gles2/CMakeLists.txt endef SONIC3_AIR_PRE_CONFIGURE_HOOKS += SONIC3_AIR_ADD_GLES2_CMAKE @@ -69,7 +69,7 @@ endef define SONIC3_AIR_EVMAPY mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/ports/sonic3-air/sonic3-air.keys \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/ports/sonic3-air/sonic3-air.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/ports/soniccd/Config.in b/package/batocera/ports/soniccd/Config.in similarity index 100% rename from package/ports/soniccd/Config.in rename to package/batocera/ports/soniccd/Config.in diff --git a/package/ports/soniccd/soniccd.mk b/package/batocera/ports/soniccd/soniccd.mk similarity index 92% rename from package/ports/soniccd/soniccd.mk rename to package/batocera/ports/soniccd/soniccd.mk index 01318e46112..8d1237d3893 100755 --- a/package/ports/soniccd/soniccd.mk +++ b/package/batocera/ports/soniccd/soniccd.mk @@ -30,7 +30,7 @@ endef define SONICCD_POST_PROCESS mkdir -p $(TARGET_DIR)/usr/share/evmapy $(TARGET_DIR)/usr/share/soniccd - cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/ports/soniccd/sonicretro.soniccd.keys \ + cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/ports/soniccd/sonicretro.soniccd.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/ports/soniccd/sonicretro.soniccd.keys b/package/batocera/ports/soniccd/sonicretro.soniccd.keys similarity index 100% rename from package/ports/soniccd/sonicretro.soniccd.keys rename to package/batocera/ports/soniccd/sonicretro.soniccd.keys diff --git a/package/ports/theforceengine/Config.in b/package/batocera/ports/theforceengine/Config.in similarity index 100% rename from package/ports/theforceengine/Config.in rename to package/batocera/ports/theforceengine/Config.in diff --git a/package/ports/theforceengine/theforceengine.keys b/package/batocera/ports/theforceengine/theforceengine.keys similarity index 100% rename from package/ports/theforceengine/theforceengine.keys rename to package/batocera/ports/theforceengine/theforceengine.keys diff --git a/package/ports/theforceengine/theforceengine.mk b/package/batocera/ports/theforceengine/theforceengine.mk similarity index 96% rename from package/ports/theforceengine/theforceengine.mk rename to package/batocera/ports/theforceengine/theforceengine.mk index 1e99b298c1e..877285c1c00 100644 --- a/package/ports/theforceengine/theforceengine.mk +++ b/package/batocera/ports/theforceengine/theforceengine.mk @@ -54,7 +54,7 @@ endef define THEFORCEENGINE_EVMAPY mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/ports/theforceengine/theforceengine.keys \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/ports/theforceengine/theforceengine.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/ports/tyrian/000-makefile-version.patch b/package/batocera/ports/tyrian/000-makefile-version.patch similarity index 100% rename from package/ports/tyrian/000-makefile-version.patch rename to package/batocera/ports/tyrian/000-makefile-version.patch diff --git a/package/ports/tyrian/001-fix-2p-score-text-screen.patch b/package/batocera/ports/tyrian/001-fix-2p-score-text-screen.patch similarity index 100% rename from package/ports/tyrian/001-fix-2p-score-text-screen.patch rename to package/batocera/ports/tyrian/001-fix-2p-score-text-screen.patch diff --git a/package/ports/tyrian/002-paths.patch b/package/batocera/ports/tyrian/002-paths.patch similarity index 100% rename from package/ports/tyrian/002-paths.patch rename to package/batocera/ports/tyrian/002-paths.patch diff --git a/package/ports/tyrian/Config.in b/package/batocera/ports/tyrian/Config.in similarity index 100% rename from package/ports/tyrian/Config.in rename to package/batocera/ports/tyrian/Config.in diff --git a/package/ports/tyrian/tyrian.keys b/package/batocera/ports/tyrian/tyrian.keys similarity index 100% rename from package/ports/tyrian/tyrian.keys rename to package/batocera/ports/tyrian/tyrian.keys diff --git a/package/ports/tyrian/tyrian.mk b/package/batocera/ports/tyrian/tyrian.mk similarity index 89% rename from package/ports/tyrian/tyrian.mk rename to package/batocera/ports/tyrian/tyrian.mk index 8e0cd0e662b..08597f91d7e 100644 --- a/package/ports/tyrian/tyrian.mk +++ b/package/batocera/ports/tyrian/tyrian.mk @@ -25,7 +25,7 @@ define TYRIAN_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/opentyrian $(TARGET_DIR)/usr/bin/ # evmap config mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/ports/tyrian/tyrian.keys $(TARGET_DIR)/usr/share/evmapy + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/ports/tyrian/tyrian.keys $(TARGET_DIR)/usr/share/evmapy endef $(eval $(generic-package)) diff --git a/package/ports/uqm/Config.in b/package/batocera/ports/uqm/Config.in similarity index 100% rename from package/ports/uqm/Config.in rename to package/batocera/ports/uqm/Config.in diff --git a/package/ports/uqm/uqm-0001-cmake.patch b/package/batocera/ports/uqm/uqm-0001-cmake.patch similarity index 100% rename from package/ports/uqm/uqm-0001-cmake.patch rename to package/batocera/ports/uqm/uqm-0001-cmake.patch diff --git a/package/ports/uqm/uqm.keys b/package/batocera/ports/uqm/uqm.keys similarity index 100% rename from package/ports/uqm/uqm.keys rename to package/batocera/ports/uqm/uqm.keys diff --git a/package/ports/uqm/uqm.mk b/package/batocera/ports/uqm/uqm.mk similarity index 86% rename from package/ports/uqm/uqm.mk rename to package/batocera/ports/uqm/uqm.mk index 9718d3fae26..5b3abc3d2b3 100644 --- a/package/ports/uqm/uqm.mk +++ b/package/batocera/ports/uqm/uqm.mk @@ -17,7 +17,7 @@ endif define UQM_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/share/evmapy $(INSTALL) -m 0755 $(@D)/sc2/src/urquan -D $(TARGET_DIR)/usr/bin/urquan - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/ports/uqm/uqm.keys $(TARGET_DIR)/usr/share/evmapy + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/ports/uqm/uqm.keys $(TARGET_DIR)/usr/share/evmapy endef $(eval $(cmake-package)) diff --git a/package/screens/batocera-backglass/Config.in b/package/batocera/screens/batocera-backglass/Config.in similarity index 100% rename from package/screens/batocera-backglass/Config.in rename to package/batocera/screens/batocera-backglass/Config.in diff --git a/package/screens/batocera-backglass/batocera-backglass-window.py b/package/batocera/screens/batocera-backglass/batocera-backglass-window.py similarity index 100% rename from package/screens/batocera-backglass/batocera-backglass-window.py rename to package/batocera/screens/batocera-backglass/batocera-backglass-window.py diff --git a/package/screens/batocera-backglass/batocera-backglass.mk b/package/batocera/screens/batocera-backglass/batocera-backglass.mk similarity index 58% rename from package/screens/batocera-backglass/batocera-backglass.mk rename to package/batocera/screens/batocera-backglass/batocera-backglass.mk index 1630464da7f..38b921d15cd 100644 --- a/package/screens/batocera-backglass/batocera-backglass.mk +++ b/package/batocera/screens/batocera-backglass/batocera-backglass.mk @@ -8,7 +8,7 @@ BATOCERA_BACKGLASS_VERSION = 1.0 BATOCERA_BACKGLASS_LICENSE = GPL BATOCERA_BACKGLASS_SOURCE= -BACKGLASS_PATH = $(BR2_EXTERNAL_BATOCERA_PATH)/package/screens/batocera-backglass +BACKGLASS_PATH = $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/screens/batocera-backglass define BATOCERA_BACKGLASS_INSTALL_TARGET_CMDS # script @@ -18,15 +18,15 @@ define BATOCERA_BACKGLASS_INSTALL_TARGET_CMDS # hooks mkdir -p $(TARGET_DIR)/usr/share/batocera-backglass/scripts - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/screens/batocera-backglass/scripts/*.sh $(TARGET_DIR)/usr/share/batocera-backglass/scripts/ + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/screens/batocera-backglass/scripts/*.sh $(TARGET_DIR)/usr/share/batocera-backglass/scripts/ # default web page mkdir -p $(TARGET_DIR)/usr/share/batocera-backglass/www/backglass-default - cp -pr $(BR2_EXTERNAL_BATOCERA_PATH)/package/screens/batocera-backglass/www/backglass-default/*.{js,css,htm} $(TARGET_DIR)/usr/share/batocera-backglass/www/backglass-default/ + cp -pr $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/screens/batocera-backglass/www/backglass-default/*.{js,css,htm} $(TARGET_DIR)/usr/share/batocera-backglass/www/backglass-default/ mkdir -p $(TARGET_DIR)/usr/share/batocera-backglass/www/backglass-image - cp -pr $(BR2_EXTERNAL_BATOCERA_PATH)/package/screens/batocera-backglass/www/backglass-image/*.{js,css,htm} $(TARGET_DIR)/usr/share/batocera-backglass/www/backglass-image/ + cp -pr $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/screens/batocera-backglass/www/backglass-image/*.{js,css,htm} $(TARGET_DIR)/usr/share/batocera-backglass/www/backglass-image/ mkdir -p $(TARGET_DIR)/usr/share/batocera-backglass/www/backglass-marquee - cp -pr $(BR2_EXTERNAL_BATOCERA_PATH)/package/screens/batocera-backglass/www/backglass-marquee/*.{js,css,htm} $(TARGET_DIR)/usr/share/batocera-backglass/www/backglass-marquee/ + cp -pr $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/screens/batocera-backglass/www/backglass-marquee/*.{js,css,htm} $(TARGET_DIR)/usr/share/batocera-backglass/www/backglass-marquee/ endef $(eval $(generic-package)) diff --git a/package/screens/batocera-backglass/batocera-backglass.sh b/package/batocera/screens/batocera-backglass/batocera-backglass.sh similarity index 100% rename from package/screens/batocera-backglass/batocera-backglass.sh rename to package/batocera/screens/batocera-backglass/batocera-backglass.sh diff --git a/package/screens/batocera-backglass/scripts/game-selected.sh b/package/batocera/screens/batocera-backglass/scripts/game-selected.sh similarity index 100% rename from package/screens/batocera-backglass/scripts/game-selected.sh rename to package/batocera/screens/batocera-backglass/scripts/game-selected.sh diff --git a/package/screens/batocera-backglass/scripts/system-selected.sh b/package/batocera/screens/batocera-backglass/scripts/system-selected.sh similarity index 100% rename from package/screens/batocera-backglass/scripts/system-selected.sh rename to package/batocera/screens/batocera-backglass/scripts/system-selected.sh diff --git a/package/screens/batocera-backglass/www/backglass-default/backglass-default.css b/package/batocera/screens/batocera-backglass/www/backglass-default/backglass-default.css similarity index 100% rename from package/screens/batocera-backglass/www/backglass-default/backglass-default.css rename to package/batocera/screens/batocera-backglass/www/backglass-default/backglass-default.css diff --git a/package/screens/batocera-backglass/www/backglass-default/backglass-default.js b/package/batocera/screens/batocera-backglass/www/backglass-default/backglass-default.js similarity index 100% rename from package/screens/batocera-backglass/www/backglass-default/backglass-default.js rename to package/batocera/screens/batocera-backglass/www/backglass-default/backglass-default.js diff --git a/package/screens/batocera-backglass/www/backglass-default/index.htm b/package/batocera/screens/batocera-backglass/www/backglass-default/index.htm similarity index 100% rename from package/screens/batocera-backglass/www/backglass-default/index.htm rename to package/batocera/screens/batocera-backglass/www/backglass-default/index.htm diff --git a/package/screens/batocera-backglass/www/backglass-image/backglass-mini.css b/package/batocera/screens/batocera-backglass/www/backglass-image/backglass-mini.css similarity index 100% rename from package/screens/batocera-backglass/www/backglass-image/backglass-mini.css rename to package/batocera/screens/batocera-backglass/www/backglass-image/backglass-mini.css diff --git a/package/screens/batocera-backglass/www/backglass-image/backglass-mini.js b/package/batocera/screens/batocera-backglass/www/backglass-image/backglass-mini.js similarity index 100% rename from package/screens/batocera-backglass/www/backglass-image/backglass-mini.js rename to package/batocera/screens/batocera-backglass/www/backglass-image/backglass-mini.js diff --git a/package/screens/batocera-backglass/www/backglass-image/index.htm b/package/batocera/screens/batocera-backglass/www/backglass-image/index.htm similarity index 100% rename from package/screens/batocera-backglass/www/backglass-image/index.htm rename to package/batocera/screens/batocera-backglass/www/backglass-image/index.htm diff --git a/package/screens/batocera-backglass/www/backglass-marquee/backglass-mini.css b/package/batocera/screens/batocera-backglass/www/backglass-marquee/backglass-mini.css similarity index 100% rename from package/screens/batocera-backglass/www/backglass-marquee/backglass-mini.css rename to package/batocera/screens/batocera-backglass/www/backglass-marquee/backglass-mini.css diff --git a/package/screens/batocera-backglass/www/backglass-marquee/backglass-mini.js b/package/batocera/screens/batocera-backglass/www/backglass-marquee/backglass-mini.js similarity index 100% rename from package/screens/batocera-backglass/www/backglass-marquee/backglass-mini.js rename to package/batocera/screens/batocera-backglass/www/backglass-marquee/backglass-mini.js diff --git a/package/screens/batocera-backglass/www/backglass-marquee/index.htm b/package/batocera/screens/batocera-backglass/www/backglass-marquee/index.htm similarity index 100% rename from package/screens/batocera-backglass/www/backglass-marquee/index.htm rename to package/batocera/screens/batocera-backglass/www/backglass-marquee/index.htm diff --git a/package/screens/dmd-simulator/Config.in b/package/batocera/screens/dmd-simulator/Config.in similarity index 100% rename from package/screens/dmd-simulator/Config.in rename to package/batocera/screens/dmd-simulator/Config.in diff --git a/package/screens/dmd-simulator/batocera.png b/package/batocera/screens/dmd-simulator/batocera.png similarity index 100% rename from package/screens/dmd-simulator/batocera.png rename to package/batocera/screens/dmd-simulator/batocera.png diff --git a/package/screens/dmd-simulator/dmd-simulator.mk b/package/batocera/screens/dmd-simulator/dmd-simulator.mk similarity index 65% rename from package/screens/dmd-simulator/dmd-simulator.mk rename to package/batocera/screens/dmd-simulator/dmd-simulator.mk index 6fa7709f77f..268b1a0a757 100644 --- a/package/screens/dmd-simulator/dmd-simulator.mk +++ b/package/batocera/screens/dmd-simulator/dmd-simulator.mk @@ -16,13 +16,13 @@ define DMD_SIMULATOR_INSTALL_DMD_SIMULATOR_PLAYER $(INSTALL) -D -m 0755 $(@D)/dmd-play.py $(TARGET_DIR)/usr/bin/dmd-play mkdir -p $(TARGET_DIR)/usr/share/dmd-simulator/scripts - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/screens/dmd-simulator/scripts/*.sh $(TARGET_DIR)/usr/share/dmd-simulator/scripts/ + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/screens/dmd-simulator/scripts/*.sh $(TARGET_DIR)/usr/share/dmd-simulator/scripts/ mkdir -p $(TARGET_DIR)/usr/share/reglinux/services - install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/screens/dmd-simulator/dmd_simulator.service $(TARGET_DIR)/usr/share/reglinux/services/dmd_simulator + install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/screens/dmd-simulator/dmd_simulator.service $(TARGET_DIR)/usr/share/reglinux/services/dmd_simulator - $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/screens/dmd-simulator/batocera.png $(TARGET_DIR)/usr/share/dmd-simulator/images/system/batocera.png - $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/screens/dmd-simulator/rainbow.png $(TARGET_DIR)/usr/share/dmd-simulator/images/system/rainbow.png + $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/screens/dmd-simulator/batocera.png $(TARGET_DIR)/usr/share/dmd-simulator/images/system/batocera.png + $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/screens/dmd-simulator/rainbow.png $(TARGET_DIR)/usr/share/dmd-simulator/images/system/rainbow.png endef ifeq ($(BR2_PACKAGE_DMD_SIMULATOR),y) diff --git a/package/screens/dmd-simulator/dmd_simulator.service b/package/batocera/screens/dmd-simulator/dmd_simulator.service similarity index 100% rename from package/screens/dmd-simulator/dmd_simulator.service rename to package/batocera/screens/dmd-simulator/dmd_simulator.service diff --git a/package/screens/dmd-simulator/rainbow.png b/package/batocera/screens/dmd-simulator/rainbow.png similarity index 100% rename from package/screens/dmd-simulator/rainbow.png rename to package/batocera/screens/dmd-simulator/rainbow.png diff --git a/package/screens/dmd-simulator/scripts/achievements.sh b/package/batocera/screens/dmd-simulator/scripts/achievements.sh similarity index 100% rename from package/screens/dmd-simulator/scripts/achievements.sh rename to package/batocera/screens/dmd-simulator/scripts/achievements.sh diff --git a/package/screens/dmd-simulator/scripts/game-selected.sh b/package/batocera/screens/dmd-simulator/scripts/game-selected.sh similarity index 100% rename from package/screens/dmd-simulator/scripts/game-selected.sh rename to package/batocera/screens/dmd-simulator/scripts/game-selected.sh diff --git a/package/screens/dmd-simulator/scripts/screensaver-start.sh b/package/batocera/screens/dmd-simulator/scripts/screensaver-start.sh similarity index 100% rename from package/screens/dmd-simulator/scripts/screensaver-start.sh rename to package/batocera/screens/dmd-simulator/scripts/screensaver-start.sh diff --git a/package/screens/dmd-simulator/scripts/system-selected.sh b/package/batocera/screens/dmd-simulator/scripts/system-selected.sh similarity index 100% rename from package/screens/dmd-simulator/scripts/system-selected.sh rename to package/batocera/screens/dmd-simulator/scripts/system-selected.sh diff --git a/package/toolchain/toolchain-optional-linaro-aarch64/Config.in b/package/batocera/toolchain/toolchain-optional-linaro-aarch64/Config.in similarity index 100% rename from package/toolchain/toolchain-optional-linaro-aarch64/Config.in rename to package/batocera/toolchain/toolchain-optional-linaro-aarch64/Config.in diff --git a/package/toolchain/toolchain-optional-linaro-aarch64/toolchain-optional-linaro-aarch64.mk b/package/batocera/toolchain/toolchain-optional-linaro-aarch64/toolchain-optional-linaro-aarch64.mk similarity index 100% rename from package/toolchain/toolchain-optional-linaro-aarch64/toolchain-optional-linaro-aarch64.mk rename to package/batocera/toolchain/toolchain-optional-linaro-aarch64/toolchain-optional-linaro-aarch64.mk diff --git a/package/utils-host/aml-dtbtools/Config.in.host b/package/batocera/utils-host/aml-dtbtools/Config.in.host similarity index 100% rename from package/utils-host/aml-dtbtools/Config.in.host rename to package/batocera/utils-host/aml-dtbtools/Config.in.host diff --git a/package/utils-host/aml-dtbtools/aml-dtbtools.mk b/package/batocera/utils-host/aml-dtbtools/aml-dtbtools.mk similarity index 100% rename from package/utils-host/aml-dtbtools/aml-dtbtools.mk rename to package/batocera/utils-host/aml-dtbtools/aml-dtbtools.mk diff --git a/package/utils-host/python-mkbootimg/Config.in.host b/package/batocera/utils-host/python-mkbootimg/Config.in.host similarity index 100% rename from package/utils-host/python-mkbootimg/Config.in.host rename to package/batocera/utils-host/python-mkbootimg/Config.in.host diff --git a/package/utils-host/python-mkbootimg/python-mkbootimg.mk b/package/batocera/utils-host/python-mkbootimg/python-mkbootimg.mk similarity index 100% rename from package/utils-host/python-mkbootimg/python-mkbootimg.mk rename to package/batocera/utils-host/python-mkbootimg/python-mkbootimg.mk diff --git a/package/utils-host/xa/Config.in.host b/package/batocera/utils-host/xa/Config.in.host similarity index 100% rename from package/utils-host/xa/Config.in.host rename to package/batocera/utils-host/xa/Config.in.host diff --git a/package/utils-host/xa/xa.mk b/package/batocera/utils-host/xa/xa.mk similarity index 100% rename from package/utils-host/xa/xa.mk rename to package/batocera/utils-host/xa/xa.mk diff --git a/package/utils/batocera-battery-checker/Config.in b/package/batocera/utils/batocera-battery-checker/Config.in similarity index 100% rename from package/utils/batocera-battery-checker/Config.in rename to package/batocera/utils/batocera-battery-checker/Config.in diff --git a/package/utils/batocera-battery-checker/batocera-battery-checker b/package/batocera/utils/batocera-battery-checker/batocera-battery-checker similarity index 100% rename from package/utils/batocera-battery-checker/batocera-battery-checker rename to package/batocera/utils/batocera-battery-checker/batocera-battery-checker diff --git a/package/utils/batocera-battery-checker/batocera-battery-checker.mk b/package/batocera/utils/batocera-battery-checker/batocera-battery-checker.mk similarity index 88% rename from package/utils/batocera-battery-checker/batocera-battery-checker.mk rename to package/batocera/utils/batocera-battery-checker/batocera-battery-checker.mk index 7d01f1cd1e2..1fbf8e22d77 100644 --- a/package/utils/batocera-battery-checker/batocera-battery-checker.mk +++ b/package/batocera/utils/batocera-battery-checker/batocera-battery-checker.mk @@ -8,7 +8,7 @@ BATOCERA_BATTERY_CHECKER_VERSION = 1.1 BATOCERA_BATTERY_CHECKER_LICENSE = GPL BATOCERA_BATTERY_CHECKER_SOURCE= -CHECKER_PATH = $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/batocera-battery-checker +CHECKER_PATH = $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/batocera-battery-checker define BATOCERA_BATTERY_CHECKER_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/bin diff --git a/package/utils/batocera-battery-checker/batocera-battery-checker.service b/package/batocera/utils/batocera-battery-checker/batocera-battery-checker.service similarity index 100% rename from package/utils/batocera-battery-checker/batocera-battery-checker.service rename to package/batocera/utils/batocera-battery-checker/batocera-battery-checker.service diff --git a/package/utils/batocera-ethtool/99-wol.rules b/package/batocera/utils/batocera-ethtool/99-wol.rules similarity index 100% rename from package/utils/batocera-ethtool/99-wol.rules rename to package/batocera/utils/batocera-ethtool/99-wol.rules diff --git a/package/utils/batocera-ethtool/Config.in b/package/batocera/utils/batocera-ethtool/Config.in similarity index 100% rename from package/utils/batocera-ethtool/Config.in rename to package/batocera/utils/batocera-ethtool/Config.in diff --git a/package/utils/batocera-ethtool/batocera-ethtool.mk b/package/batocera/utils/batocera-ethtool/batocera-ethtool.mk similarity index 72% rename from package/utils/batocera-ethtool/batocera-ethtool.mk rename to package/batocera/utils/batocera-ethtool/batocera-ethtool.mk index 56edc275c39..b5126579e91 100644 --- a/package/utils/batocera-ethtool/batocera-ethtool.mk +++ b/package/batocera/utils/batocera-ethtool/batocera-ethtool.mk @@ -6,7 +6,7 @@ define BATOCERA_ETHTOOL_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/etc/udev/rules.d - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/batocera-ethtool/99-wol.rules $(TARGET_DIR)/etc/udev/rules.d + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/batocera-ethtool/99-wol.rules $(TARGET_DIR)/etc/udev/rules.d endef $(eval $(generic-package)) diff --git a/package/utils/batocera-pygame/Config.in b/package/batocera/utils/batocera-pygame/Config.in similarity index 100% rename from package/utils/batocera-pygame/Config.in rename to package/batocera/utils/batocera-pygame/Config.in diff --git a/package/utils/batocera-pygame/batocera-pygame.mk b/package/batocera/utils/batocera-pygame/batocera-pygame.mk similarity index 86% rename from package/utils/batocera-pygame/batocera-pygame.mk rename to package/batocera/utils/batocera-pygame/batocera-pygame.mk index d05af6cd06b..66e39b4f811 100644 --- a/package/utils/batocera-pygame/batocera-pygame.mk +++ b/package/batocera/utils/batocera-pygame/batocera-pygame.mk @@ -12,7 +12,7 @@ BATOCERA_PYGAME_SITE = $(call github,lbrpdx,retrotrivia,$(BATOCERA_PYGAME_VERSIO define BATOCERA_PYGAME_INSTALL_SAMPLE mkdir -p $(TARGET_DIR)/usr/bin mkdir -p $(TARGET_DIR)/usr/share/reglinux/datainit/roms/pygame - $(INSTALL) -D -m 0644 $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/batocera-pygame/evmapy.keys $(TARGET_DIR)/usr/share/evmapy/pygame.keys + $(INSTALL) -D -m 0644 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/batocera-pygame/evmapy.keys $(TARGET_DIR)/usr/share/evmapy/pygame.keys # create an alias for pygame to be able to kill it with killall and evmapy (cd $(TARGET_DIR)/usr/bin && ln -sf python pygame) @@ -31,7 +31,7 @@ define BATOCERA_PYGAME_INSTALL_SAMPLE #$(INSTALL) -D -m 0644 $(@D)/README.md $(TARGET_DIR)/usr/share/reglinux/datainit/roms/pygame/retrotrivia/ #$(INSTALL) -D -m 0644 $(@D)/retrotrivia.png $(TARGET_DIR)/usr/share/reglinux/datainit/roms/pygame/images #$(INSTALL) -D -m 0644 $(@D)/retrotrivia-manual.pdf $(TARGET_DIR)/usr/share/reglinux/datainit/roms/pygame/manuals - #$(INSTALL) -D -m 0644 $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/batocera-pygame/retrotrivia.xml $(TARGET_DIR)/usr/share/reglinux/datainit/roms/pygame/gamelist.xml + #$(INSTALL) -D -m 0644 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/batocera-pygame/retrotrivia.xml $(TARGET_DIR)/usr/share/reglinux/datainit/roms/pygame/gamelist.xml endef BATOCERA_PYGAME_POST_INSTALL_TARGET_HOOKS = BATOCERA_PYGAME_INSTALL_SAMPLE diff --git a/package/utils/batocera-pygame/evmapy.keys b/package/batocera/utils/batocera-pygame/evmapy.keys similarity index 100% rename from package/utils/batocera-pygame/evmapy.keys rename to package/batocera/utils/batocera-pygame/evmapy.keys diff --git a/package/utils/batocera-pygame/retrotrivia.xml b/package/batocera/utils/batocera-pygame/retrotrivia.xml similarity index 100% rename from package/utils/batocera-pygame/retrotrivia.xml rename to package/batocera/utils/batocera-pygame/retrotrivia.xml diff --git a/package/utils/batocera-steam/Config.in b/package/batocera/utils/batocera-steam/Config.in similarity index 100% rename from package/utils/batocera-steam/Config.in rename to package/batocera/utils/batocera-steam/Config.in diff --git a/package/utils/batocera-steam/batocera-steam b/package/batocera/utils/batocera-steam/batocera-steam similarity index 100% rename from package/utils/batocera-steam/batocera-steam rename to package/batocera/utils/batocera-steam/batocera-steam diff --git a/package/utils/batocera-steam/batocera-steam-update b/package/batocera/utils/batocera-steam/batocera-steam-update similarity index 100% rename from package/utils/batocera-steam/batocera-steam-update rename to package/batocera/utils/batocera-steam/batocera-steam-update diff --git a/package/utils/batocera-steam/batocera-steam.mk b/package/batocera/utils/batocera-steam/batocera-steam.mk similarity index 69% rename from package/utils/batocera-steam/batocera-steam.mk rename to package/batocera/utils/batocera-steam/batocera-steam.mk index 195e01ef1ef..b9969a946c9 100644 --- a/package/utils/batocera-steam/batocera-steam.mk +++ b/package/batocera/utils/batocera-steam/batocera-steam.mk @@ -10,10 +10,10 @@ BATOCERA_STEAM_SOURCE= define BATOCERA_STEAM_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/bin install -m 0755 \ - $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/batocera-steam/batocera-steam \ + $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/batocera-steam/batocera-steam \ $(TARGET_DIR)/usr/bin/ install -m 0755 \ - $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/batocera-steam/batocera-steam-update \ + $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/batocera-steam/batocera-steam-update \ $(TARGET_DIR)/usr/bin/ endef diff --git a/package/utils/batocera-test/Config.in b/package/batocera/utils/batocera-test/Config.in similarity index 100% rename from package/utils/batocera-test/Config.in rename to package/batocera/utils/batocera-test/Config.in diff --git a/package/utils/batocera-test/batocera-test.mk b/package/batocera/utils/batocera-test/batocera-test.mk similarity index 72% rename from package/utils/batocera-test/batocera-test.mk rename to package/batocera/utils/batocera-test/batocera-test.mk index 3a058d0b5fd..23f45e1503c 100644 --- a/package/utils/batocera-test/batocera-test.mk +++ b/package/batocera/utils/batocera-test/batocera-test.mk @@ -9,7 +9,7 @@ BATOCERA_TEST_SOURCE= BATOCERA_TEST_DEPENDENCIES = python-requests define BATOCERA_TEST_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/batocera-test/src/batocera-test $(TARGET_DIR)/usr/bin/batocera-test + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/batocera-test/src/batocera-test $(TARGET_DIR)/usr/bin/batocera-test endef $(eval $(generic-package)) diff --git a/package/utils/batocera-test/src/batocera-test b/package/batocera/utils/batocera-test/src/batocera-test similarity index 100% rename from package/utils/batocera-test/src/batocera-test rename to package/batocera/utils/batocera-test/src/batocera-test diff --git a/package/utils/batocera-wine/Config.in b/package/batocera/utils/batocera-wine/Config.in similarity index 100% rename from package/utils/batocera-wine/Config.in rename to package/batocera/utils/batocera-wine/Config.in diff --git a/package/utils/batocera-wine/batocera-wine b/package/batocera/utils/batocera-wine/batocera-wine similarity index 100% rename from package/utils/batocera-wine/batocera-wine rename to package/batocera/utils/batocera-wine/batocera-wine diff --git a/package/utils/batocera-wine/batocera-wine-runners b/package/batocera/utils/batocera-wine/batocera-wine-runners similarity index 100% rename from package/utils/batocera-wine/batocera-wine-runners rename to package/batocera/utils/batocera-wine/batocera-wine-runners diff --git a/package/utils/batocera-wine/batocera-wine.mk b/package/batocera/utils/batocera-wine/batocera-wine.mk similarity index 62% rename from package/utils/batocera-wine/batocera-wine.mk rename to package/batocera/utils/batocera-wine/batocera-wine.mk index c5cd7049f77..fb700beaa51 100644 --- a/package/utils/batocera-wine/batocera-wine.mk +++ b/package/batocera/utils/batocera-wine/batocera-wine.mk @@ -9,16 +9,16 @@ BATOCERA_WINE_LICENSE = GPL BATOCERA_WINE_SOURCE= define BATOCERA_WINE_INSTALL_TARGET_CMDS - install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/batocera-wine/batocera-wine \ + install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/batocera-wine/batocera-wine \ $(TARGET_DIR)/usr/bin/batocera-wine - install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/batocera-wine/batocera-wine-runners \ + install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/batocera-wine/batocera-wine-runners \ $(TARGET_DIR)/usr/bin/batocera-wine-runners - install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/batocera-wine/bsod.py \ + install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/batocera-wine/bsod.py \ $(TARGET_DIR)/usr/bin/bsod-wine ln -fs /userdata/system/99-nvidia.conf $(TARGET_DIR)/etc/X11/xorg.conf.d/99-nvidia.conf mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/batocera-wine/mugen.keys \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/batocera-wine/mugen.keys \ $(TARGET_DIR)/usr/share/evmapy endef diff --git a/package/utils/batocera-wine/bsod.py b/package/batocera/utils/batocera-wine/bsod.py similarity index 100% rename from package/utils/batocera-wine/bsod.py rename to package/batocera/utils/batocera-wine/bsod.py diff --git a/package/utils/batocera-wine/mugen.keys b/package/batocera/utils/batocera-wine/mugen.keys similarity index 100% rename from package/utils/batocera-wine/mugen.keys rename to package/batocera/utils/batocera-wine/mugen.keys diff --git a/package/utils/bauh/001-batocera-customisations.patch b/package/batocera/utils/bauh/001-batocera-customisations.patch similarity index 100% rename from package/utils/bauh/001-batocera-customisations.patch rename to package/batocera/utils/bauh/001-batocera-customisations.patch diff --git a/package/utils/bauh/002-fixqt57notfound.patch b/package/batocera/utils/bauh/002-fixqt57notfound.patch similarity index 100% rename from package/utils/bauh/002-fixqt57notfound.patch rename to package/batocera/utils/bauh/002-fixqt57notfound.patch diff --git a/package/utils/bauh/003-suggestion-default-limit.patch b/package/batocera/utils/bauh/003-suggestion-default-limit.patch similarity index 100% rename from package/utils/bauh/003-suggestion-default-limit.patch rename to package/batocera/utils/bauh/003-suggestion-default-limit.patch diff --git a/package/utils/bauh/004-nvidia.patch b/package/batocera/utils/bauh/004-nvidia.patch similarity index 100% rename from package/utils/bauh/004-nvidia.patch rename to package/batocera/utils/bauh/004-nvidia.patch diff --git a/package/utils/bauh/005-fixnoresult.patch b/package/batocera/utils/bauh/005-fixnoresult.patch similarity index 100% rename from package/utils/bauh/005-fixnoresult.patch rename to package/batocera/utils/bauh/005-fixnoresult.patch diff --git a/package/utils/bauh/Config.in b/package/batocera/utils/bauh/Config.in similarity index 100% rename from package/utils/bauh/Config.in rename to package/batocera/utils/bauh/Config.in diff --git a/package/utils/bauh/bauh.mk b/package/batocera/utils/bauh/bauh.mk similarity index 100% rename from package/utils/bauh/bauh.mk rename to package/batocera/utils/bauh/bauh.mk diff --git a/package/utils/btop/Config.in b/package/batocera/utils/btop/Config.in similarity index 100% rename from package/utils/btop/Config.in rename to package/batocera/utils/btop/Config.in diff --git a/package/utils/btop/btop.mk b/package/batocera/utils/btop/btop.mk similarity index 100% rename from package/utils/btop/btop.mk rename to package/batocera/utils/btop/btop.mk diff --git a/package/utils/cabextract/001-fixfnmatch.patch b/package/batocera/utils/cabextract/001-fixfnmatch.patch similarity index 100% rename from package/utils/cabextract/001-fixfnmatch.patch rename to package/batocera/utils/cabextract/001-fixfnmatch.patch diff --git a/package/utils/cabextract/Config.in b/package/batocera/utils/cabextract/Config.in similarity index 100% rename from package/utils/cabextract/Config.in rename to package/batocera/utils/cabextract/Config.in diff --git a/package/utils/cabextract/cabextract.hash b/package/batocera/utils/cabextract/cabextract.hash similarity index 100% rename from package/utils/cabextract/cabextract.hash rename to package/batocera/utils/cabextract/cabextract.hash diff --git a/package/utils/cabextract/cabextract.mk b/package/batocera/utils/cabextract/cabextract.mk similarity index 100% rename from package/utils/cabextract/cabextract.mk rename to package/batocera/utils/cabextract/cabextract.mk diff --git a/package/utils/evmapy-system-config/Config.in b/package/batocera/utils/evmapy-system-config/Config.in similarity index 100% rename from package/utils/evmapy-system-config/Config.in rename to package/batocera/utils/evmapy-system-config/Config.in diff --git a/package/utils/evmapy-system-config/evmapy-system-config.mk b/package/batocera/utils/evmapy-system-config/evmapy-system-config.mk similarity index 57% rename from package/utils/evmapy-system-config/evmapy-system-config.mk rename to package/batocera/utils/evmapy-system-config/evmapy-system-config.mk index ac4f89380ff..e9a12ce0808 100644 --- a/package/utils/evmapy-system-config/evmapy-system-config.mk +++ b/package/batocera/utils/evmapy-system-config/evmapy-system-config.mk @@ -9,8 +9,8 @@ EVMAPY_SYSTEM_CONFIG_SOURCE = define EVMAPY_SYSTEM_CONFIG_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/evmapy-system-config/hotkey.keys $(TARGET_DIR)/usr/share/evmapy/windows.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/evmapy-system-config/mouse.keys $(TARGET_DIR)/usr/share/evmapy/windows_installers.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/evmapy-system-config/hotkey.keys $(TARGET_DIR)/usr/share/evmapy/windows.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/evmapy-system-config/mouse.keys $(TARGET_DIR)/usr/share/evmapy/windows_installers.keys endef $(eval $(generic-package)) diff --git a/package/utils/evmapy-system-config/hotkey.keys b/package/batocera/utils/evmapy-system-config/hotkey.keys similarity index 100% rename from package/utils/evmapy-system-config/hotkey.keys rename to package/batocera/utils/evmapy-system-config/hotkey.keys diff --git a/package/utils/evmapy-system-config/mouse.keys b/package/batocera/utils/evmapy-system-config/mouse.keys similarity index 100% rename from package/utils/evmapy-system-config/mouse.keys rename to package/batocera/utils/evmapy-system-config/mouse.keys diff --git a/package/utils/evmapy/001-python2-compatibility.patch b/package/batocera/utils/evmapy/001-python2-compatibility.patch similarity index 100% rename from package/utils/evmapy/001-python2-compatibility.patch rename to package/batocera/utils/evmapy/001-python2-compatibility.patch diff --git a/package/utils/evmapy/002-configdir.patch b/package/batocera/utils/evmapy/002-configdir.patch similarity index 100% rename from package/utils/evmapy/002-configdir.patch rename to package/batocera/utils/evmapy/002-configdir.patch diff --git a/package/utils/evmapy/003-restrict-keyboard-for-sdl.patch b/package/batocera/utils/evmapy/003-restrict-keyboard-for-sdl.patch similarity index 100% rename from package/utils/evmapy/003-restrict-keyboard-for-sdl.patch rename to package/batocera/utils/evmapy/003-restrict-keyboard-for-sdl.patch diff --git a/package/utils/evmapy/004-mouse.patch b/package/batocera/utils/evmapy/004-mouse.patch similarity index 100% rename from package/utils/evmapy/004-mouse.patch rename to package/batocera/utils/evmapy/004-mouse.patch diff --git a/package/utils/evmapy/005-jsonname.patch b/package/batocera/utils/evmapy/005-jsonname.patch similarity index 100% rename from package/utils/evmapy/005-jsonname.patch rename to package/batocera/utils/evmapy/005-jsonname.patch diff --git a/package/utils/evmapy/006-root-user.patch b/package/batocera/utils/evmapy/006-root-user.patch similarity index 100% rename from package/utils/evmapy/006-root-user.patch rename to package/batocera/utils/evmapy/006-root-user.patch diff --git a/package/utils/evmapy/007-pwname.patch b/package/batocera/utils/evmapy/007-pwname.patch similarity index 100% rename from package/utils/evmapy/007-pwname.patch rename to package/batocera/utils/evmapy/007-pwname.patch diff --git a/package/utils/evmapy/008-ready-flag.patch b/package/batocera/utils/evmapy/008-ready-flag.patch similarity index 100% rename from package/utils/evmapy/008-ready-flag.patch rename to package/batocera/utils/evmapy/008-ready-flag.patch diff --git a/package/utils/evmapy/Config.in b/package/batocera/utils/evmapy/Config.in similarity index 100% rename from package/utils/evmapy/Config.in rename to package/batocera/utils/evmapy/Config.in diff --git a/package/utils/evmapy/batocera-evmapy b/package/batocera/utils/evmapy/batocera-evmapy similarity index 100% rename from package/utils/evmapy/batocera-evmapy rename to package/batocera/utils/evmapy/batocera-evmapy diff --git a/package/utils/evmapy/evmapy.mk b/package/batocera/utils/evmapy/evmapy.mk similarity index 84% rename from package/utils/evmapy/evmapy.mk rename to package/batocera/utils/evmapy/evmapy.mk index 5e92e2c05d4..0fd1a87995c 100644 --- a/package/utils/evmapy/evmapy.mk +++ b/package/batocera/utils/evmapy/evmapy.mk @@ -14,7 +14,7 @@ EVMAPY_PRE_CONFIGURE_HOOKS += EVMAPY_FIXCHARS define EVMAPY_INSTALL_SCRIPTS mkdir -p $(TARGET_DIR)/usr/bin - $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/evmapy/batocera-evmapy $(TARGET_DIR)/usr/bin + $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/evmapy/batocera-evmapy $(TARGET_DIR)/usr/bin endef EVMAPY_POST_INSTALL_TARGET_HOOKS = EVMAPY_INSTALL_SCRIPTS diff --git a/package/utils/evsieve/Config.in b/package/batocera/utils/evsieve/Config.in similarity index 100% rename from package/utils/evsieve/Config.in rename to package/batocera/utils/evsieve/Config.in diff --git a/package/utils/evsieve/evsieve-helper b/package/batocera/utils/evsieve/evsieve-helper similarity index 100% rename from package/utils/evsieve/evsieve-helper rename to package/batocera/utils/evsieve/evsieve-helper diff --git a/package/utils/evsieve/evsieve-merge-devices b/package/batocera/utils/evsieve/evsieve-merge-devices similarity index 100% rename from package/utils/evsieve/evsieve-merge-devices rename to package/batocera/utils/evsieve/evsieve-merge-devices diff --git a/package/utils/evsieve/evsieve.mk b/package/batocera/utils/evsieve/evsieve.mk similarity index 83% rename from package/utils/evsieve/evsieve.mk rename to package/batocera/utils/evsieve/evsieve.mk index 6dfeb83275b..20d4bcf65cc 100644 --- a/package/utils/evsieve/evsieve.mk +++ b/package/batocera/utils/evsieve/evsieve.mk @@ -30,10 +30,10 @@ endef define EVSIEVE_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/$(EVSIEVE_BIN_DIR)release/evsieve \ $(TARGET_DIR)/usr/bin/evsieve - $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/evsieve/evsieve-merge-devices \ + $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/evsieve/evsieve-merge-devices \ $(TARGET_DIR)/usr/bin/evsieve-merge-devices $(TARGET_STRIP) -s $(TARGET_DIR)/usr/bin/evsieve - $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/evsieve/evsieve-helper $(TARGET_DIR)/usr/bin/evsieve-helper + $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/evsieve/evsieve-helper $(TARGET_DIR)/usr/bin/evsieve-helper endef $(eval $(generic-package)) diff --git a/package/utils/grim/Config.in b/package/batocera/utils/grim/Config.in similarity index 100% rename from package/utils/grim/Config.in rename to package/batocera/utils/grim/Config.in diff --git a/package/utils/grim/grim.hash b/package/batocera/utils/grim/grim.hash similarity index 100% rename from package/utils/grim/grim.hash rename to package/batocera/utils/grim/grim.hash diff --git a/package/utils/grim/grim.mk b/package/batocera/utils/grim/grim.mk similarity index 100% rename from package/utils/grim/grim.mk rename to package/batocera/utils/grim/grim.mk diff --git a/package/utils/imgui/CMakeLists.txt b/package/batocera/utils/imgui/CMakeLists.txt similarity index 100% rename from package/utils/imgui/CMakeLists.txt rename to package/batocera/utils/imgui/CMakeLists.txt diff --git a/package/utils/imgui/Config.in b/package/batocera/utils/imgui/Config.in similarity index 100% rename from package/utils/imgui/Config.in rename to package/batocera/utils/imgui/Config.in diff --git a/package/utils/imgui/imgui-config.cmake.in b/package/batocera/utils/imgui/imgui-config.cmake.in similarity index 100% rename from package/utils/imgui/imgui-config.cmake.in rename to package/batocera/utils/imgui/imgui-config.cmake.in diff --git a/package/utils/imgui/imgui.mk b/package/batocera/utils/imgui/imgui.mk similarity index 89% rename from package/utils/imgui/imgui.mk rename to package/batocera/utils/imgui/imgui.mk index 53f61f980f5..ebd8fa2e0c4 100644 --- a/package/utils/imgui/imgui.mk +++ b/package/batocera/utils/imgui/imgui.mk @@ -41,9 +41,9 @@ ifeq ($(BR2_PACKAGE_VULKAN_LOADER),y) endif define IMGUI_COPY_CMAKE_FILES - cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/imgui/CMakeLists.txt \ + cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/imgui/CMakeLists.txt \ $(@D)/ - cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/imgui/imgui-config.cmake.in \ + cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/imgui/imgui-config.cmake.in \ $(@D)/ endef diff --git a/package/utils/innoextract/Config.in b/package/batocera/utils/innoextract/Config.in similarity index 100% rename from package/utils/innoextract/Config.in rename to package/batocera/utils/innoextract/Config.in diff --git a/package/utils/innoextract/innoextract.mk b/package/batocera/utils/innoextract/innoextract.mk similarity index 100% rename from package/utils/innoextract/innoextract.mk rename to package/batocera/utils/innoextract/innoextract.mk diff --git a/package/utils/jstest2/001-codes.patch b/package/batocera/utils/jstest2/001-codes.patch similarity index 100% rename from package/utils/jstest2/001-codes.patch rename to package/batocera/utils/jstest2/001-codes.patch diff --git a/package/utils/jstest2/002-codes-list.patch b/package/batocera/utils/jstest2/002-codes-list.patch similarity index 100% rename from package/utils/jstest2/002-codes-list.patch rename to package/batocera/utils/jstest2/002-codes-list.patch diff --git a/package/utils/jstest2/003-display-event.patch b/package/batocera/utils/jstest2/003-display-event.patch similarity index 100% rename from package/utils/jstest2/003-display-event.patch rename to package/batocera/utils/jstest2/003-display-event.patch diff --git a/package/utils/jstest2/004-no-sdl1.patch b/package/batocera/utils/jstest2/004-no-sdl1.patch similarity index 100% rename from package/utils/jstest2/004-no-sdl1.patch rename to package/batocera/utils/jstest2/004-no-sdl1.patch diff --git a/package/utils/jstest2/005-infopath.patch b/package/batocera/utils/jstest2/005-infopath.patch similarity index 100% rename from package/utils/jstest2/005-infopath.patch rename to package/batocera/utils/jstest2/005-infopath.patch diff --git a/package/utils/jstest2/006-fix-gamecontrollerdb-path.patch b/package/batocera/utils/jstest2/006-fix-gamecontrollerdb-path.patch similarity index 100% rename from package/utils/jstest2/006-fix-gamecontrollerdb-path.patch rename to package/batocera/utils/jstest2/006-fix-gamecontrollerdb-path.patch diff --git a/package/utils/jstest2/Config.in b/package/batocera/utils/jstest2/Config.in similarity index 100% rename from package/utils/jstest2/Config.in rename to package/batocera/utils/jstest2/Config.in diff --git a/package/utils/jstest2/jstest2.hash b/package/batocera/utils/jstest2/jstest2.hash similarity index 100% rename from package/utils/jstest2/jstest2.hash rename to package/batocera/utils/jstest2/jstest2.hash diff --git a/package/utils/jstest2/jstest2.mk b/package/batocera/utils/jstest2/jstest2.mk similarity index 100% rename from package/utils/jstest2/jstest2.mk rename to package/batocera/utils/jstest2/jstest2.mk diff --git a/package/utils/l3afpad/Config.in b/package/batocera/utils/l3afpad/Config.in similarity index 100% rename from package/utils/l3afpad/Config.in rename to package/batocera/utils/l3afpad/Config.in diff --git a/package/utils/l3afpad/l3afpad.mk b/package/batocera/utils/l3afpad/l3afpad.mk similarity index 100% rename from package/utils/l3afpad/l3afpad.mk rename to package/batocera/utils/l3afpad/l3afpad.mk diff --git a/package/utils/ledspicer/001-userdata.patch b/package/batocera/utils/ledspicer/001-userdata.patch similarity index 100% rename from package/utils/ledspicer/001-userdata.patch rename to package/batocera/utils/ledspicer/001-userdata.patch diff --git a/package/utils/ledspicer/Config.in b/package/batocera/utils/ledspicer/Config.in similarity index 100% rename from package/utils/ledspicer/Config.in rename to package/batocera/utils/ledspicer/Config.in diff --git a/package/utils/ledspicer/ledspicer b/package/batocera/utils/ledspicer/ledspicer similarity index 100% rename from package/utils/ledspicer/ledspicer rename to package/batocera/utils/ledspicer/ledspicer diff --git a/package/utils/ledspicer/ledspicer.mk b/package/batocera/utils/ledspicer/ledspicer.mk similarity index 95% rename from package/utils/ledspicer/ledspicer.mk rename to package/batocera/utils/ledspicer/ledspicer.mk index 2569f61f3e2..b4f518f3f56 100644 --- a/package/utils/ledspicer/ledspicer.mk +++ b/package/batocera/utils/ledspicer/ledspicer.mk @@ -45,7 +45,7 @@ endef define LEDSPICER_SERVICE_INSTALL mkdir -p $(TARGET_DIR)/usr/share/reglinux/services - install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/ledspicer/ledspicer \ + install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/ledspicer/ledspicer \ $(TARGET_DIR)/usr/share/reglinux/services/ endef diff --git a/package/utils/mangohud/0001-vulkan-Per-device-font-image-s.patch b/package/batocera/utils/mangohud/0001-vulkan-Per-device-font-image-s.patch similarity index 100% rename from package/utils/mangohud/0001-vulkan-Per-device-font-image-s.patch rename to package/batocera/utils/mangohud/0001-vulkan-Per-device-font-image-s.patch diff --git a/package/utils/mangohud/0002-WIP-separate-transfer-queue-command.patch b/package/batocera/utils/mangohud/0002-WIP-separate-transfer-queue-command.patch similarity index 100% rename from package/utils/mangohud/0002-WIP-separate-transfer-queue-command.patch rename to package/batocera/utils/mangohud/0002-WIP-separate-transfer-queue-command.patch diff --git a/package/utils/mangohud/0003-add-stb_image-and-stb_image_resize.patch b/package/batocera/utils/mangohud/0003-add-stb_image-and-stb_image_resize.patch similarity index 100% rename from package/utils/mangohud/0003-add-stb_image-and-stb_image_resize.patch rename to package/batocera/utils/mangohud/0003-add-stb_image-and-stb_image_resize.patch diff --git a/package/utils/mangohud/0004-add-load-textures-functions.patch b/package/batocera/utils/mangohud/0004-add-load-textures-functions.patch similarity index 100% rename from package/utils/mangohud/0004-add-load-textures-functions.patch rename to package/batocera/utils/mangohud/0004-add-load-textures-functions.patch diff --git a/package/utils/mangohud/0005-convert-textures-to-rgba.patch b/package/batocera/utils/mangohud/0005-convert-textures-to-rgba.patch similarity index 100% rename from package/utils/mangohud/0005-convert-textures-to-rgba.patch rename to package/batocera/utils/mangohud/0005-convert-textures-to-rgba.patch diff --git a/package/utils/mangohud/0006-options-image-path-image_max_width-int-image_backgro.patch b/package/batocera/utils/mangohud/0006-options-image-path-image_max_width-int-image_backgro.patch similarity index 100% rename from package/utils/mangohud/0006-options-image-path-image_max_width-int-image_backgro.patch rename to package/batocera/utils/mangohud/0006-options-image-path-image_max_width-int-image_backgro.patch diff --git a/package/utils/mangohud/0007-Option-to-use-vulkan.patch b/package/batocera/utils/mangohud/0007-Option-to-use-vulkan.patch similarity index 100% rename from package/utils/mangohud/0007-Option-to-use-vulkan.patch rename to package/batocera/utils/mangohud/0007-Option-to-use-vulkan.patch diff --git a/package/utils/mangohud/0008-mangohud-on-drm.patch b/package/batocera/utils/mangohud/0008-mangohud-on-drm.patch similarity index 100% rename from package/utils/mangohud/0008-mangohud-on-drm.patch rename to package/batocera/utils/mangohud/0008-mangohud-on-drm.patch diff --git a/package/utils/mangohud/0009-desc-pool-flag.patch b/package/batocera/utils/mangohud/0009-desc-pool-flag.patch similarity index 100% rename from package/utils/mangohud/0009-desc-pool-flag.patch rename to package/batocera/utils/mangohud/0009-desc-pool-flag.patch diff --git a/package/utils/mangohud/0010-wip-single-params.patch b/package/batocera/utils/mangohud/0010-wip-single-params.patch similarity index 100% rename from package/utils/mangohud/0010-wip-single-params.patch rename to package/batocera/utils/mangohud/0010-wip-single-params.patch diff --git a/package/utils/mangohud/0011-wip-images.patch b/package/batocera/utils/mangohud/0011-wip-images.patch similarity index 100% rename from package/utils/mangohud/0011-wip-images.patch rename to package/batocera/utils/mangohud/0011-wip-images.patch diff --git a/package/utils/mangohud/0012-wip-notifier.patch b/package/batocera/utils/mangohud/0012-wip-notifier.patch similarity index 100% rename from package/utils/mangohud/0012-wip-notifier.patch rename to package/batocera/utils/mangohud/0012-wip-notifier.patch diff --git a/package/utils/mangohud/0013-wip-set-image-unloaded.patch b/package/batocera/utils/mangohud/0013-wip-set-image-unloaded.patch similarity index 100% rename from package/utils/mangohud/0013-wip-set-image-unloaded.patch rename to package/batocera/utils/mangohud/0013-wip-set-image-unloaded.patch diff --git a/package/utils/mangohud/0014-wip-simpler-locking-q.patch b/package/batocera/utils/mangohud/0014-wip-simpler-locking-q.patch similarity index 100% rename from package/utils/mangohud/0014-wip-simpler-locking-q.patch rename to package/batocera/utils/mangohud/0014-wip-simpler-locking-q.patch diff --git a/package/utils/mangohud/Config.in b/package/batocera/utils/mangohud/Config.in similarity index 100% rename from package/utils/mangohud/Config.in rename to package/batocera/utils/mangohud/Config.in diff --git a/package/utils/mangohud/mangohud.mk b/package/batocera/utils/mangohud/mangohud.mk similarity index 100% rename from package/utils/mangohud/mangohud.mk rename to package/batocera/utils/mangohud/mangohud.mk diff --git a/package/utils/mokutil/Config.in b/package/batocera/utils/mokutil/Config.in similarity index 100% rename from package/utils/mokutil/Config.in rename to package/batocera/utils/mokutil/Config.in diff --git a/package/utils/mokutil/mokutil.mk b/package/batocera/utils/mokutil/mokutil.mk similarity index 100% rename from package/utils/mokutil/mokutil.mk rename to package/batocera/utils/mokutil/mokutil.mk diff --git a/package/utils/od-commander/001-gcc13.patch b/package/batocera/utils/od-commander/001-gcc13.patch similarity index 100% rename from package/utils/od-commander/001-gcc13.patch rename to package/batocera/utils/od-commander/001-gcc13.patch diff --git a/package/utils/od-commander/Config.in b/package/batocera/utils/od-commander/Config.in similarity index 100% rename from package/utils/od-commander/Config.in rename to package/batocera/utils/od-commander/Config.in diff --git a/package/utils/od-commander/od-commander.hash b/package/batocera/utils/od-commander/od-commander.hash similarity index 100% rename from package/utils/od-commander/od-commander.hash rename to package/batocera/utils/od-commander/od-commander.hash diff --git a/package/utils/od-commander/od-commander.mk b/package/batocera/utils/od-commander/od-commander.mk similarity index 96% rename from package/utils/od-commander/od-commander.mk rename to package/batocera/utils/od-commander/od-commander.mk index 0523d19e0f0..92b1dd8b9a8 100644 --- a/package/utils/od-commander/od-commander.mk +++ b/package/batocera/utils/od-commander/od-commander.mk @@ -60,7 +60,7 @@ define OD_COMMANDER_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(OD_COMMANDER_BUILDDIR)commander \ $(TARGET_DIR)/usr/bin/od-commander mkdir -p $(TARGET_DIR)/usr/share/evmapy/ - cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/od-commander/odcommander.keys \ + cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/od-commander/odcommander.keys \ $(TARGET_DIR)/usr/share/evmapy/ endef diff --git a/package/utils/od-commander/odcommander.keys b/package/batocera/utils/od-commander/odcommander.keys similarity index 100% rename from package/utils/od-commander/odcommander.keys rename to package/batocera/utils/od-commander/odcommander.keys diff --git a/package/utils/pacman/001-no_completion.patch b/package/batocera/utils/pacman/001-no_completion.patch similarity index 100% rename from package/utils/pacman/001-no_completion.patch rename to package/batocera/utils/pacman/001-no_completion.patch diff --git a/package/utils/pacman/002-ignoreincludedmissing.patch b/package/batocera/utils/pacman/002-ignoreincludedmissing.patch similarity index 100% rename from package/utils/pacman/002-ignoreincludedmissing.patch rename to package/batocera/utils/pacman/002-ignoreincludedmissing.patch diff --git a/package/utils/pacman/003-mkdirsondb.patch b/package/batocera/utils/pacman/003-mkdirsondb.patch similarity index 100% rename from package/utils/pacman/003-mkdirsondb.patch rename to package/batocera/utils/pacman/003-mkdirsondb.patch diff --git a/package/utils/pacman/004-xmloutput.patch b/package/batocera/utils/pacman/004-xmloutput.patch similarity index 100% rename from package/utils/pacman/004-xmloutput.patch rename to package/batocera/utils/pacman/004-xmloutput.patch diff --git a/package/utils/pacman/Config.in b/package/batocera/utils/pacman/Config.in similarity index 100% rename from package/utils/pacman/Config.in rename to package/batocera/utils/pacman/Config.in diff --git a/package/utils/pacman/batocera-install.hook b/package/batocera/utils/pacman/batocera-install.hook similarity index 100% rename from package/utils/pacman/batocera-install.hook rename to package/batocera/utils/pacman/batocera-install.hook diff --git a/package/utils/pacman/batocera-makepkg b/package/batocera/utils/pacman/batocera-makepkg similarity index 100% rename from package/utils/pacman/batocera-makepkg rename to package/batocera/utils/pacman/batocera-makepkg diff --git a/package/utils/pacman/batocera-pacman-batoexec b/package/batocera/utils/pacman/batocera-pacman-batoexec similarity index 100% rename from package/utils/pacman/batocera-pacman-batoexec rename to package/batocera/utils/pacman/batocera-pacman-batoexec diff --git a/package/utils/pacman/batocera-uninstall.hook b/package/batocera/utils/pacman/batocera-uninstall.hook similarity index 100% rename from package/utils/pacman/batocera-uninstall.hook rename to package/batocera/utils/pacman/batocera-uninstall.hook diff --git a/package/utils/pacman/pacman.conf b/package/batocera/utils/pacman/pacman.conf similarity index 100% rename from package/utils/pacman/pacman.conf rename to package/batocera/utils/pacman/pacman.conf diff --git a/package/utils/pacman/pacman.mk b/package/batocera/utils/pacman/pacman.mk similarity index 57% rename from package/utils/pacman/pacman.mk rename to package/batocera/utils/pacman/pacman.mk index abc87b073dd..0b5047b2eae 100644 --- a/package/utils/pacman/pacman.mk +++ b/package/batocera/utils/pacman/pacman.mk @@ -33,12 +33,12 @@ endif define BATOCERA_PACMAN_INSTALL_CONF mkdir -p $(TARGET_DIR)/usr/share/reglinux/datainit/system/pacman rm -f $(TARGET_DIR)/usr/bin/makepkg - $(INSTALL) -D -m 0644 $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/pacman/pacman.conf $(TARGET_DIR)/etc/pacman.conf - $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/pacman/batocera-makepkg $(TARGET_DIR)/usr/bin/batocera-makepkg - $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/pacman/batocera-pacman-batoexec $(TARGET_DIR)/usr/bin/batocera-pacman-batoexec - $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/pacman/batocera-install.hook $(TARGET_DIR)/etc/pacman/hooks/batocera-install.hook - $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/pacman/batocera-uninstall.hook $(TARGET_DIR)/etc/pacman/hooks/batocera-uninstall.hook - $(INSTALL) -D -m 0644 $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/pacman/userdata_pacman.conf $(TARGET_DIR)/usr/share/reglinux/datainit/system/pacman/pacman.conf + $(INSTALL) -D -m 0644 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/pacman/pacman.conf $(TARGET_DIR)/etc/pacman.conf + $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/pacman/batocera-makepkg $(TARGET_DIR)/usr/bin/batocera-makepkg + $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/pacman/batocera-pacman-batoexec $(TARGET_DIR)/usr/bin/batocera-pacman-batoexec + $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/pacman/batocera-install.hook $(TARGET_DIR)/etc/pacman/hooks/batocera-install.hook + $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/pacman/batocera-uninstall.hook $(TARGET_DIR)/etc/pacman/hooks/batocera-uninstall.hook + $(INSTALL) -D -m 0644 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/pacman/userdata_pacman.conf $(TARGET_DIR)/usr/share/reglinux/datainit/system/pacman/pacman.conf sed -i -e s+"{BATOCERA_ARCHITECTURE}"+"$(PACMAN_ARCH)"+ $(TARGET_DIR)/etc/pacman.conf sed -i -e s+/usr/bin/bash+/bin/bash+ $(TARGET_DIR)/usr/bin/repo-add endef diff --git a/package/utils/pacman/userdata_pacman.conf b/package/batocera/utils/pacman/userdata_pacman.conf similarity index 100% rename from package/utils/pacman/userdata_pacman.conf rename to package/batocera/utils/pacman/userdata_pacman.conf diff --git a/package/utils/piboy/Config.in b/package/batocera/utils/piboy/Config.in similarity index 100% rename from package/utils/piboy/Config.in rename to package/batocera/utils/piboy/Config.in diff --git a/package/utils/piboy/fan.ini b/package/batocera/utils/piboy/fan.ini similarity index 100% rename from package/utils/piboy/fan.ini rename to package/batocera/utils/piboy/fan.ini diff --git a/package/batocera/utils/piboy/piboy.mk b/package/batocera/utils/piboy/piboy.mk new file mode 100644 index 00000000000..6028aa2f710 --- /dev/null +++ b/package/batocera/utils/piboy/piboy.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# PIBOY +# +################################################################################ +# Version.: Commits on Nov 1, 2021 +PIBOY_VERSION = a93fe087307d676381c196ba8f098d07190cfcb0 +PIBOY_SITE = $(call github,hancock33,piboycontrols,$(PIBOY_VERSION)) +PIBOY_DEPENDENCIES = linux + +define PIBOY_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/usr/bin + mkdir -p $(TARGET_DIR)/usr/share/piboy + + $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/piboy/piboy_fan_ctrl.py $(TARGET_DIR)/usr/bin/piboy_fan_ctrl.py + $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/piboy/piboy_aud_ctrl.py $(TARGET_DIR)/usr/bin/piboy_aud_ctrl.py + $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/piboy/piboy_power_ctrl.py $(TARGET_DIR)/usr/bin/piboy_power_ctrl.py + cp -a $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/piboy/fan.ini $(TARGET_DIR)/usr/share/piboy/fan.ini +endef + +$(eval $(kernel-module)) +$(eval $(generic-package)) diff --git a/package/utils/piboy/piboy_aud_ctrl.py b/package/batocera/utils/piboy/piboy_aud_ctrl.py similarity index 100% rename from package/utils/piboy/piboy_aud_ctrl.py rename to package/batocera/utils/piboy/piboy_aud_ctrl.py diff --git a/package/utils/piboy/piboy_fan_ctrl.py b/package/batocera/utils/piboy/piboy_fan_ctrl.py similarity index 100% rename from package/utils/piboy/piboy_fan_ctrl.py rename to package/batocera/utils/piboy/piboy_fan_ctrl.py diff --git a/package/utils/piboy/piboy_power_ctrl.py b/package/batocera/utils/piboy/piboy_power_ctrl.py similarity index 100% rename from package/utils/piboy/piboy_power_ctrl.py rename to package/batocera/utils/piboy/piboy_power_ctrl.py diff --git a/package/utils/picade/Config.in b/package/batocera/utils/picade/Config.in similarity index 100% rename from package/utils/picade/Config.in rename to package/batocera/utils/picade/Config.in diff --git a/package/utils/picade/picade.mk b/package/batocera/utils/picade/picade.mk similarity index 100% rename from package/utils/picade/picade.mk rename to package/batocera/utils/picade/picade.mk diff --git a/package/utils/pm-utils/Config.in b/package/batocera/utils/pm-utils/Config.in similarity index 100% rename from package/utils/pm-utils/Config.in rename to package/batocera/utils/pm-utils/Config.in diff --git a/package/utils/pm-utils/pm-utils.hash b/package/batocera/utils/pm-utils/pm-utils.hash similarity index 100% rename from package/utils/pm-utils/pm-utils.hash rename to package/batocera/utils/pm-utils/pm-utils.hash diff --git a/package/utils/pm-utils/pm-utils.mk b/package/batocera/utils/pm-utils/pm-utils.mk similarity index 100% rename from package/utils/pm-utils/pm-utils.mk rename to package/batocera/utils/pm-utils/pm-utils.mk diff --git a/package/utils/raspi2png/0001-makefile.patch b/package/batocera/utils/raspi2png/0001-makefile.patch similarity index 100% rename from package/utils/raspi2png/0001-makefile.patch rename to package/batocera/utils/raspi2png/0001-makefile.patch diff --git a/package/utils/raspi2png/Config.in b/package/batocera/utils/raspi2png/Config.in similarity index 100% rename from package/utils/raspi2png/Config.in rename to package/batocera/utils/raspi2png/Config.in diff --git a/package/utils/raspi2png/raspi2png.mk b/package/batocera/utils/raspi2png/raspi2png.mk similarity index 100% rename from package/utils/raspi2png/raspi2png.mk rename to package/batocera/utils/raspi2png/raspi2png.mk diff --git a/package/utils/rclone/Config.in b/package/batocera/utils/rclone/Config.in similarity index 100% rename from package/utils/rclone/Config.in rename to package/batocera/utils/rclone/Config.in diff --git a/package/utils/rclone/rclone.mk b/package/batocera/utils/rclone/rclone.mk similarity index 100% rename from package/utils/rclone/rclone.mk rename to package/batocera/utils/rclone/rclone.mk diff --git a/package/utils/re2c/Config.in b/package/batocera/utils/re2c/Config.in similarity index 100% rename from package/utils/re2c/Config.in rename to package/batocera/utils/re2c/Config.in diff --git a/package/utils/re2c/re2c.hash b/package/batocera/utils/re2c/re2c.hash similarity index 100% rename from package/utils/re2c/re2c.hash rename to package/batocera/utils/re2c/re2c.hash diff --git a/package/utils/re2c/re2c.mk b/package/batocera/utils/re2c/re2c.mk similarity index 100% rename from package/utils/re2c/re2c.mk rename to package/batocera/utils/re2c/re2c.mk diff --git a/package/utils/rpigpioswitch/Config.in b/package/batocera/utils/rpigpioswitch/Config.in similarity index 100% rename from package/utils/rpigpioswitch/Config.in rename to package/batocera/utils/rpigpioswitch/Config.in diff --git a/package/utils/rpigpioswitch/S72gpioinput b/package/batocera/utils/rpigpioswitch/S72gpioinput similarity index 100% rename from package/utils/rpigpioswitch/S72gpioinput rename to package/batocera/utils/rpigpioswitch/S72gpioinput diff --git a/package/utils/rpigpioswitch/S92switch b/package/batocera/utils/rpigpioswitch/S92switch similarity index 100% rename from package/utils/rpigpioswitch/S92switch rename to package/batocera/utils/rpigpioswitch/S92switch diff --git a/package/utils/rpigpioswitch/rpi-argonone.py b/package/batocera/utils/rpigpioswitch/rpi-argonone.py similarity index 100% rename from package/utils/rpigpioswitch/rpi-argonone.py rename to package/batocera/utils/rpigpioswitch/rpi-argonone.py diff --git a/package/utils/rpigpioswitch/rpi-kintaro-SafeShutdown.py b/package/batocera/utils/rpigpioswitch/rpi-kintaro-SafeShutdown.py similarity index 100% rename from package/utils/rpigpioswitch/rpi-kintaro-SafeShutdown.py rename to package/batocera/utils/rpigpioswitch/rpi-kintaro-SafeShutdown.py diff --git a/package/utils/rpigpioswitch/rpi-pin356-power.py b/package/batocera/utils/rpigpioswitch/rpi-pin356-power.py similarity index 100% rename from package/utils/rpigpioswitch/rpi-pin356-power.py rename to package/batocera/utils/rpigpioswitch/rpi-pin356-power.py diff --git a/package/utils/rpigpioswitch/rpi-pin56-power.py b/package/batocera/utils/rpigpioswitch/rpi-pin56-power.py similarity index 100% rename from package/utils/rpigpioswitch/rpi-pin56-power.py rename to package/batocera/utils/rpigpioswitch/rpi-pin56-power.py diff --git a/package/utils/rpigpioswitch/rpi-retroflag-AdvancedSafeShutdown.py b/package/batocera/utils/rpigpioswitch/rpi-retroflag-AdvancedSafeShutdown.py similarity index 100% rename from package/utils/rpigpioswitch/rpi-retroflag-AdvancedSafeShutdown.py rename to package/batocera/utils/rpigpioswitch/rpi-retroflag-AdvancedSafeShutdown.py diff --git a/package/utils/rpigpioswitch/rpi-retroflag-GPiCase.py b/package/batocera/utils/rpigpioswitch/rpi-retroflag-GPiCase.py similarity index 100% rename from package/utils/rpigpioswitch/rpi-retroflag-GPiCase.py rename to package/batocera/utils/rpigpioswitch/rpi-retroflag-GPiCase.py diff --git a/package/utils/rpigpioswitch/rpi-retroflag-SafeShutdown.py b/package/batocera/utils/rpigpioswitch/rpi-retroflag-SafeShutdown.py similarity index 100% rename from package/utils/rpigpioswitch/rpi-retroflag-SafeShutdown.py rename to package/batocera/utils/rpigpioswitch/rpi-retroflag-SafeShutdown.py diff --git a/package/utils/rpigpioswitch/rpi_gpioswitch.sh b/package/batocera/utils/rpigpioswitch/rpi_gpioswitch.sh similarity index 100% rename from package/utils/rpigpioswitch/rpi_gpioswitch.sh rename to package/batocera/utils/rpigpioswitch/rpi_gpioswitch.sh diff --git a/package/utils/rpigpioswitch/rpigpioswitch.mk b/package/batocera/utils/rpigpioswitch/rpigpioswitch.mk similarity index 93% rename from package/utils/rpigpioswitch/rpigpioswitch.mk rename to package/batocera/utils/rpigpioswitch/rpigpioswitch.mk index 9c660a9564f..dbbfa8024f8 100644 --- a/package/utils/rpigpioswitch/rpigpioswitch.mk +++ b/package/batocera/utils/rpigpioswitch/rpigpioswitch.mk @@ -1,12 +1,12 @@ ################################################################################ # -# rpigpioswitch +# rpigpioswitch # ################################################################################ RPIGPIOSWITCH_VERSION = 2.6 RPIGPIOSWITCH_SOURCE = -RPIGPIOSWITCH_SRC = $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/rpigpioswitch +RPIGPIOSWITCH_SRC = $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/rpigpioswitch define RPIGPIOSWITCH_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(RPIGPIOSWITCH_SRC)/S92switch \ diff --git a/package/utils/ryzenadj/Config.in b/package/batocera/utils/ryzenadj/Config.in similarity index 100% rename from package/utils/ryzenadj/Config.in rename to package/batocera/utils/ryzenadj/Config.in diff --git a/package/utils/ryzenadj/ryzenadj.mk b/package/batocera/utils/ryzenadj/ryzenadj.mk similarity index 100% rename from package/utils/ryzenadj/ryzenadj.mk rename to package/batocera/utils/ryzenadj/ryzenadj.mk diff --git a/package/utils/switchres/Config.in b/package/batocera/utils/switchres/Config.in similarity index 100% rename from package/utils/switchres/Config.in rename to package/batocera/utils/switchres/Config.in diff --git a/package/utils/switchres/switchres.mk b/package/batocera/utils/switchres/switchres.mk similarity index 100% rename from package/utils/switchres/switchres.mk rename to package/batocera/utils/switchres/switchres.mk diff --git a/package/utils/syncthing/Config.in b/package/batocera/utils/syncthing/Config.in similarity index 100% rename from package/utils/syncthing/Config.in rename to package/batocera/utils/syncthing/Config.in diff --git a/package/utils/syncthing/syncthing b/package/batocera/utils/syncthing/syncthing similarity index 100% rename from package/utils/syncthing/syncthing rename to package/batocera/utils/syncthing/syncthing diff --git a/package/utils/syncthing/syncthing.mk b/package/batocera/utils/syncthing/syncthing.mk similarity index 91% rename from package/utils/syncthing/syncthing.mk rename to package/batocera/utils/syncthing/syncthing.mk index 791696aa32c..59b17578708 100644 --- a/package/utils/syncthing/syncthing.mk +++ b/package/batocera/utils/syncthing/syncthing.mk @@ -23,7 +23,7 @@ ifeq ($(BR2_riscv),y) endif # GOFLAGS="-modcacherw" used to fix directory permissions to make sure cleanbuild works. -# For details see: +# For details see: # https://github.com/golang/go/issues/27161 https://github.com/golang/go/issues/27455 SYNCTHING_TARGET_ENV = \ @@ -42,7 +42,7 @@ endef define SYNCTHING_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/share/reglinux/services $(INSTALL) -D $(@D)/syncthing $(TARGET_DIR)/usr/bin/syncthing - $(INSTALL) -Dm755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/syncthing/syncthing \ + $(INSTALL) -Dm755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/syncthing/syncthing \ $(TARGET_DIR)/usr/share/reglinux/services/ endef diff --git a/package/utils/touchegg/Config.in b/package/batocera/utils/touchegg/Config.in similarity index 100% rename from package/utils/touchegg/Config.in rename to package/batocera/utils/touchegg/Config.in diff --git a/package/utils/touchegg/touchegg.conf b/package/batocera/utils/touchegg/touchegg.conf similarity index 100% rename from package/utils/touchegg/touchegg.conf rename to package/batocera/utils/touchegg/touchegg.conf diff --git a/package/utils/touchegg/touchegg.mk b/package/batocera/utils/touchegg/touchegg.mk similarity index 89% rename from package/utils/touchegg/touchegg.mk rename to package/batocera/utils/touchegg/touchegg.mk index 6450d6b7016..36cba14189b 100644 --- a/package/utils/touchegg/touchegg.mk +++ b/package/batocera/utils/touchegg/touchegg.mk @@ -13,7 +13,7 @@ TOUCHEGG_CONF_OPTS += -DCMAKE_INSTALL_PREFIX=$(STAGING_DIR)/usr/ -DUSE_SYSTEMD=0 define TOUCHEGG_INSTALL_TARGET_CMDS cp -f $(@D)/touchegg $(TARGET_DIR)/usr/bin mkdir -p $(TARGET_DIR)/usr/share/touchegg - cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/touchegg/touchegg.conf \ + cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/touchegg/touchegg.conf \ $(TARGET_DIR)/usr/share/touchegg/ mkdir -p $(TARGET_DIR)/etc/xdg ln -sf /usr/share/touchegg $(TARGET_DIR)/etc/xdg/ diff --git a/package/utils/unclutter/Config.in b/package/batocera/utils/unclutter/Config.in similarity index 100% rename from package/utils/unclutter/Config.in rename to package/batocera/utils/unclutter/Config.in diff --git a/package/utils/unclutter/unclutter.mk b/package/batocera/utils/unclutter/unclutter.mk similarity index 100% rename from package/utils/unclutter/unclutter.mk rename to package/batocera/utils/unclutter/unclutter.mk diff --git a/package/utils/vdpauinfo/Config.in b/package/batocera/utils/vdpauinfo/Config.in similarity index 100% rename from package/utils/vdpauinfo/Config.in rename to package/batocera/utils/vdpauinfo/Config.in diff --git a/package/utils/vdpauinfo/vdpauinfo.mk b/package/batocera/utils/vdpauinfo/vdpauinfo.mk similarity index 100% rename from package/utils/vdpauinfo/vdpauinfo.mk rename to package/batocera/utils/vdpauinfo/vdpauinfo.mk diff --git a/package/utils/wf-recorder/001-no-git.patch b/package/batocera/utils/wf-recorder/001-no-git.patch similarity index 100% rename from package/utils/wf-recorder/001-no-git.patch rename to package/batocera/utils/wf-recorder/001-no-git.patch diff --git a/package/utils/wf-recorder/Config.in b/package/batocera/utils/wf-recorder/Config.in similarity index 100% rename from package/utils/wf-recorder/Config.in rename to package/batocera/utils/wf-recorder/Config.in diff --git a/package/utils/wf-recorder/wf-recorder.hash b/package/batocera/utils/wf-recorder/wf-recorder.hash similarity index 100% rename from package/utils/wf-recorder/wf-recorder.hash rename to package/batocera/utils/wf-recorder/wf-recorder.hash diff --git a/package/utils/wf-recorder/wf-recorder.mk b/package/batocera/utils/wf-recorder/wf-recorder.mk similarity index 100% rename from package/utils/wf-recorder/wf-recorder.mk rename to package/batocera/utils/wf-recorder/wf-recorder.mk diff --git a/package/utils/wii-u-gc-adapter/99-wii-u-gc-adapter.rules b/package/batocera/utils/wii-u-gc-adapter/99-wii-u-gc-adapter.rules similarity index 100% rename from package/utils/wii-u-gc-adapter/99-wii-u-gc-adapter.rules rename to package/batocera/utils/wii-u-gc-adapter/99-wii-u-gc-adapter.rules diff --git a/package/utils/wii-u-gc-adapter/Config.in b/package/batocera/utils/wii-u-gc-adapter/Config.in similarity index 100% rename from package/utils/wii-u-gc-adapter/Config.in rename to package/batocera/utils/wii-u-gc-adapter/Config.in diff --git a/package/utils/wii-u-gc-adapter/wii-u-gc-adapter-daemon b/package/batocera/utils/wii-u-gc-adapter/wii-u-gc-adapter-daemon similarity index 100% rename from package/utils/wii-u-gc-adapter/wii-u-gc-adapter-daemon rename to package/batocera/utils/wii-u-gc-adapter/wii-u-gc-adapter-daemon diff --git a/package/utils/wii-u-gc-adapter/wii-u-gc-adapter.mk b/package/batocera/utils/wii-u-gc-adapter/wii-u-gc-adapter.mk similarity index 70% rename from package/utils/wii-u-gc-adapter/wii-u-gc-adapter.mk rename to package/batocera/utils/wii-u-gc-adapter/wii-u-gc-adapter.mk index 681f3bbffa5..4627e8c2e09 100644 --- a/package/utils/wii-u-gc-adapter/wii-u-gc-adapter.mk +++ b/package/batocera/utils/wii-u-gc-adapter/wii-u-gc-adapter.mk @@ -14,9 +14,9 @@ endef define WII_U_GC_ADAPTER_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(@D)/wii-u-gc-adapter $(TARGET_DIR)/usr/bin/wii-u-gc-adapter - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/wii-u-gc-adapter/wii-u-gc-adapter-daemon $(TARGET_DIR)/usr/bin/wii-u-gc-adapter-daemon + $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/wii-u-gc-adapter/wii-u-gc-adapter-daemon $(TARGET_DIR)/usr/bin/wii-u-gc-adapter-daemon mkdir -p $(TARGET_DIR)/etc/udev/rules.d - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/wii-u-gc-adapter/99-wii-u-gc-adapter.rules $(TARGET_DIR)/etc/udev/rules.d + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/wii-u-gc-adapter/99-wii-u-gc-adapter.rules $(TARGET_DIR)/etc/udev/rules.d endef $(eval $(generic-package)) diff --git a/package/utils/winetricks/Config.in b/package/batocera/utils/winetricks/Config.in similarity index 100% rename from package/utils/winetricks/Config.in rename to package/batocera/utils/winetricks/Config.in diff --git a/package/utils/winetricks/winetricks.mk b/package/batocera/utils/winetricks/winetricks.mk similarity index 100% rename from package/utils/winetricks/winetricks.mk rename to package/batocera/utils/winetricks/winetricks.mk diff --git a/package/utils/wlr-randr/Config.in b/package/batocera/utils/wlr-randr/Config.in similarity index 100% rename from package/utils/wlr-randr/Config.in rename to package/batocera/utils/wlr-randr/Config.in diff --git a/package/utils/wlr-randr/wlr-randr.hash b/package/batocera/utils/wlr-randr/wlr-randr.hash similarity index 100% rename from package/utils/wlr-randr/wlr-randr.hash rename to package/batocera/utils/wlr-randr/wlr-randr.hash diff --git a/package/utils/wlr-randr/wlr-randr.mk b/package/batocera/utils/wlr-randr/wlr-randr.mk similarity index 100% rename from package/utils/wlr-randr/wlr-randr.mk rename to package/batocera/utils/wlr-randr/wlr-randr.mk diff --git a/package/utils/xosd/Config.in b/package/batocera/utils/xosd/Config.in similarity index 100% rename from package/utils/xosd/Config.in rename to package/batocera/utils/xosd/Config.in diff --git a/package/utils/xosd/xosd.mk b/package/batocera/utils/xosd/xosd.mk similarity index 100% rename from package/utils/xosd/xosd.mk rename to package/batocera/utils/xosd/xosd.mk diff --git a/package/utils/xwiimote/0001-xwiishowir.patch b/package/batocera/utils/xwiimote/0001-xwiishowir.patch similarity index 100% rename from package/utils/xwiimote/0001-xwiishowir.patch rename to package/batocera/utils/xwiimote/0001-xwiishowir.patch diff --git a/package/utils/xwiimote/Config.in b/package/batocera/utils/xwiimote/Config.in similarity index 100% rename from package/utils/xwiimote/Config.in rename to package/batocera/utils/xwiimote/Config.in diff --git a/package/utils/xwiimote/xwiimote.mk b/package/batocera/utils/xwiimote/xwiimote.mk similarity index 100% rename from package/utils/xwiimote/xwiimote.mk rename to package/batocera/utils/xwiimote/xwiimote.mk diff --git a/package/utils/xxd/Config.in b/package/batocera/utils/xxd/Config.in similarity index 100% rename from package/utils/xxd/Config.in rename to package/batocera/utils/xxd/Config.in diff --git a/package/utils/xxd/xxd.mk b/package/batocera/utils/xxd/xxd.mk similarity index 100% rename from package/utils/xxd/xxd.mk rename to package/batocera/utils/xxd/xxd.mk diff --git a/package/utils/zramswap/Config.in b/package/batocera/utils/zramswap/Config.in similarity index 100% rename from package/utils/zramswap/Config.in rename to package/batocera/utils/zramswap/Config.in diff --git a/package/utils/zramswap/zramswap b/package/batocera/utils/zramswap/zramswap similarity index 100% rename from package/utils/zramswap/zramswap rename to package/batocera/utils/zramswap/zramswap diff --git a/package/utils/zramswap/zramswap.mk b/package/batocera/utils/zramswap/zramswap.mk similarity index 73% rename from package/utils/zramswap/zramswap.mk rename to package/batocera/utils/zramswap/zramswap.mk index 9b56b05a6a3..5632be1237d 100644 --- a/package/utils/zramswap/zramswap.mk +++ b/package/batocera/utils/zramswap/zramswap.mk @@ -10,7 +10,7 @@ ZRAMSWAP_SITE = define ZRAMSWAP_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/share/reglinux/services - $(INSTALL) -Dm755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/zramswap/zramswap $(TARGET_DIR)/usr/share/reglinux/services/ + $(INSTALL) -Dm755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/utils/zramswap/zramswap $(TARGET_DIR)/usr/share/reglinux/services/ endef $(eval $(generic-package)) diff --git a/package/controllers/aelightgun/aelightgun.mk b/package/controllers/aelightgun/aelightgun.mk deleted file mode 100644 index 64ee271c0c0..00000000000 --- a/package/controllers/aelightgun/aelightgun.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# aelightgun -# -################################################################################ -AELIGHTGUN_VERSION = 1 -AELIGHTGUN_LICENSE = GPL -AELIGHTGUN_SOURCE= - -define AELIGHTGUN_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/aelightgun/99-aelightgun.rules $(TARGET_DIR)/etc/udev/rules.d/99-aelightgun.rules - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/aelightgun/virtual-aelightgun-add $(TARGET_DIR)/usr/bin/virtual-aelightgun-add -endef - -$(eval $(generic-package)) diff --git a/package/controllers/batocera-gun-calibrator/batocera-gun-calibrator.mk b/package/controllers/batocera-gun-calibrator/batocera-gun-calibrator.mk deleted file mode 100644 index 3e0129c606a..00000000000 --- a/package/controllers/batocera-gun-calibrator/batocera-gun-calibrator.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# batocera-gun-calibrator -# -################################################################################ -BATOCERA_GUN_CALIBRATOR_VERSION = 1 -BATOCERA_GUN_CALIBRATOR_LICENSE = GPL -BATOCERA_GUN_CALIBRATOR_SOURCE= - -define BATOCERA_GUN_CALIBRATOR_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/batocera-gun-calibrator/batocera-gun-calibrator $(TARGET_DIR)/usr/bin/batocera-gun-calibrator - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/batocera-gun-calibrator/batocera-gun-calibrator-daemon $(TARGET_DIR)/usr/bin/batocera-gun-calibrator-daemon - $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/batocera-gun-calibrator/99-gun-calibrator.rules $(TARGET_DIR)/etc/udev/rules.d/99-gun-calibrator.rules - -endef - -$(eval $(generic-package)) diff --git a/package/controllers/jammasd/jammasd.mk b/package/controllers/jammasd/jammasd.mk deleted file mode 100644 index 759eb24e862..00000000000 --- a/package/controllers/jammasd/jammasd.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# jammasd -# -################################################################################ - -JAMMASD_VERSION = 1 -JAMMASD_LICENCE = GPL -JAMMASD_SOURCE = - -define JAMMASD_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/jammasd/99-jammasd.rules $(TARGET_DIR)/etc/udev/rules.d/99-jammasd.rules - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/jammasd/jammASDSplit $(TARGET_DIR)/usr/bin/jammASDSplit -endef - -$(eval $(generic-package)) diff --git a/package/controllers/retroshooter-guns/retroshooter-guns.mk b/package/controllers/retroshooter-guns/retroshooter-guns.mk deleted file mode 100644 index 7f857e65e89..00000000000 --- a/package/controllers/retroshooter-guns/retroshooter-guns.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# Retro Shooter Lightguns -# -################################################################################ -RETROSHOOTER_GUNS_VERSION = 1 -RETROSHOOTER_GUNS_LICENSE = GPL -RETROSHOOTER_GUNS_SOURCE= - -define RETROSHOOTER_GUNS_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/retroshooter-guns/99-retroshooter-guns.rules $(TARGET_DIR)/etc/udev/rules.d/99-retroshooter-guns.rules - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/retroshooter-guns/retroshooter-guns-add $(TARGET_DIR)/usr/bin/retroshooter-guns-add - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/retroshooter-guns/batocera-retroshooter-calibrator $(TARGET_DIR)/usr/bin/batocera-retroshooter-calibrator - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/retroshooter-guns/batocera-retroshooter-calibrator-daemon $(TARGET_DIR)/usr/bin/batocera-retroshooter-calibrator-daemon -endef - -$(eval $(generic-package)) diff --git a/package/controllers/samco-guns/samco-guns.mk b/package/controllers/samco-guns/samco-guns.mk deleted file mode 100644 index 6a9052e2bd2..00000000000 --- a/package/controllers/samco-guns/samco-guns.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# samco-guns -# -################################################################################ -SAMCO_GUNS_VERSION = 1 -SAMCO_GUNS_LICENSE = GPL -SAMCO_GUNS_SOURCE= - -define SAMCO_GUNS_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/samco-guns/99-samco-guns.rules $(TARGET_DIR)/etc/udev/rules.d/99-samco-guns.rules - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/samco-guns/virtual-samco-gun-status $(TARGET_DIR)/usr/bin/virtual-samco-gun-status -endef - -$(eval $(generic-package)) diff --git a/package/controllers/wiimotes-rules/wiimotes-rules.mk b/package/controllers/wiimotes-rules/wiimotes-rules.mk deleted file mode 100644 index d6c466e9248..00000000000 --- a/package/controllers/wiimotes-rules/wiimotes-rules.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# wiimotes-rules -# -################################################################################ -WIIMOTES_RULES_VERSION = 1 -WIIMOTES_RULES_LICENSE = GPL -WIIMOTES_RULES_SOURCE= - -define WIIMOTES_RULES_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/wiimotes-rules/99-wiimote.rules $(TARGET_DIR)/etc/udev/rules.d/99-wiimote.rules - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/wiimotes-rules/virtual-wii-mouse-bar-add $(TARGET_DIR)/usr/bin/virtual-wii-mouse-bar-add - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/wiimotes-rules/virtual-wii-mouse-bar-remap $(TARGET_DIR)/usr/bin/virtual-wii-mouse-bar-remap - $(INSTALL) -m 0755 -D $(BR2_EXTERNAL_BATOCERA_PATH)/package/controllers/wiimotes-rules/virtual-wii-mouse-bar-joystick-status $(TARGET_DIR)/usr/bin/virtual-wii-mouse-bar-joystick-status -endef - -$(eval $(generic-package)) diff --git a/package/emulationstation/batocera-es-system/README.md b/package/emulationstation/batocera-es-system/README.md deleted file mode 100644 index e0bd62ed3d7..00000000000 --- a/package/emulationstation/batocera-es-system/README.md +++ /dev/null @@ -1,43 +0,0 @@ -## Directory navigation - - - `batocera-es-system.py` The Python script which generates `es_features.cfg` and `es_systems.cfg` based on the `es_features.yml` and `es_systems.yml` YML files. - - `es_systems.yml` The systems that ES recognizes and shows on the system list when the user has installed the appropriate ROMs. Contains some metadata about the system, such as full name and manufacture date. This is the file you'd want to edit if you want to put a comment in the generated roms//_info.txt file. - - `es_features.yml` The configuration file EmulationStation uses to show which options are available for each system (in “features”). Also includes the advanced per-system settings (in “cfeatures” as their own unique entries). Used in conjunction with the [config generators](https://github.com/batocera-linux/batocera.linux/tree/master/package/core/batocera-configgen/configgen/configgen/generators) to define new options. The user may override this with a custom file. - - `roms` REG-Linux's pre-bundled ROMs, and other necessary files for the ROMs directory. Follow the links to know more and support their authors. - - | ⌨ | ***Atari 2600*** | | | - | :---: | :---: | :--- | :--- | - | ☆ | ![Amoeba Jump](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/emulationstation/batocera-es-system/roms/atari2600/images/Amoeba-Jump-marquee.png) | Author: Dionoid | https://atariage.com/forums/topic/280211-amoeba-jump/ | - | | | | | - | ⌨ | ***Commodore 64*** | | | - | ☆ | ![Relentless 64](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/emulationstation/batocera-es-system/roms/c64/images/Relentless64-marquee.png) | Authors: Paul 'Axelay' Kooistra; Harris 'rexbeng' Kladis; Pierre 'Cyborgjeff' Martin | https://rgcddev.itch.io/relentless-64 | - | ★ | ![Showdown](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/emulationstation/batocera-es-system/roms/c64/images/Showdown-marquee.png) | Author: Henning Ludvigsen | https://www.badgerpunch.com/title/showdown/ | - | | | | | - | ⌨ | ***Game Boy Advance*** | | | - | ★ | ![Anguna - Warriors of Virtue](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/emulationstation/batocera-es-system/roms/gba/images/Anguna-marquee.png) | Author: Bite The Chili | http://www.tolberts.net/anguna/ | - | | | | | - | ⌨ | ***Game Boy Color*** | | | - | ☆ | ![Petris](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/emulationstation/batocera-es-system/roms/gbc/images/Petris-marquee.png) | Author: bbbbbr | https://bbbbbr.itch.io/petris | - | | | | | - | ⌨ | ***Master System*** | | | - | ☆ | ![Mai Nurse](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/emulationstation/batocera-es-system/roms/mastersystem/images/Mai-Nurse-marquee.png) | Author: lunoka | https://lunoka.itch.io/mai-nurse | - | | | | | - | ⌨ | ***Mega Drive / Genesis*** | | | - | ★ | ![Hayato's Journey](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/emulationstation/batocera-es-system/roms/megadrive/images/Hayato-Journey-marquee.png) | Author: Master Linkuei | https://master-linkuei.itch.io/hayatos-journey | - | ☆ | ![Old Towers](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/emulationstation/batocera-es-system/roms/megadrive/images/Old-Towers-marquee.png) | Author: Denis Grachev | https://retrosouls.itch.io/old-towers | - | | | | | - | ⌨ | ***Nintendo Entertainment System*** | | | - | ☆ | ![Alter Ego](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/emulationstation/batocera-es-system/roms/nes/images/Alter-Ego-marquee.png) | Author: Shiru | https://shiru.untergrund.net/ | - | | | | | - | ⌨ | ***Super Nintendo Entertainment System*** | | | - | ★ | ![Dottie Flowers](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/emulationstation/batocera-es-system/roms/snes/images/Dottie-Flowers-marquee.png) | Author: Goldlocke | https://goldlocke.itch.io/dottie-flowers | - | ☆ | ![Super Boss Gaiden](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/emulationstation/batocera-es-system/roms/snes/images/Super-Boss-Gaiden-marquee.png) | Authors: Dieter von Laser; Chrono Moogle | https://superbossgaiden.superfamicom.org/ | - | | | | | - | ⌨ | ***PC Engine*** | | | - | ★ | ![Dinoforce](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/emulationstation/batocera-es-system/roms/pcengine/images/Dinoforce-marquee.png) | Author: PCE Works | https://dinoforce.pceworks.net/ | - | | | | | - | ⌨ | ***Ports*** | | | - | ☆ | ![DOOM (shareware)](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/emulationstation/batocera-es-system/roms/prboom/images/doom1_shareware-marquee.png) | Author: id Software | https://prboom.sourceforge.net/ | - | ☆ | ![MrBoom](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/emulationstation/batocera-es-system/roms/mrboom/images/MrBoom-marquee.png) | Author: Remdy Software | https://github.com/Javanaise/mrboom-libretro | - | ★ | ![OD Commander](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/emulationstation/batocera-es-system/roms/odcommander/images/od-commander-marquee.png) | Author: glebm | https://github.com/od-contrib/commander | - | ☆ | ![SDLPoP](https://raw.githubusercontent.com/REG-Linux/REG-Linux/master/package/emulationstation/batocera-es-system/roms/sdlpop/images/sdlpop-marquee.png) | Author: NagyD | https://github.com/NagyD/SDLPoP | diff --git a/package/reglinux/emulators/reglinux-mame/reglinux-mame.mk b/package/reglinux/emulators/reglinux-mame/reglinux-mame.mk index b0c223cb1fd..83ab40b62fd 100644 --- a/package/reglinux/emulators/reglinux-mame/reglinux-mame.mk +++ b/package/reglinux/emulators/reglinux-mame/reglinux-mame.mk @@ -86,57 +86,57 @@ define REGLINUX_MAME_INSTALL_TARGET_CMDS # gameStop script when exiting a rotated screen mkdir -p $(TARGET_DIR)/usr/share/reglinux/configgen/scripts - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/rotation_fix.sh $(TARGET_DIR)/usr/share/reglinux/configgen/scripts/rotation_fix.sh + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/rotation_fix.sh $(TARGET_DIR)/usr/share/reglinux/configgen/scripts/rotation_fix.sh # Copy user -autoboot_command overrides (batocera.linux/batocera.linux#11706) mkdir -p $(MAME_CONF_INIT)/autoload - cp -R $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/autoload $(MAME_CONF_INIT) + cp -R $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/autoload $(MAME_CONF_INIT) endef define REGLINUX_MAME_EVMAPY mkdir -p $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/adam.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/advision.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/apfm1000.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/apple2.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/apple2gs.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/arcadia.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/archimedes.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/astrocde.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/atom.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/bbc.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/camplynx.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/cdi.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/coco.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/crvision.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/electron.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/fm7.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/fmtowns.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/gamate.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/gameandwatch.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/gamecom.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/gamepock.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/gmaster.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/gp32.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/lcdgames.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/laser310.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/macintosh.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/megaduck.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/neogeo.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/pdp1.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/plugnplay.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/pv1000.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/socrates.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/supracan.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/ti99.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/tutor.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/vc4000.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/vectrex.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/vgmplay.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/vsmile.mame.keys - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/xegs.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/adam.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/advision.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/apfm1000.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/apple2.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/apple2gs.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/arcadia.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/archimedes.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/astrocde.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/atom.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/bbc.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/camplynx.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/cdi.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/coco.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/crvision.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/electron.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/fm7.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/fmtowns.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/gamate.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/gameandwatch.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/gamecom.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/gamepock.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/gmaster.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/gp32.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/lcdgames.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/laser310.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/macintosh.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/megaduck.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/neogeo.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/pdp1.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/plugnplay.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/pv1000.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/socrates.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/supracan.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/ti99.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/tutor.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/vc4000.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/vectrex.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/vgmplay.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/vsmile.mame.keys + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/mame/mame.mame.keys $(TARGET_DIR)/usr/share/evmapy/xegs.mame.keys endef REGLINUX_MAME_POST_INSTALL_TARGET_HOOKS += REGLINUX_MAME_EVMAPY diff --git a/package/reglinux/emulators/reglinux-scummvm/reglinux-scummvm.mk b/package/reglinux/emulators/reglinux-scummvm/reglinux-scummvm.mk index fe016f5d499..c495d27c52f 100644 --- a/package/reglinux/emulators/reglinux-scummvm/reglinux-scummvm.mk +++ b/package/reglinux/emulators/reglinux-scummvm/reglinux-scummvm.mk @@ -86,7 +86,7 @@ define REGLINUX_SCUMMVM_INSTALL_TARGET_CMDS tar xzvf $(@D)/$(REGLINUX_SCUMMVM_SOURCE) -C $(TARGET_DIR) mkdir -p $(TARGET_DIR)/usr/share/evmapy/ - cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/emulators/scummvm/scummvm.keys \ + cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/scummvm/scummvm.keys \ $(TARGET_DIR)/usr/share/evmapy/ endef diff --git a/package/reglinux/libraries/reglinux-qt6/Config.in b/package/reglinux/libraries/reglinux-qt6/Config.in index c0dca215629..322a86e7678 100644 --- a/package/reglinux/libraries/reglinux-qt6/Config.in +++ b/package/reglinux/libraries/reglinux-qt6/Config.in @@ -4,7 +4,7 @@ source "$BR2_EXTERNAL_BATOCERA_PATH/package/reglinux/libraries/reglinux-qt6/qt6websockets/Config.in" source "$BR2_EXTERNAL_BATOCERA_PATH/package/reglinux/libraries/reglinux-qt6/qt6declarative/Config.in" source "$BR2_EXTERNAL_BATOCERA_PATH/package/reglinux/libraries/reglinux-qt6/qt6shadertools/Config.in" - #source "$BR2_EXTERNAL_BATOCERA_PATH/package/libraries/reglinux-qt6/qt6quick/Config.in" + #source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/reglinux-qt6/qt6quick/Config.in" config BR2_PACKAGE_REGLINUX_QT6_BUILD_FROM_SOURCE bool "reglinux-qt6-build-from-source" @@ -56,5 +56,5 @@ config BR2_PACKAGE_REGLINUX_QT6 select BR2_PACKAGE_REGLINUX_HAS_QT6 - help + help Prebuilt (or built from source) REG-Linux QT6 stack diff --git a/package/utils/piboy/piboy.mk b/package/utils/piboy/piboy.mk deleted file mode 100644 index 6d16a0ec74e..00000000000 --- a/package/utils/piboy/piboy.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# PIBOY -# -################################################################################ -# Version.: Commits on Nov 1, 2021 -PIBOY_VERSION = a93fe087307d676381c196ba8f098d07190cfcb0 -PIBOY_SITE = $(call github,hancock33,piboycontrols,$(PIBOY_VERSION)) -PIBOY_DEPENDENCIES = linux - -define PIBOY_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/bin - mkdir -p $(TARGET_DIR)/usr/share/piboy - - $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/piboy/piboy_fan_ctrl.py $(TARGET_DIR)/usr/bin/piboy_fan_ctrl.py - $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/piboy/piboy_aud_ctrl.py $(TARGET_DIR)/usr/bin/piboy_aud_ctrl.py - $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/piboy/piboy_power_ctrl.py $(TARGET_DIR)/usr/bin/piboy_power_ctrl.py - cp -a $(BR2_EXTERNAL_BATOCERA_PATH)/package/utils/piboy/fan.ini $(TARGET_DIR)/usr/share/piboy/fan.ini -endef - -$(eval $(kernel-module)) -$(eval $(generic-package)) diff --git a/scripts/linux/buildrootdiff.sh b/scripts/linux/buildrootdiff.sh index 15dd44829fe..7fbffc3f117 100755 --- a/scripts/linux/buildrootdiff.sh +++ b/scripts/linux/buildrootdiff.sh @@ -3,9 +3,9 @@ BR_LAST_MERGE_COMMIT=198bdaadd03f75fe959c21089c354d36c90069bc git diff --name-only $BR_LAST_MERGE_COMMIT > buildroot.batocera.diff -cat buildroot.batocera.diff | - grep -vE '^board/' | # batocera board - grep -vE '^configs/batocera-' | # batocera defconfig - grep -vE '^scripts/linux' | # batocera utilities - grep -vE '^package/' | # batocera packages +cat buildroot.batocera.diff | + grep -vE '^board/batocera/' | # batocera board + grep -vE '^configs/batocera-' | # batocera defconfig + grep -vE '^scripts/linux' | # batocera utilities + grep -vE '^package/batocera/' | # batocera packages grep -vE '^\.gitignore$' diff --git a/scripts/linux/checkPackagesUpdates.sh b/scripts/linux/checkPackagesUpdates.sh index 5f3d03f82fb..292b33b0c8a 100755 --- a/scripts/linux/checkPackagesUpdates.sh +++ b/scripts/linux/checkPackagesUpdates.sh @@ -332,7 +332,7 @@ show_help() { isFunction() { [[ "$(declare -Ff "$1")" ]]; } pkg_GETCURVERSION() { - X=$(find ./package/ ./package/reglinux/ -name "${1}.mk" -type f 2>/dev/null) + X=$(find ./package/batocera/ ./package/reglinux/ -name "${1}.mk" -type f 2>/dev/null) if [ ! -e "$X" ] then echo "not found (run from the top buildroot directory)" @@ -972,7 +972,7 @@ create_pkg_functions_GitLabFreeDesktop() { source_site_eval() { for pkg in ${PACKAGES} do - PACKAGEMKFILE=$(find ./package/ ./package/reglinux/ -name "${pkg}.mk" -type f 2>/dev/null) + PACKAGEMKFILE=$(find ./package/batocera/ ./package/reglinux/ -name "${pkg}.mk" -type f 2>/dev/null) case "$PACKAGEMKFILE" in "" ) echo "\"${pkg}\" not found!" @@ -1123,7 +1123,7 @@ source_site_eval() { create_pkg_functions_No_Site "${pkg}" ;; * ) - echo -e "\n*** UNKNOWN SITE\n $(find ./package/ ./package/reglinux/ -name "${pkg}.mk" -type f) \n $TESTSTRING \n***\n" + echo -e "\n*** UNKNOWN SITE\n $(find ./package/batocera/ ./package/reglinux/ -name "${pkg}.mk" -type f) \n $TESTSTRING \n***\n" ;; esac fi @@ -1150,7 +1150,7 @@ setPGroups() { PGROUPS="$@" if test "${PGROUPS}" = "ALL" then - PACKAGES=$(find ./package/ ./package/reglinux/ -name "*.mk" -type f | grep -vE '/batocera\.mk$' | sed -e s#"^.*/\([^/]*\).mk$"#"\1"# | tr '\n' ' ') + PACKAGES=$(find ./package/batocera/ ./package/reglinux/ -name "*.mk" -type f | grep -vE '/batocera\.mk$' | sed -e s#"^.*/\([^/]*\).mk$"#"\1"# | tr '\n' ' ') return fi if test "${PGROUPS}" = "ALLGROUPS" @@ -1236,7 +1236,7 @@ run() { base_UPDATE() { VARNAMEUPPERCASE="${1^^}" - sed -i -e "/^\([ ]*${VARNAMEUPPERCASE//-/_}_VERSION[ ]*=[ ]*\).*$/{s//\1${2}/;:a" -e '$!N;$!ba' -e '}' $(find ./package/ ./package/reglinux/ -name "${1}.mk" -type f) + sed -i -e "/^\([ ]*${VARNAMEUPPERCASE//-/_}_VERSION[ ]*=[ ]*\).*$/{s//\1${2}/;:a" -e '$!N;$!ba' -e '}' $(find ./package/batocera/ ./package/reglinux/ -name "${1}.mk" -type f) } run_update() { @@ -1275,7 +1275,7 @@ run_update() { done } -if test ! -d ./package +if test ! -d ./package/batocera then echo "ERROR: This script has to run in the git root folder." exit 1 diff --git a/scripts/linux/patch_age.sh b/scripts/linux/patch_age.sh index 11cbf2da310..144ce40ba79 100755 --- a/scripts/linux/patch_age.sh +++ b/scripts/linux/patch_age.sh @@ -9,10 +9,10 @@ _how_old_helper() { printf "%s%s\n" "$prefix" "$f" } -how_old() { +how_old() { shopt -s globstar nullglob; pushd "$(git rev-parse --show-superproject-working-tree --show-toplevel| head -1)" > /dev/null || exit 1 - for f in package/**/$1/**/*.patch; do + for f in package/batocera/**/$1/**/*.patch; do _how_old_helper "$f" done for f in board/**/$1/**/*.patch; do diff --git a/scripts/linux/prebuild-mames.sh b/scripts/linux/prebuild-mames.sh index 5e0fc90b62c..59d0dbb8344 100755 --- a/scripts/linux/prebuild-mames.sh +++ b/scripts/linux/prebuild-mames.sh @@ -4,8 +4,8 @@ # ./scripts/linux/prebuild-mames.sh # Grab MAME version from source tree -MAME_VERSION=$(cat package/emulators/mame/mame.mk | grep GroovyMAME | grep Version | cut -d " " -f 4) -LRMAME_VERSION=$(cat package/emulators/retroarch/libretro/libretro-mame/libretro-mame.mk | grep LIBRETRO_MAME_VERSION | grep lrmame | cut -d " " -f 3 | sed s/lrmame//g | sed s/0/0\./g) +MAME_VERSION=$(cat package/batocera/emulators/mame/mame.mk | grep GroovyMAME | grep Version | cut -d " " -f 4) +LRMAME_VERSION=$(cat package/batocera/emulators/retroarch/libretro/libretro-mame/libretro-mame.mk | grep LIBRETRO_MAME_VERSION | grep lrmame | cut -d " " -f 3 | sed s/lrmame//g | sed s/0/0\./g) # Check both version matches, or abort if [ "$MAME_VERSION" != "$LRMAME_VERSION" ] diff --git a/scripts/linux/prebuild-scummvms.sh b/scripts/linux/prebuild-scummvms.sh index 9bc9a05d495..a914db1194f 100755 --- a/scripts/linux/prebuild-scummvms.sh +++ b/scripts/linux/prebuild-scummvms.sh @@ -4,8 +4,8 @@ # ./scripts/linux/prebuild-scummvms.sh # Grab ScummVM version from source tree -SCUMMVM_VERSION=$(cat package/emulators/scummvm/scummvm.mk | grep SCUMMVM_VERSION | cut -d "=" -f 2 | head -n1 | tr -d '[:space:]') -LRSCUMMVM_VERSION=$(cat package/emulators/retroarch/libretro/libretro-scummvm/libretro-scummvm.mk | grep LIBRETRO_SCUMMVM_VERSION | cut -d "=" -f 2 | head -n1 | tr -d '[:space:]') +SCUMMVM_VERSION=$(cat package/batocera/emulators/scummvm/scummvm.mk | grep SCUMMVM_VERSION | cut -d "=" -f 2 | head -n1 | tr -d '[:space:]') +LRSCUMMVM_VERSION=$(cat package/batocera/emulators/retroarch/libretro/libretro-scummvm/libretro-scummvm.mk | grep LIBRETRO_SCUMMVM_VERSION | cut -d "=" -f 2 | head -n1 | tr -d '[:space:]') # Check both version matches, or abort if [ "$SCUMMVM_VERSION" != "$LRSCUMMVM_VERSION" ] diff --git a/scripts/linux/systemsReport.sh b/scripts/linux/systemsReport.sh index edbb6d507c0..e1b9efb6fe2 100755 --- a/scripts/linux/systemsReport.sh +++ b/scripts/linux/systemsReport.sh @@ -42,11 +42,11 @@ while [[ $(jobs -r -p | wc -l) -ge 1 ]]; do wait -n; done sync # reporting -ES_YML="${BR2_EXTERNAL_BATOCERA_PATH}/package/emulationstation/batocera-es-system/es_systems.yml" -EXP_YML="${BR2_EXTERNAL_BATOCERA_PATH}/package/emulationstation/batocera-es-system/systems-explanations.yml" -PYGEN="${BR2_EXTERNAL_BATOCERA_PATH}/package/emulationstation/batocera-es-system/batocera-report-system.py" -HTML_GEN="${BR2_EXTERNAL_BATOCERA_PATH}/package/emulationstation/batocera-es-system/batocera_systemsReport.html" -DEFAULTSDIR="${BR2_EXTERNAL_BATOCERA_PATH}/package/core/batocera-configgen/configs" +ES_YML="${BR2_EXTERNAL_BATOCERA_PATH}/package/batocera/emulationstation/batocera-es-system/es_systems.yml" +EXP_YML="${BR2_EXTERNAL_BATOCERA_PATH}/package/batocera/emulationstation/batocera-es-system/systems-explanations.yml" +PYGEN="${BR2_EXTERNAL_BATOCERA_PATH}/package/batocera/emulationstation/batocera-es-system/batocera-report-system.py" +HTML_GEN="${BR2_EXTERNAL_BATOCERA_PATH}/package/batocera/emulationstation/batocera-es-system/batocera_systemsReport.html" +DEFAULTSDIR="${BR2_EXTERNAL_BATOCERA_PATH}/package/batocera/core/batocera-configgen/configs" mkdir -p "${REGLINUX_BINARIES_DIR}" || exit 1 echo python "${PYGEN}" "${ES_YML}" "${EXP_YML}" "${DEFAULTSDIR}" "${TMP_CONFIGS}" python "${PYGEN}" "${ES_YML}" "${EXP_YML}" "${DEFAULTSDIR}" "${TMP_CONFIGS}" >"${REGLINUX_BINARIES_DIR}/reglinux_systemsReport.json" || exit 1