Browse Source

Change the meaning of $dir_sysroot a bit

master
mid-kid 9 years ago
parent
commit
f61f6f9911
  1. 4
      astronaut/astronaut
  2. 4
      satellites/bin/ctrulib.sat
  3. 4
      satellites/bin/default_arm7.sat
  4. 6
      satellites/bin/devkitarm.sat
  5. 4
      satellites/bin/libfat-nds.sat
  6. 4
      satellites/bin/libnds.sat
  7. 4
      satellites/bin/palemoon.sat
  8. 2
      satellites/functions/compile/configure.sh
  9. 4
      satellites/vcs/ctr.sat
  10. 4
      satellites/vcs/ctrff.sat
  11. 2
      satellites/vcs/ctrulib-git.sat

4
astronaut/astronaut

@ -4,8 +4,8 @@
dir_build="$PWD/build" # Temporary directory to build packages dir_build="$PWD/build" # Temporary directory to build packages
dir_source="$PWD/source" # Directory where the package sources will be placed dir_source="$PWD/source" # Directory where the package sources will be placed
dir_install="$PWD/install" # Directory where the package will be installed dir_install="$PWD/install" # Directory where the package will be installed
dir_sysroot="" # The root dir (Used for dirs like etc and var) dir_sysroot="" # The root dir (The directory programs will look in and symlinks will point to)
dir_prefix="$dir_sysroot/usr" # Prefix directory (Should always contain $dir_sysroot!) dir_prefix="usr" # Prefix directory
cmd_download="curl -# -L -o {dst} {src}" # Command to execute to download files cmd_download="curl -# -L -o {dst} {src}" # Command to execute to download files
cmd_extract="tar -x -C {dst} -f {src}" # Command to execute to extract files cmd_extract="tar -x -C {dst} -f {src}" # Command to execute to extract files
unset _dir_satellites # Directory where the satellite files are placed. unset _dir_satellites # Directory where the satellite files are placed.

4
satellites/bin/ctrulib.sat

@ -8,7 +8,7 @@ download "https://sourceforge.net/projects/devkitpro/files/$libname/$version/$li
"9c65ae1f9474a03a727d346c6507d4b4" "9c65ae1f9474a03a727d346c6507d4b4"
header_end header_end
mkdir -p "$dir_install/$dir_sysroot/opt/devkitPRO/$libname" mkdir -p "$dir_install/opt/devkitPRO/$libname"
extract "$libname-$version.tar.bz2" "$dir_install/$dir_sysroot/opt/devkitPRO/$libname" extract "$libname-$version.tar.bz2" "$dir_install/opt/devkitPRO/$libname"
# vim:set tabstop=4 shiftwidth=4 syntax=sh et: # vim:set tabstop=4 shiftwidth=4 syntax=sh et:

4
satellites/bin/default_arm7.sat

@ -8,7 +8,7 @@ download "https://sourceforge.net/projects/devkitpro/files/default arm7/$version
"11cf9d749c3d346ca35c5d586364fad3" "11cf9d749c3d346ca35c5d586364fad3"
header_end header_end
mkdir -p "$dir_install/$dir_sysroot/opt/devkitPRO/$libname" mkdir -p "$dir_install/opt/devkitPRO/$libname"
extract "$name-$version.tar.bz2" "$dir_install/$dir_sysroot/opt/devkitPRO/$libname" extract "$name-$version.tar.bz2" "$dir_install/opt/devkitPRO/$libname"
# vim:set tabstop=4 shiftwidth=4 syntax=sh et: # vim:set tabstop=4 shiftwidth=4 syntax=sh et:

6
satellites/bin/devkitarm.sat

@ -8,9 +8,9 @@ download "https://sourceforge.net/projects/devkitpro/files/$name/${name}_$versio
extrafile "devkitarm.sh" extrafile "devkitarm.sh"
header_end header_end
mkdir -p "$dir_install/$dir_sysroot/opt/devkitPRO" mkdir -p "$dir_install/opt/devkitPRO"
extract "${name}_$version-x86_64-linux.tar.bz2" "$dir_install/$dir_sysroot/opt/devkitPRO" extract "${name}_$version-x86_64-linux.tar.bz2" "$dir_install/opt/devkitPRO"
sed -i -e "s@%SYSROOT%@$dir_sysroot@g" devkitarm.sh sed -i -e "s@%SYSROOT%@$dir_sysroot@g" devkitarm.sh
install -Dm644 devkitarm.sh "$dir_install/$dir_sysroot/etc/profile.d/devkitarm.sh" install -Dm644 devkitarm.sh "$dir_install/etc/profile.d/devkitarm.sh"
# vim:set tabstop=4 shiftwidth=4 syntax=sh et: # vim:set tabstop=4 shiftwidth=4 syntax=sh et:

4
satellites/bin/libfat-nds.sat

@ -8,7 +8,7 @@ download "https://sourceforge.net/projects/devkitpro/files/libfat/$version/$name
"cc1712a56c8b0c133974936c69599f0e" "cc1712a56c8b0c133974936c69599f0e"
header_end header_end
mkdir -p "$dir_install/$dir_sysroot/opt/devkitPRO/$libname" mkdir -p "$dir_install/opt/devkitPRO/$libname"
extract "$name-$version.tar.bz2" "$dir_install/$dir_sysroot/opt/devkitPRO/$libname" extract "$name-$version.tar.bz2" "$dir_install/opt/devkitPRO/$libname"
# vim:set tabstop=4 shiftwidth=4 syntax=sh et: # vim:set tabstop=4 shiftwidth=4 syntax=sh et:

4
satellites/bin/libnds.sat

@ -7,7 +7,7 @@ download "https://sourceforge.net/projects/devkitpro/files/$name/$version/$name-
"49f4e8dfee73c3fd9897cf314eb6d359" "49f4e8dfee73c3fd9897cf314eb6d359"
header_end header_end
mkdir -p "$dir_install/$dir_sysroot/opt/devkitPRO/$name" mkdir -p "$dir_install/opt/devkitPRO/$name"
extract "$name-$version.tar.bz2" "$dir_install/$dir_sysroot/opt/devkitPRO/$name" extract "$name-$version.tar.bz2" "$dir_install/opt/devkitPRO/$name"
# vim:set tabstop=4 shiftwidth=4 syntax=sh et: # vim:set tabstop=4 shiftwidth=4 syntax=sh et:

4
satellites/bin/palemoon.sat

@ -7,13 +7,13 @@ download "http://linux.palemoon.org/files/$version/$name-$version.en-US.linux-x8
extrafile "palemoon.desktop" extrafile "palemoon.desktop"
header_end header_end
mkdir -p "$dir_install/$dir_sysroot/opt" "$dir_install/$dir_prefix/bin" "$dir_install/$dir_prefix/share/applications" \ mkdir -p "$dir_install/opt" "$dir_install/$dir_prefix/bin" "$dir_install/$dir_prefix/share/applications" \
"$dir_install/$dir_prefix/share/icons/hicolor/16x16/apps" \ "$dir_install/$dir_prefix/share/icons/hicolor/16x16/apps" \
"$dir_install/$dir_prefix/share/icons/hicolor/32x32/apps" \ "$dir_install/$dir_prefix/share/icons/hicolor/32x32/apps" \
"$dir_install/$dir_prefix/share/icons/hicolor/48x48/apps" \ "$dir_install/$dir_prefix/share/icons/hicolor/48x48/apps" \
"$dir_install/$dir_prefix/share/icons/hicolor/128x128/apps" \ "$dir_install/$dir_prefix/share/icons/hicolor/128x128/apps" \
extract "$name-$version.en-US.linux-x86_64.tar.bz2" "$dir_install/$dir_sysroot/opt" extract "$name-$version.en-US.linux-x86_64.tar.bz2" "$dir_install/opt"
ln -s "$dir_sysroot/opt/$name/$name" "$dir_install/$dir_prefix/bin/$name" ln -s "$dir_sysroot/opt/$name/$name" "$dir_install/$dir_prefix/bin/$name"
ln -s "$dir_sysroot/opt/$name/browser/chrome/icons/default/default16.png" "$dir_install/$dir_prefix/share/icons/hicolor/16x16/apps/$name.png" ln -s "$dir_sysroot/opt/$name/browser/chrome/icons/default/default16.png" "$dir_install/$dir_prefix/share/icons/hicolor/16x16/apps/$name.png"
ln -s "$dir_sysroot/opt/$name/browser/chrome/icons/default/default32.png" "$dir_install/$dir_prefix/share/icons/hicolor/32x32/apps/$name.png" ln -s "$dir_sysroot/opt/$name/browser/chrome/icons/default/default32.png" "$dir_install/$dir_prefix/share/icons/hicolor/32x32/apps/$name.png"

2
satellites/functions/compile/configure.sh

@ -1,5 +1,5 @@
compile_configure() { compile_configure() {
./configure --prefix="$dir_prefix" --sysconfdir="$dir_sysroot/etc" $@ ./configure --prefix="$dir_prefix" --sysconfdir=/etc $@
make make
option !no_check make check option !no_check make check
make DESTDIR="$dir_install" install make DESTDIR="$dir_install" install

4
satellites/vcs/ctr.sat

@ -6,7 +6,7 @@ vcs_git "https://github.com/b1l1s/$name"
header_end header_end
cd "$name" cd "$name"
mkdir -p "$dir_install/$dir_sysroot/opt/devkitPRO/devkitARM/arm-none-eabi/include" "$dir_install/$dir_sysroot/opt/devkitPRO/devkitARM/arm-none-eabi/lib" mkdir -p "$dir_install/opt/devkitPRO/devkitARM/arm-none-eabi/include" "$dir_install/opt/devkitPRO/devkitARM/arm-none-eabi/lib"
make DEVKITARM="$dir_install/$dir_sysroot/opt/devkitPRO/devkitARM" install make DEVKITARM="$dir_install/opt/devkitPRO/devkitARM" install
# vim:set tabstop=4 shiftwidth=4 syntax=sh et: # vim:set tabstop=4 shiftwidth=4 syntax=sh et:

4
satellites/vcs/ctrff.sat

@ -6,7 +6,7 @@ vcs_git "https://github.com/b1l1s/$name"
header_end header_end
cd "$name" cd "$name"
mkdir -p "$dir_install/$dir_sysroot/opt/devkitPRO/devkitARM/arm-none-eabi/include" "$dir_install/$dir_sysroot/opt/devkitPRO/devkitARM/arm-none-eabi/lib" mkdir -p "$dir_install/opt/devkitPRO/devkitARM/arm-none-eabi/include" "$dir_install/opt/devkitPRO/devkitARM/arm-none-eabi/lib"
make DEVKITARM="$dir_install/$dir_sysroot/opt/devkitPRO/devkitARM" install make DEVKITARM="$dir_install/opt/devkitPRO/devkitARM" install
# vim:set tabstop=4 shiftwidth=4 syntax=sh et: # vim:set tabstop=4 shiftwidth=4 syntax=sh et:

2
satellites/vcs/ctrulib-git.sat

@ -6,6 +6,6 @@ vcs_git "https://github.com/smealum/$name"
header_end header_end
cd "$name/libctru" cd "$name/libctru"
make DEVKITPRO="$dir_install/$dir_sysroot/opt/devkitPRO" install make DEVKITPRO="$dir_install/opt/devkitPRO" install
# vim:set tabstop=4 shiftwidth=4 syntax=sh et: # vim:set tabstop=4 shiftwidth=4 syntax=sh et:

Loading…
Cancel
Save