The Sortix programs are now compiled into initrd/.
This commit is contained in:
parent
2c18d43359
commit
f26e6e803a
5
Makefile
5
Makefile
|
@ -100,12 +100,7 @@ iso: all debsource
|
||||||
mkdir -p $(ISODIR)
|
mkdir -p $(ISODIR)
|
||||||
cp -r isosrc/. $(ISODIR)
|
cp -r isosrc/. $(ISODIR)
|
||||||
cp sortix/sortix.bin $(ISODIR)/boot
|
cp sortix/sortix.bin $(ISODIR)/boot
|
||||||
mkdir -p $(INITRDDIR)
|
|
||||||
cp hello/hello $(INITRDDIR)
|
|
||||||
cp pong/pong $(INITRDDIR)
|
|
||||||
for F in init cat sh mxsh clear ls help uname; do cp utils/$$F $(INITRDDIR); done
|
|
||||||
(cd $(INITRDDIR) && ../mkinitrd/mkinitrd * -o ../$(ISODIR)/boot/sortix.initrd)
|
(cd $(INITRDDIR) && ../mkinitrd/mkinitrd * -o ../$(ISODIR)/boot/sortix.initrd)
|
||||||
rm -rf $(INITRDDIR)
|
|
||||||
cp builds/$(DEBSRCNAME)-src.tar.gz $(ISODIR)
|
cp builds/$(DEBSRCNAME)-src.tar.gz $(ISODIR)
|
||||||
grub-mkrescue -o $(ISOFILE) $(ISODIR)
|
grub-mkrescue -o $(ISOFILE) $(ISODIR)
|
||||||
rm -rf $(ISODIR)
|
rm -rf $(ISODIR)
|
||||||
|
|
|
@ -2,14 +2,25 @@
|
||||||
OSROOT=..
|
OSROOT=..
|
||||||
include ../crosscompilemakefile.mak
|
include ../crosscompilemakefile.mak
|
||||||
|
|
||||||
all: hello
|
INITRDDIR:=../initrd
|
||||||
|
LOCALBINARIES:=\
|
||||||
|
hello \
|
||||||
|
|
||||||
hello: hello.o
|
BINARIES:=$(addprefix $(INITRDDIR)/,$(BINARIES))
|
||||||
$(LD) $(LDFLAGS) hello.o -o hello $(LIBS)
|
|
||||||
|
|
||||||
hello.o: hello.cpp
|
all: install
|
||||||
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -O2 -c hello.cpp -o hello.o
|
|
||||||
|
install: $(LOCALBINARIES)
|
||||||
|
cp $(LOCALBINARIES) $(INITRDDIR)
|
||||||
|
rm -f $(LOCALBINARIES)
|
||||||
|
|
||||||
|
%: %.cpp
|
||||||
|
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -O2 -c $< -o $@.o
|
||||||
|
$(LD) $(LDFLAGS) $@.o -o $@ $(LIBS)
|
||||||
|
|
||||||
|
sh: mxsh
|
||||||
|
cp $< $@
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f hello.o hello
|
rm -f $(BINARIES) $(LOCALBINARIES) *.o
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
*
|
||||||
|
!.gitignore
|
|
@ -2,14 +2,25 @@
|
||||||
OSROOT=..
|
OSROOT=..
|
||||||
include ../crosscompilemakefile.mak
|
include ../crosscompilemakefile.mak
|
||||||
|
|
||||||
all: pong
|
INITRDDIR:=../initrd
|
||||||
|
LOCALBINARIES:=\
|
||||||
|
pong \
|
||||||
|
|
||||||
pong: pong.o
|
BINARIES:=$(addprefix $(INITRDDIR)/,$(BINARIES))
|
||||||
$(LD) $(LDFLAGS) pong.o -o pong $(LIBS)
|
|
||||||
|
|
||||||
pong.o: pong.cpp
|
all: install
|
||||||
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -O2 -c pong.cpp -o pong.o
|
|
||||||
|
install: $(LOCALBINARIES)
|
||||||
|
cp $(LOCALBINARIES) $(INITRDDIR)
|
||||||
|
rm -f $(LOCALBINARIES)
|
||||||
|
|
||||||
|
%: %.cpp
|
||||||
|
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -O2 -c $< -o $@.o
|
||||||
|
$(LD) $(LDFLAGS) $@.o -o $@ $(LIBS)
|
||||||
|
|
||||||
|
sh: mxsh
|
||||||
|
cp $< $@
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f pong.o pong
|
rm -f $(BINARIES) $(LOCALBINARIES) *.o
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
*.o
|
|
@ -2,7 +2,8 @@
|
||||||
OSROOT=..
|
OSROOT=..
|
||||||
include ../crosscompilemakefile.mak
|
include ../crosscompilemakefile.mak
|
||||||
|
|
||||||
BINARIES:=\
|
INITRDDIR:=../initrd
|
||||||
|
LOCALBINARIES:=\
|
||||||
init \
|
init \
|
||||||
cat \
|
cat \
|
||||||
sh \
|
sh \
|
||||||
|
@ -12,15 +13,21 @@ ls \
|
||||||
help \
|
help \
|
||||||
uname \
|
uname \
|
||||||
|
|
||||||
all: $(BINARIES)
|
BINARIES:=$(addprefix $(INITRDDIR)/,$(BINARIES))
|
||||||
|
|
||||||
|
all: install
|
||||||
|
|
||||||
|
install: $(LOCALBINARIES)
|
||||||
|
cp $(LOCALBINARIES) $(INITRDDIR)
|
||||||
|
rm -f $(LOCALBINARIES)
|
||||||
|
|
||||||
%: %.cpp
|
%: %.cpp
|
||||||
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -O2 -c $< -o $@.o
|
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -O2 -c $< -o $@.o
|
||||||
$(LD) $(LDFLAGS) $@.o -o $@ $(LIBS)
|
$(LD) $(LDFLAGS) $@.o -o $@ $(LIBS)
|
||||||
|
|
||||||
sh: mxsh
|
sh: mxsh
|
||||||
cp mxsh sh
|
cp $< $@
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f $(BINARIES) *.o
|
rm -f $(BINARIES) $(LOCALBINARIES) *.o
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue