From 2f2d801913f2556054fc3ad41e7508452e6b03e8 Mon Sep 17 00:00:00 2001
From: lizzie <lizzie@eden-emu.dev>
Date: Mon, 1 Dec 2025 05:08:23 +0000
Subject: [PATCH] fself + pkg stuffs

---
 CMakeModules/OpenOrbis.cmake | 25 ++++++++++++++-----------
 src/yuzu_cmd/CMakeLists.txt  |  4 ++--
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/CMakeModules/OpenOrbis.cmake b/CMakeModules/OpenOrbis.cmake
index 7b7b0c005c..2ee8cb4942 100644
--- a/CMakeModules/OpenOrbis.cmake
+++ b/CMakeModules/OpenOrbis.cmake
@@ -1,9 +1,9 @@
 # SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-function(add_fself project target)
+function(create_ps4_fself project target)
     add_custom_command(
-        OUTPUT "${target}.self"
+        OUTPUT "${CMAKE_BINARY_DIR}/${target}.self"
         COMMAND ${CMAKE_SYSROOT}/bin/create-fself
             -in=${CMAKE_BINARY_DIR}/bin/${target}
             -out=${CMAKE_BINARY_DIR}/bin/${target}.oelf
@@ -11,30 +11,33 @@ function(add_fself project target)
         VERBATIM
         DEPENDS "${project}"
     )
-    add_custom_target("${project}_self" ALL DEPENDS "${target}.self")
+    add_custom_target("${project}_self" ALL DEPENDS ${project})
 endfunction()
 
-function(add_pkg project target)
-    set(sce_sys_dir ${CMAKE_BINARY_DIR}/sce_sys)
+function(create_ps4_pkg project target content_id)
+    set(sce_sys_dir ./sce_sys)
     set(sce_sys_param ${sce_sys_dir}/param.sfo)
     add_custom_command(
-        OUTPUT "${target}.pkg"
+        OUTPUT "${CMAKE_BINARY_DIR}/${target}.pkg"
         COMMAND mkdir -p ${sce_sys_dir}
         COMMAND ${CMAKE_SYSROOT}/bin/PkgTool.Core sfo_new ${sce_sys_param}
         COMMAND ${CMAKE_SYSROOT}/bin/PkgTool.Core sfo_setentry ${sce_sys_param} APP_TYPE --type Integer --maxsize 4 --value 1
         COMMAND ${CMAKE_SYSROOT}/bin/PkgTool.Core sfo_setentry ${sce_sys_param} APP_VER --type Utf8 --maxsize 8 --value '1.03'
         COMMAND ${CMAKE_SYSROOT}/bin/PkgTool.Core sfo_setentry ${sce_sys_param} ATTRIBUTE --type Integer --maxsize 4 --value 0
-        COMMAND ${CMAKE_SYSROOT}/bin/PkgTool.Core sfo_setentry ${sce_sys_param} CATEGORY --type Utf8 --maxsize 4 --value 'gd'
-        COMMAND ${CMAKE_SYSROOT}/bin/PkgTool.Core sfo_setentry ${sce_sys_param} CONTENT_ID --type Utf8 --maxsize 48 --value 'IV0000-BREW00090_00-EDENEMULAT000000'
+        COMMAND ${CMAKE_SYSROOT}/bin/PkgTool.Core sfo_setentry ${sce_sys_param} CATEGORY --type Utf8 --maxsize 4 --value 'E'
+        COMMAND ${CMAKE_SYSROOT}/bin/PkgTool.Core sfo_setentry ${sce_sys_param} CONTENT_ID --type Utf8 --maxsize 48 --value '${content_id}'
         COMMAND ${CMAKE_SYSROOT}/bin/PkgTool.Core sfo_setentry ${sce_sys_param} DOWNLOAD_DATA_SIZE --type Integer --maxsize 4 --value 0
         COMMAND ${CMAKE_SYSROOT}/bin/PkgTool.Core sfo_setentry ${sce_sys_param} SYSTEM_VER --type Integer --maxsize 4 --value 0
-        COMMAND ${CMAKE_SYSROOT}/bin/PkgTool.Core sfo_setentry ${sce_sys_param} TITLE --type Utf8 --maxsize 128 --value 'Eden Emulator'
+        COMMAND ${CMAKE_SYSROOT}/bin/PkgTool.Core sfo_setentry ${sce_sys_param} TITLE --type Utf8 --maxsize 128 --value ${target}
         COMMAND ${CMAKE_SYSROOT}/bin/PkgTool.Core sfo_setentry ${sce_sys_param} TITLE_ID --type Utf8 --maxsize 12 --value 'BREW00090'
         COMMAND ${CMAKE_SYSROOT}/bin/PkgTool.Core sfo_setentry ${sce_sys_param} VERSION --type Utf8 --maxsize 8 --value '1.03'
+        COMMAND ${CMAKE_SYSROOT}/bin/create-gp4 -out ${target}.gp4 --content-id='${content_id}' --files "bin/eboot.bin ${sce_sys_param}"
+        COMMAND ${CMAKE_SYSROOT}/bin/PkgTool.Core pkg_build ${CMAKE_BINARY_DIR}/${target}.gp4 .
         VERBATIM
-        DEPENDS "${target}.self"
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+        DEPENDS ${project}_self
     )
-    add_custom_target("${project}_pkg" ALL DEPENDS "${target}.pkg")
+    add_custom_target(${project}_pkg ALL DEPENDS "${CMAKE_BINARY_DIR}/${target}.pkg")
 endfunction()
 
 if (NOT DEFINED ENV{OO_PS4_TOOLCHAIN})
diff --git a/src/yuzu_cmd/CMakeLists.txt b/src/yuzu_cmd/CMakeLists.txt
index d80dff7321..8d8aec78c2 100644
--- a/src/yuzu_cmd/CMakeLists.txt
+++ b/src/yuzu_cmd/CMakeLists.txt
@@ -69,6 +69,6 @@ if (NOT MSVC)
 endif()
 
 if (PLATFORM_PS4)
-    add_fself(yuzu-cmd eden-cli)
-    add_pkg(yuzu-cmd eden-cli)
+    create_ps4_fself(yuzu-cmd eden-cli)
+    create_ps4_pkg(yuzu-cmd eden-cli "IV0000-BREW00090_00-EDENEMULAT000000")
 endif()