Merge branch 'rw_van_221221' into 'master'
Set PODMAN_BUILD=1 in .config See merge request redox-os/redox!1297
This commit is contained in:
		
						commit
						163953aa22
					
				
					 1 changed files with 3 additions and 1 deletions
				
			
		| 
						 | 
					@ -423,6 +423,8 @@ boot()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	echo "Cloning gitlab repo..."
 | 
						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 --recursive
 | 
				
			||||||
 | 
						echo "Creating .config with PODMAN_BUILD=1"
 | 
				
			||||||
 | 
						echo 'PODMAN_BUILD?=1' > redox/.config
 | 
				
			||||||
	echo "Cleaning up..."
 | 
						echo "Cleaning up..."
 | 
				
			||||||
	rm podman_bootstrap.sh
 | 
						rm podman_bootstrap.sh
 | 
				
			||||||
	echo
 | 
						echo
 | 
				
			||||||
| 
						 | 
					@ -430,6 +432,7 @@ boot()
 | 
				
			||||||
	echo "Well it looks like you are ready to go!"
 | 
						echo "Well it looks like you are ready to go!"
 | 
				
			||||||
	echo "---------------------------------------"
 | 
						echo "---------------------------------------"
 | 
				
			||||||
	statusCheck
 | 
						statusCheck
 | 
				
			||||||
 | 
						echo "The file redox/.config was created with PODMAN_BUILD=1."
 | 
				
			||||||
	echo "Run the following commands to build redox using Podman:"
 | 
						echo "Run the following commands to build redox using Podman:"
 | 
				
			||||||
	echo
 | 
						echo
 | 
				
			||||||
	echo "cd redox"
 | 
						echo "cd redox"
 | 
				
			||||||
| 
						 | 
					@ -438,7 +441,6 @@ boot()
 | 
				
			||||||
    	MAKE="gmake"
 | 
					    	MAKE="gmake"
 | 
				
			||||||
    	echo "kldload fuse.ko # This loads the kernel module for fuse"
 | 
					    	echo "kldload fuse.ko # This loads the kernel module for fuse"
 | 
				
			||||||
    fi
 | 
					    fi
 | 
				
			||||||
	echo "export PODMAN_BUILD=1"
 | 
					 | 
				
			||||||
	echo "$MAKE all"
 | 
						echo "$MAKE all"
 | 
				
			||||||
	echo "$MAKE virtualbox or qemu"
 | 
						echo "$MAKE virtualbox or qemu"
 | 
				
			||||||
	echo
 | 
						echo
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue