MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-23 05:14:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'submodule-scripts' into 'master'

Browse Source 
Update submodule scripts

See merge request redox-os/redox!1697
This commit is contained in:
Jeremy Soller 2025-11-21 06:30:05 -07:00
commit 8a41a1ad8c
4 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -69,8 +69,6 @@ endif # PODMAN_BUILD
pull:
git pull
git submodule sync --recursive
git submodule update --recursive --init
repo: $(BUILD)/repo.tag

1
mk/prefix.mk
View File

@ -162,6 +162,7 @@ endif
else
$(ROOT)/rust/configure:
git submodule sync --recursive
git submodule update --progress --init --recursive --checkout rust
PREFIX_FREESTANDING_INSTALL=$(PREFIX)/gcc-freestanding-install

4
native_bootstrap.sh
View File

@ -1014,7 +1014,7 @@ statusCheck()
boot()
{
echo "Cloning gitlab repo..."
git clone https://gitlab.redox-os.org/redox-os/redox.git --origin upstream --recursive
git clone https://gitlab.redox-os.org/redox-os/redox.git --origin upstream
echo "Creating .config with PODMAN_BUILD=0"
echo 'PODMAN_BUILD?=0' > redox/.config
echo "Cleaning up..."
@ -1047,7 +1047,6 @@ if [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
usage
elif [ "$1" == "-u" ]; then
git pull upstream master
git submodule update --recursive --init
exit
elif [ "$1" == "-s" ]; then
statusCheck
@ -1088,7 +1087,6 @@ fi
if [ "$update" == "true" ]; then
git pull upstream master
git submodule update --recursive --init
exit
fi

4
podman_bootstrap.sh
View File

@ -560,7 +560,7 @@ rustInstall()
boot()
{
echo "Cloning gitlab repo..."
git clone https://gitlab.redox-os.org/redox-os/redox.git --origin upstream --recursive
git clone https://gitlab.redox-os.org/redox-os/redox.git --origin upstream
echo "Creating .config with PODMAN_BUILD=1"
echo 'PODMAN_BUILD?=1' > redox/.config
if [[ "$(uname -m)" == "arm64" ]]; then
@ -596,7 +596,6 @@ if [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
usage
elif [ "$1" == "-u" ]; then
git pull upstream master
git submodule update --recursive --init
exit
fi
@ -622,7 +621,6 @@ rustInstall "$noninteractive"
if [ "$update" == "true" ]; then
git pull upstream master
git submodule update --recursive --init
exit
fi