From 51206542174d10650a7f3aadd95637725eb49de1 Mon Sep 17 00:00:00 2001
From: "U-Huygens-PC\\Bibibi" <eziopsx@gmail.com>
Date: Sat, 13 Aug 2016 13:52:35 +0200
Subject: [PATCH 1/4] Fix packaging for cex ps3 build
---
dist-scripts/dist-cores.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dist-scripts/dist-cores.sh b/dist-scripts/dist-cores.sh
index 82bc847038..6c6cf91851 100755
--- a/dist-scripts/dist-cores.sh
+++ b/dist-scripts/dist-cores.sh
@@ -332,7 +332,7 @@ if [ $PLATFORM = "dex-ps3" ] ; then
elif [ $PLATFORM = "cex-ps3" ] ; then
$SCETOOL_PATH $SCETOOL_FLAGS_EBOOT ../retroarch-salamander_${platform}.elf ../pkg/${platform}/USRDIR/EBOOT.BIN
rm -rf ../retroarch-salamander_${platform}.elf
- ../tools/ps3/ps3py/pkg.py --contentid UP0001-SSNE10000_00-0000000000000001 ../pkg/${platform}/RetroArch.PS3.CEX.PS3.pkg
+ ../tools/ps3/ps3py/pkg.py --contentid UP0001-SSNE10000_00-0000000000000001 ../pkg/${platform}/SSNE10000/ ../pkg/${platform}/RetroArch.PS3.CEX.PS3.pkg
elif [ $PLATFORM = "ode-ps3" ] ; then
$SCETOOL_PATH $SCETOOL_FLAGS_ODE ../retroarch-salamander_${platform}.elf ../pkg/${platform}_iso/PS3_GAME/USRDIR/EBOOT.BIN
rm -rf ../retroarch-salamander_${platform}.elf
From 1d6a6e91d4f82a0f6ae41411eb8c250257e0f803 Mon Sep 17 00:00:00 2001
From: "U-Huygens-PC\\Bibibi" <eziopsx@gmail.com>
Date: Sat, 13 Aug 2016 13:56:18 +0200
Subject: [PATCH 2/4] Add and update comments
---
dist-scripts/dist-cores.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dist-scripts/dist-cores.sh b/dist-scripts/dist-cores.sh
index 6c6cf91851..6dccb4c68e 100755
--- a/dist-scripts/dist-cores.sh
+++ b/dist-scripts/dist-cores.sh
@@ -78,6 +78,7 @@ MAKE_PACKAGE_NPDRM=${EXE_PATH}/make_package_npdrm.exe
# CEX PS3
elif [ $PLATFORM = "cex-ps3" ]; then
+#For this script to work correctly, you must place scetool.exe and the "data" folder containing your ps3 keys for scetool to use in the dist-scripts folder.
platform=ps3
SALAMANDER=yes
EXT=a
@@ -89,7 +90,7 @@ SCETOOL_FLAGS_EBOOT="--sce-type=SELF --compress-data=TRUE --skip-sections=TRUE -
# ODE PS3
elif [ $PLATFORM = "ode-ps3" ]; then
-#For this script to work correctly, you must place the "data" folder containing your ps3 keys for scetool to use in the dist-scripts folder.
+#For this script to work correctly, you must place scetool.exe and the "data" folder containing your ps3 keys for scetool to use in the dist-scripts folder.
platform=ps3
SALAMANDER=yes
EXT=a
From 9bedbb9af809931cd5fef38c21ce95e92069dcc5 Mon Sep 17 00:00:00 2001
From: "U-Huygens-PC\\Bibibi" <eziopsx@gmail.com>
Date: Sat, 13 Aug 2016 14:09:56 +0200
Subject: [PATCH 3/4] Move ICON0.PNG, PARAM.SFO and USRDIR folder from pkg/ps3
to pkg/ps3/SSNE10000
---
pkg/ps3/{ => SSNE10000}/ICON0.PNG | Bin
pkg/ps3/{ => SSNE10000}/PARAM.SFO | Bin
pkg/ps3/{ => SSNE10000}/USRDIR/.empty | 0
pkg/ps3/{ => SSNE10000}/USRDIR/cores/.empty | 0
pkg/ps3/{ => SSNE10000}/USRDIR/cores/presets/.empty | 0
.../{ => SSNE10000}/USRDIR/cores/savestates/.empty | 0
pkg/ps3/{ => SSNE10000}/USRDIR/cores/sram/.empty | 0
pkg/ps3/{ => SSNE10000}/USRDIR/cores/system/.empty | 0
8 files changed, 0 insertions(+), 0 deletions(-)
rename pkg/ps3/{ => SSNE10000}/ICON0.PNG (100%)
rename pkg/ps3/{ => SSNE10000}/PARAM.SFO (100%)
rename pkg/ps3/{ => SSNE10000}/USRDIR/.empty (100%)
rename pkg/ps3/{ => SSNE10000}/USRDIR/cores/.empty (100%)
rename pkg/ps3/{ => SSNE10000}/USRDIR/cores/presets/.empty (100%)
rename pkg/ps3/{ => SSNE10000}/USRDIR/cores/savestates/.empty (100%)
rename pkg/ps3/{ => SSNE10000}/USRDIR/cores/sram/.empty (100%)
rename pkg/ps3/{ => SSNE10000}/USRDIR/cores/system/.empty (100%)
diff --git a/pkg/ps3/ICON0.PNG b/pkg/ps3/SSNE10000/ICON0.PNG
similarity index 100%
rename from pkg/ps3/ICON0.PNG
rename to pkg/ps3/SSNE10000/ICON0.PNG
diff --git a/pkg/ps3/PARAM.SFO b/pkg/ps3/SSNE10000/PARAM.SFO
similarity index 100%
rename from pkg/ps3/PARAM.SFO
rename to pkg/ps3/SSNE10000/PARAM.SFO
diff --git a/pkg/ps3/USRDIR/.empty b/pkg/ps3/SSNE10000/USRDIR/.empty
similarity index 100%
rename from pkg/ps3/USRDIR/.empty
rename to pkg/ps3/SSNE10000/USRDIR/.empty
diff --git a/pkg/ps3/USRDIR/cores/.empty b/pkg/ps3/SSNE10000/USRDIR/cores/.empty
similarity index 100%
rename from pkg/ps3/USRDIR/cores/.empty
rename to pkg/ps3/SSNE10000/USRDIR/cores/.empty
diff --git a/pkg/ps3/USRDIR/cores/presets/.empty b/pkg/ps3/SSNE10000/USRDIR/cores/presets/.empty
similarity index 100%
rename from pkg/ps3/USRDIR/cores/presets/.empty
rename to pkg/ps3/SSNE10000/USRDIR/cores/presets/.empty
diff --git a/pkg/ps3/USRDIR/cores/savestates/.empty b/pkg/ps3/SSNE10000/USRDIR/cores/savestates/.empty
similarity index 100%
rename from pkg/ps3/USRDIR/cores/savestates/.empty
rename to pkg/ps3/SSNE10000/USRDIR/cores/savestates/.empty
diff --git a/pkg/ps3/USRDIR/cores/sram/.empty b/pkg/ps3/SSNE10000/USRDIR/cores/sram/.empty
similarity index 100%
rename from pkg/ps3/USRDIR/cores/sram/.empty
rename to pkg/ps3/SSNE10000/USRDIR/cores/sram/.empty
diff --git a/pkg/ps3/USRDIR/cores/system/.empty b/pkg/ps3/SSNE10000/USRDIR/cores/system/.empty
similarity index 100%
rename from pkg/ps3/USRDIR/cores/system/.empty
rename to pkg/ps3/SSNE10000/USRDIR/cores/system/.empty
From e06a9583f374e0edcbe0a9ce41060c6fa9773678 Mon Sep 17 00:00:00 2001
From: "U-Huygens-PC\\Bibibi" <eziopsx@gmail.com>
Date: Sat, 13 Aug 2016 14:20:49 +0200
Subject: [PATCH 4/4] Fix new paths for the cex and dex ps3 build
---
dist-scripts/dist-cores.sh | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/dist-scripts/dist-cores.sh b/dist-scripts/dist-cores.sh
index 6dccb4c68e..c9d6f3148b 100755
--- a/dist-scripts/dist-cores.sh
+++ b/dist-scripts/dist-cores.sh
@@ -196,10 +196,10 @@ for f in `ls -v *_${platform}.${EXT}`; do
cp -fv ../../dist/info/"${name}_libretro.info" ../pkg/${platform}_iso/PS3_GAME/USRDIR/cores/info/"${name}_libretro.info"
fi
else
- mv -fv ../CORE.SELF ../pkg/${platform}/USRDIR/cores/"${name}_libretro_${platform}.SELF"
+ mv -fv ../CORE.SELF ../pkg/${platform}/SSNE10000/USRDIR/cores/"${name}_libretro_${platform}.SELF"
if [ -d ../../dist/info ]; then
- mkdir -p ../pkg/${platform}/USRDIR/cores/info
- cp -fv ../../dist/info/"${name}_libretro.info" ../pkg/${platform}/USRDIR/cores/info/"${name}_libretro.info"
+ mkdir -p ../pkg/${platform}/SSNE10000/USRDIR/cores/info
+ cp -fv ../../dist/info/"${name}_libretro.info" ../pkg/${platform}/SSNE10000/USRDIR/cores/info/"${name}_libretro.info"
fi
fi
elif [ $PLATFORM = "psp1" ] ; then
@@ -299,39 +299,39 @@ if [ $platform = "ps3" ] ; then
else
echo Deploy : Assets...
if [ -d ../media/assets ]; then
- mkdir -p ../pkg/${platform}/USRDIR/cores/assets
- cp -r ../media/assets/* ../pkg/${platform}/USRDIR/cores/assets
+ mkdir -p ../pkg/${platform}/SSNE10000/USRDIR/cores/assets
+ cp -r ../media/assets/* ../pkg/${platform}/SSNE10000/USRDIR/cores/assets
fi
echo Deploy : Databases...
if [ -d ../media/libretrodb/rdb ]; then
- mkdir -p ../pkg/${platform}/USRDIR/cores/database/rdb
- cp -r ../media/libretrodb/rdb/* ../pkg/${platform}/USRDIR/cores/database/rdb
+ mkdir -p ../pkg/${platform}/SSNE10000/USRDIR/cores/database/rdb
+ cp -r ../media/libretrodb/rdb/* ../pkg/${platform}/SSNE10000/USRDIR/cores/database/rdb
fi
if [ -d ../media/libretrodb/cursors ]; then
- mkdir -p ../pkg/${platform}/USRDIR/cores/database/cursors
- cp -r ../media/libretrodb/cursors/* ../pkg/${platform}/USRDIR/cores/database/cursors
+ mkdir -p ../pkg/${platform}/SSNE10000/USRDIR/cores/database/cursors
+ cp -r ../media/libretrodb/cursors/* ../pkg/${platform}/SSNE10000/USRDIR/cores/database/cursors
fi
echo Deploy : Overlays...
if [ -d ../media/overlays ]; then
- mkdir -p ../pkg/${platform}/USRDIR/cores/overlays
- cp -r ../media/overlays/* ../pkg/${platform}/USRDIR/cores/overlays
+ mkdir -p ../pkg/${platform}/SSNE10000/USRDIR/cores/overlays
+ cp -r ../media/overlays/* ../pkg/${platform}/SSNE10000/USRDIR/cores/overlays
fi
echo Deploy : Shaders...
if [ -d ../media/shaders_cg ]; then
- mkdir -p ../pkg/${platform}/USRDIR/cores/shaders_cg
- cp -r ../media/shaders_cg/* ../pkg/${platform}/USRDIR/cores/shaders_cg
+ mkdir -p ../pkg/${platform}/SSNE10000/USRDIR/cores/shaders_cg
+ cp -r ../media/shaders_cg/* ../pkg/${platform}/SSNE10000/USRDIR/cores/shaders_cg
fi
fi
fi
# Packaging
if [ $PLATFORM = "dex-ps3" ] ; then
- $MAKE_FSELF_NPDRM -c ../retroarch-salamander_${platform}.elf ../pkg/${platform}/USRDIR/EBOOT.BIN
+ $MAKE_FSELF_NPDRM -c ../retroarch-salamander_${platform}.elf ../pkg/${platform}/SSNE10000/USRDIR/EBOOT.BIN
rm -rf ../retroarch-salamander_${platform}.elf
- $MAKE_PACKAGE_NPDRM ../pkg/${platform}_dex/package.conf ../pkg/${platform}
+ $MAKE_PACKAGE_NPDRM ../pkg/${platform}_dex/package.conf ../pkg/${platform}/SSNE10000
mv UP0001-SSNE10000_00-0000000000000001.pkg ../pkg/${platform}/RetroArch.PS3.DEX.PS3.pkg
elif [ $PLATFORM = "cex-ps3" ] ; then
- $SCETOOL_PATH $SCETOOL_FLAGS_EBOOT ../retroarch-salamander_${platform}.elf ../pkg/${platform}/USRDIR/EBOOT.BIN
+ $SCETOOL_PATH $SCETOOL_FLAGS_EBOOT ../retroarch-salamander_${platform}.elf ../pkg/${platform}/SSNE10000/USRDIR/EBOOT.BIN
rm -rf ../retroarch-salamander_${platform}.elf
../tools/ps3/ps3py/pkg.py --contentid UP0001-SSNE10000_00-0000000000000001 ../pkg/${platform}/SSNE10000/ ../pkg/${platform}/RetroArch.PS3.CEX.PS3.pkg
elif [ $PLATFORM = "ode-ps3" ] ; then