Skip to content

Commit 3ecaeff

Browse files
committed
Updated makefile.yml
1 parent 85337c3 commit 3ecaeff

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

.github/workflows/makefile.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
shell: bash
2323

2424
- name: Create toolchain
25-
run: ./src/scripts/make_toolchain.sh --parallel_build -s ~/sysroot
25+
run: ./src/scripts/make_toolchain.sh --parallel_build -s ~/sysroot --package ~/toolchain.tar.xz
2626
shell: bash
2727

2828
- name: Compile kernel
@@ -38,7 +38,7 @@ jobs:
3838
uses: actions/upload-artifact@v2
3939
with:
4040
name: sectoros_toolchain
41-
path: ~/sysroot
41+
path: ~/toolchain.tar.xz
4242

4343
- name: Upload kernel
4444
uses: actions/upload-artifact@v2

src/scripts/make_toolchain.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ PATCHDIR="$PWD/patches"
1111
GCC_VERSION=12.2.0
1212
BINUTILS_VERSION=2.40
1313

14+
PACKAGE_PATH=0
1415
export PARALLEL=false
1516
export HELP=false
1617
export CLEAN_ALL=false
@@ -443,7 +444,7 @@ function clean_ostools
443444
function package
444445
{
445446
pushd "$SYSROOT"
446-
tar -cf output_sectoros.tar.xz bin i686-elf lib libexec share usr
447+
tar -cf "$1" bin i686-elf lib libexec share usr
447448
}
448449

449450
while [[ $# -gt 0 ]]
@@ -461,6 +462,7 @@ do
461462
download_i686_elf_tools) DOWNLOAD_I686_ELF_TOOLS=true; shift ;;
462463
--add_path) ADD_PATH=true; shift ;;
463464
--use_as_default) USE_DEFAULT=true; shift ;;
465+
--package) PACKAGE_PATH="$2"; shift ;;
464466
-h |--help) HELP=true; shift ;;
465467
*) shift ;;
466468
esac
@@ -548,6 +550,12 @@ function main
548550
install_to_bashrc
549551
fi
550552

553+
if [[ $PACKAGE_PATH == 0 ]]; then
554+
echo ""
555+
else
556+
package "$PACKAGE_PATH"
557+
fi
558+
551559
echo "Building complete. You may want to change the Tooldir to $SYSROOT/bin in the Makefile in Sectoros-RW4 root directory."
552560
}
553561

0 commit comments

Comments
 (0)