ppc: Minor tweaks to get the arch compile again (WIP)
- Factor in types changes (introduction of intptr_t) - Align JamFiles syntax with in progress architectures (arm/sparc) - Xorriso doesn't support much of the mkisofs options (anymore ?) - (After a correct bootstrap) one should be able to build @minimum-raw and haiku-boot-cd again Change-Id: I4f779ad8f2210389fa9b7f7c0a98c3652a64c257 Reviewed-on: https://review.haiku-os.org/c/haiku/+/1983 Reviewed-by: François Revol <[email protected]>
This commit is contained in:
@@ -1618,9 +1618,10 @@ actions BuildCDBootPPCImage1 bind MAPS
|
||||
# Extras (readme files, etc)
|
||||
cp $(>[4]) $(HAIKU_OUTPUT_DIR)/cd/
|
||||
|
||||
xorriso -as mkisofs -v -hfs -part -map $(MAPS) -no-desktop -hfs-volid bootimg \
|
||||
-V $(VOLID) -hfs-bless $(HAIKU_OUTPUT_DIR)/cd/boot -prep-boot \
|
||||
boot/haikuloader.xcf -r -o $(<) $(HAIKU_OUTPUT_DIR)/cd
|
||||
xorriso -as mkisofs -v -hfsplus \
|
||||
-hfs-bless $(HAIKU_OUTPUT_DIR)/cd/boot \
|
||||
-prep-boot-part $(HAIKU_OUTPUT_DIR)/cd/boot/haikuloader.xcf \
|
||||
-r -J -o $(<) $(HAIKU_OUTPUT_DIR)/cd
|
||||
$(RM) -r $(HAIKU_OUTPUT_DIR)/cd
|
||||
}
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ local extras = README.html ;
|
||||
|
||||
if $(TARGET_ARCH) = ppc {
|
||||
local elfloader = boot_loader_openfirmware ;
|
||||
local coffloader = boot_loader_openfirmware_coff ;
|
||||
local coffloader = haiku_loader.openfirmware ;
|
||||
|
||||
# OpenFirmware / Mac boot support files:
|
||||
# CHRP script
|
||||
|
||||
@@ -3,16 +3,16 @@ RemotePackageRepository HaikuPorts
|
||||
: https://eu.hpkg.haiku-os.org/haikuports/master/build-packages
|
||||
:
|
||||
# architecture "any" packages
|
||||
be_book-2008_10_26-2
|
||||
ca_root_certificates-2018_01_17-2
|
||||
gnu_efi_kernel-3.0.8-1
|
||||
be_book-2008_10_26-3
|
||||
ca_root_certificates-2019_01_23-1
|
||||
gnu_efi_kernel-3.0.10-1
|
||||
timgmsoundfont-fixed-5
|
||||
noto-20170920-3
|
||||
wqy_microhei-0.2.0~beta-4
|
||||
:
|
||||
# repository architecture packages
|
||||
# primary architecture (ppc)
|
||||
bash-4.4.012-1
|
||||
bash-4.4.023-1
|
||||
coreutils-8.22-1
|
||||
curl-7.40.0-1
|
||||
curl_devel-7.40.0-1
|
||||
@@ -23,8 +23,8 @@ RemotePackageRepository HaikuPorts
|
||||
mawk-1.3.4-1
|
||||
ncurses6-6.0-1
|
||||
ncurses6_devel-6.0-1
|
||||
gcc_syslibs-5.4.0_2016_06_04-1
|
||||
gcc_syslibs_devel-5.4.0_2016_06_04-1
|
||||
gcc_syslibs_devel-8.3.0_2019_05_24-1
|
||||
gcc_syslibs-8.3.0_2019_05_24-1
|
||||
icu-57.1-2
|
||||
icu_devel-57.1-2
|
||||
libsolv-0.3.0_haiku_2014_12_22-1
|
||||
@@ -32,78 +32,25 @@ RemotePackageRepository HaikuPorts
|
||||
zlib-1.2.11-1
|
||||
zlib_devel-1.2.11-1
|
||||
:
|
||||
# source packages
|
||||
autoconf
|
||||
automake
|
||||
# source package
|
||||
bash
|
||||
# bepdf
|
||||
binutils
|
||||
bison
|
||||
bzip2
|
||||
cdrtools
|
||||
cmake
|
||||
coreutils
|
||||
ctags
|
||||
curl
|
||||
cvs
|
||||
doxygen
|
||||
expat
|
||||
# ffmpeg
|
||||
flex
|
||||
freetype
|
||||
gcc
|
||||
gettext
|
||||
git
|
||||
glu
|
||||
gperf
|
||||
grep
|
||||
groff
|
||||
haikuwebkit
|
||||
htmldoc
|
||||
icu
|
||||
jam
|
||||
jpeg
|
||||
keymapswitcher
|
||||
libedit
|
||||
libiconv
|
||||
# libogg
|
||||
libpcre
|
||||
libpng
|
||||
libsolv
|
||||
# libtheora
|
||||
libtool
|
||||
# libvorbis
|
||||
# libvpx
|
||||
libxml2
|
||||
m4
|
||||
make
|
||||
man
|
||||
mercurial
|
||||
mesa
|
||||
mkdepend
|
||||
nano
|
||||
ncurses6
|
||||
neon
|
||||
openssh
|
||||
openssl
|
||||
p7zip
|
||||
pe
|
||||
perl
|
||||
pkgconfig
|
||||
python
|
||||
readline
|
||||
scons
|
||||
sed
|
||||
# speex
|
||||
sqlite
|
||||
subversion
|
||||
tar
|
||||
texi2html
|
||||
texinfo
|
||||
vision
|
||||
wpa_supplicant
|
||||
yasm
|
||||
xz_utils
|
||||
zlib
|
||||
:
|
||||
# debuginfo packages
|
||||
|
||||
@@ -3,6 +3,7 @@ BootstrapPackageRepository HaikuPortsCross
|
||||
:
|
||||
# architecture "any" packages
|
||||
haikuporter-0-1
|
||||
noto-20170202-7
|
||||
:
|
||||
# repository architecture packages (stage 0)
|
||||
gcc_bootstrap-8.3.0_2019_05_24-1
|
||||
@@ -10,9 +11,9 @@ BootstrapPackageRepository HaikuPortsCross
|
||||
gcc_bootstrap_syslibs_devel-8.3.0_2019_05_24-1
|
||||
:
|
||||
# repository architecture packages (stage 1)
|
||||
bash_bootstrap-4.4.012-1
|
||||
binutils_bootstrap-2.26.1_2016_02_29-1
|
||||
bison_bootstrap-3.0.4-5
|
||||
bash_bootstrap-4.4.023-1
|
||||
binutils_bootstrap-2.28.1_2017_08_05-1
|
||||
bison_bootstrap-3.0.5-1
|
||||
coreutils_bootstrap-8.22-1
|
||||
curl_bootstrap-7.40.0-1
|
||||
curl_bootstrap_devel-7.40.0-1
|
||||
|
||||
Reference in New Issue
Block a user