Skip to content

Commit 2931f8b

Browse files
committed
ApolloOS R9.5-RC3
1 parent 101cd9b commit 2931f8b

6 files changed

+56
-30
lines changed

rebuild_all.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ CPU_COUNT=$(grep processor /proc/cpuinfo | wc -l)
33
THREADS=${CPU_COUNT}
44

55
#Some how, running more than 8 tasks doesn't succeed every time
6-
if [ ${THREADS} -gt 8 ]
7-
then
8-
THREADS=8
9-
fi
6+
#if [ ${THREADS} -gt 8 ]
7+
#then
8+
# THREADS=8
9+
#fi
1010

1111
args=("$@")
1212
if [ "${args[ 0 ]}" == "-h" ]

rebuild_all_quick.sh

+15-6
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ CPU_COUNT=$(grep processor /proc/cpuinfo | wc -l)
33
THREADS=${CPU_COUNT}
44

55
#Some how, running more than 8 tasks doesn't succeed every time
6-
if [ ${THREADS} -gt 8 ]
7-
then
8-
THREADS=8
9-
fi
6+
#if [ ${THREADS} -gt 8 ]
7+
#then
8+
# THREADS=8
9+
#fi
1010

1111
args=("$@")
1212
if [ "${args[ 0 ]}" == "-h" ]
@@ -25,7 +25,16 @@ if [ $# -gt 0 ]; then echo "# Building with $@"; fi
2525
echo "##############################################"
2626
sleep 3
2727

28+
rm -rf config/features.status
29+
2830
make -j${THREADS} distfiles
29-
cat bin/amiga-m68k/gen/boot/aros-amiga-m68k-ext.bin bin/amiga-m68k/gen/boot/aros-amiga-m68k-rom.bin > aros.rom
30-
ls -lah aros.rom
31+
32+
if [ "${args[ 0 ]}" == "--with-nonvampire-support" ]
33+
then
34+
cat bin/amiga-m68k/gen/boot/aros-amiga-m68k-ext.bin bin/amiga-m68k/gen/boot/aros-amiga-m68k-rom.bin > ApolloROM.UAE
35+
ls -lah ApolloROM.UAE
36+
else
37+
cat bin/amiga-m68k/gen/boot/aros-amiga-m68k-ext.bin bin/amiga-m68k/gen/boot/aros-amiga-m68k-rom.bin > ApolloROM.V4
38+
ls -lah ApolloROM.V4
39+
fi
3140

rebuild_rom.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ CPU_COUNT=$(grep processor /proc/cpuinfo | wc -l)
33
THREADS=${CPU_COUNT}
44

55
#Some how, running more than 8 tasks doesn't succeed every time
6-
if [ ${THREADS} -gt 8 ]
7-
then
8-
THREADS=8
9-
fi
6+
#if [ ${THREADS} -gt 8 ]
7+
#then
8+
# THREADS=8
9+
#fi
1010

1111
args=("$@")
1212
if [ "${args[ 0 ]}" == "-h" ]

rebuild_rom_quick.sh

+15-6
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ CPU_COUNT=$(grep processor /proc/cpuinfo | wc -l)
33
THREADS=${CPU_COUNT}
44

55
#Some how, running more than 8 tasks doesn't succeed every time
6-
if [ ${THREADS} -gt 8 ]
7-
then
8-
THREADS=8
9-
fi
6+
#if [ ${THREADS} -gt 8 ]
7+
#then
8+
# THREADS=8
9+
#fi
1010

1111
args=("$@")
1212
if [ "${args[ 0 ]}" == "-h" ]
@@ -23,7 +23,16 @@ echo "# Rebuilding with ${THREADS} parallel tasks"
2323
echo "##############################################"
2424
sleep 1
2525

26+
rm -rf config/features.status
27+
2628
make -j${THREADS} kernel-amiga-m68k
27-
cat bin/amiga-m68k/gen/boot/aros-amiga-m68k-ext.bin bin/amiga-m68k/gen/boot/aros-amiga-m68k-rom.bin > aros.rom
28-
ls -lah aros.rom
29+
30+
if [ "${args[ 0 ]}" == "--with-nonvampire-support" ]
31+
then
32+
cat bin/amiga-m68k/gen/boot/aros-amiga-m68k-ext.bin bin/amiga-m68k/gen/boot/aros-amiga-m68k-rom.bin > ApolloROM.UAE
33+
ls -lah ApolloROM.UAE
34+
else
35+
cat bin/amiga-m68k/gen/boot/aros-amiga-m68k-ext.bin bin/amiga-m68k/gen/boot/aros-amiga-m68k-rom.bin > ApolloROM.V4
36+
ls -lah ApolloROM.V4
37+
fi
2938

rebuild_rom_with_debug.sh

+14-6
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ CPU_COUNT=$(grep processor /proc/cpuinfo | wc -l)
33
THREADS=${CPU_COUNT}
44

55
#Some how, running more than 8 tasks doesn't succeed every time
6-
if [ ${THREADS} -gt 8 ]
7-
then
8-
THREADS=8
9-
fi
6+
#if [ ${THREADS} -gt 8 ]
7+
#then
8+
# THREADS=8
9+
#fi
1010

1111
args=("$@")
1212
if [ "${args[ 0 ]}" == "-h" ]
@@ -29,6 +29,7 @@ sleep 3
2929
make clean
3030
git clean -df
3131
rm -rf bin/amiga-m68k
32+
rm -rf config/features.status
3233

3334
DISTOPTNAME="--enable-dist-name=${DISTRONAME}"
3435
DISTOPTVER="--enable-dist-version=${DISTROVERSION}"
@@ -39,6 +40,13 @@ source ./make_dist_config.sh
3940

4041
make -j${THREADS}
4142
make -j${THREADS} kernel
42-
cat bin/amiga-m68k/gen/boot/aros-amiga-m68k-ext.bin bin/amiga-m68k/gen/boot/aros-amiga-m68k-rom.bin > aros.rom
43-
ls -lah aros.rom
43+
44+
if [ "${args[ 0 ]}" == "--with-nonvampire-support" ]
45+
then
46+
cat bin/amiga-m68k/gen/boot/aros-amiga-m68k-ext.bin bin/amiga-m68k/gen/boot/aros-amiga-m68k-rom.bin > ApolloROM.UAE
47+
ls -lah ApolloROM.UAE
48+
else
49+
cat bin/amiga-m68k/gen/boot/aros-amiga-m68k-ext.bin bin/amiga-m68k/gen/boot/aros-amiga-m68k-rom.bin > ApolloROM.V4
50+
ls -lah ApolloROM.V4
51+
fi
4452

rom/exec/taggedopenlibrary.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ static const char * const libnames[] =
2828
static const char * const copyrights[] =
2929
{
3030
"AROS Research Operating System (AROS)",
31-
"Copyright © 1995-2024, ",
32-
"The AROS Development Team.",
33-
"Other parts © by respective owners.",
34-
"ALPHA ",
31+
"ApolloOS created by Apollo Development Team ",
32+
"Parts based on AROS Research Operating System (AROS) ",
33+
"https://apollo-computer.com Copyright 1995-2025",
34+
"APOLLO",
3535
MOD_NAME_STRING,
3636
"exec " MOD_VERS_STRING " (" MOD_DATE_STRING ")\r\n"
3737
};

0 commit comments

Comments
 (0)