Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'strawberry-dev' of github.com:klange/toaruos into strawberry-dev

Browse Source
This commit is contained in:
Kevin Lange 2014-02-26 21:00:29 -08:00
commit ecf124ece4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -67,7 +67,7 @@ run-config: system
util/config-parser ${EMU} util/config-parser ${EMU}
test: system test: system
python util/run-tests.py 2>/dev/null python2 util/run-tests.py 2>/dev/null
.passed: .passed:
@util/check-reqs > /dev/null @util/check-reqs > /dev/null
@ -99,7 +99,7 @@ kernel/sys/version.o: kernel/*/*.c kernel/*.c
#################### ####################
.userspace-check: ${USERSPACE} .userspace-check: ${USERSPACE}
@cd userspace && python build.py @cd userspace && python2 build.py
@touch .userspace-check @touch .userspace-check
toaruos-disk.img: .userspace-check toaruos-disk.img: .userspace-check

2
userspace/build.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python2
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
JuJu - An automagical build tool for the とあるOS userspace. JuJu - An automagical build tool for the とあるOS userspace.