Updated to freslax-0.9 and added frsh-forb demo

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..24d027e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+/slax.iso
+/*.lzm
+/*.dep
+/*.stamp
+/frsh-forb/
+/orte/
+/frescor_slax_0.9/
+/freslax-0.2/
+/marte/

diff --git a/Makefile b/Makefile
index 5a01d0e5b672da37740bf16ffbdd642395ace50a..797a9255570ca33231ac1eb5abc1bf1c2c2b1c99 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,58 +1,92 @@
-SLAX_MODULES = frsh_forb orte
+SLAX_MODULES = frsh-forb orte
 
-all: $(SLAX_MODULES:%=freslax-0.2/slax/modules/%.lzm)
+all: slax.iso
 
 -include $(SLAX_MODULES:%=%.lzm.dep)
 
-$(SLAX_MODULES:%=%.lzm): %.lzm: %
-       @exec > $@.dep; echo -n "$@ : "; find $* -print0|tr '\0' ' '; echo; find $*|sed -e 's/$$/:/'
+mkdep = exec > $@.dep; echo -n "$@ : "; find $1 -print0|tr '\0' ' '; echo; find $1|sed -e 's/$$/:/'
+
+.SECONDARY: $(SLAX_MODULES:%=%.lzm)
+$(SLAX_MODULES:%=%.lzm): %.lzm: %.stamp
+       $(call mkdep,$*)
        dir2lzm $* $@; echo
        chmod u+w $@
 
-freslax-0.2/slax/modules/%: %
+$(SLAX_MODULES:%=frescor_slax_0.9/slax/modules/010_frescor_content/%.lzm): frescor_slax_0.9/slax/modules/010_frescor_content/%: %
        cp $< $@
 
-frsh_forb: src=$@/usr/src/frsh_forb
-frsh_forb:
-       mkdir -p $@/usr/local/bin && cp `which omk` $@/usr/local/bin
-       mkdir -p $(src) $(src)/src
-       svn co http://www.frescor.org/private/svn/frescor/omk-build/trunk $(src)/omk-build
-       cd $(src)/omk-build && ./update-all -d 1
-       rm -rf $(src)/src/omk-build
+frsh-forb.stamp: src=$(basename $@)/usr/src/frsh-forb
+frsh-forb.stamp: tgt=$(basename $@)
+frsh-forb.stamp:
+       -rm -rf $(tgt)
+       mkdir -p $(tgt)/usr/local/bin && cp `which omk` $(tgt)/usr/local/bin
+       mkdir -p `basename $(src)`
+       git clone --depth=1 git://frsh-forb.git.sourceforge.net/gitroot/frsh-forb/frsh-forb $(src)
+       cd $(src); git submodule init; git submodule update;
+       cd $(src)/src; git clone --depth=1 /home/wsh/devel/frsh-forb/src/fosa  #./update-svn
+       cd $(src)/src; git clone --depth=1 /home/wsh/devel/frsh-forb/src/fna
 
-       cd $(src)/omk-build/aquosa && ./create-links ../../src
-       $(MAKE) -C $(src)/omk-build/aquosa default-config
-       rm -rf $(src)/omk-build/aquosa/_build
+       cd $(src)/build/aquosa; \
+       echo CONFIG_ACPI_BATTERY=n > config.omk; \
+       echo CONFIG_ACPI_CPU=n >> config.omk; \
+       echo CONFIG_ACPI_LCD=n >> config.omk; \
+       echo CONFIG_DEMO_VIDEO=n >> config.omk; \
+       echo CONFIG_DEMO_DCAMERA=n >> config.omk; \
+       echo OMIT_KERNEL_PASSES=y >> config.omk; 
 
-       cd $(src)/omk-build/marte && ./create-links ../../src
-       $(MAKE) -C $(src)/omk-build/marte default-config
-       rm -rf $(src)/omk-build/marte/_build
-       rm -rf $(src)/omk-build/marte/marte.mk
+       $(MAKE) -C $(src)/build/aquosa default-config
+       $(MAKE) -C $(src)/build/aquosa all
+       rm -rf $(src)/build/aquosa/_build
+       cp $(src)/build/aquosa/_compiled/bin/* $(tgt)/usr/local/bin
+       cp $(src)/build/aquosa/_compiled/bin-tests/dummy_spare_capacity $(tgt)/usr/local/bin
+       cp $(src)/build/aquosa/_compiled/bin-tests/dummy_renegotiation $(tgt)/usr/local/bin
+       mkdir -p $(tgt)/usr/local/lib
+       cp $(src)/build/aquosa/_compiled/lib/* $(tgt)/usr/local/lib
 
        find $(src) -type d -name .svn|xargs rm -rf
-       cp README.frsh_forb $(src)
 
-orte: src=$@/usr/src/orte
-orte: 
+       mkdir -p $(tgt)/home/slax/Desktop
+       cp $(src)/build/aquosa/frsh-forb-demo.sh $(tgt)/usr/local/bin
+       cp frsh-forb-demo.desktop $(tgt)/home/slax/Desktop
+       cp "Source code.desktop" $(tgt)/home/slax/Desktop
+       touch $@
+
+%: %.sh # Cancel builtin implicit rule
+
+orte.stamp: src=$(basename $@)/usr/src/orte
+orte.stamp: tgt=$(basename $@)
+orte.stamp: 
+       -rm -rf $(tgt)
        git clone --depth=1 git://rtime.felk.cvut.cz/orte.git $(src)
        cd $(src) && rm OCERA_TOP_DIR && $(MAKE) default-config all
+
        cd $(src)/orte/contrib/shape && qmake-qt4 && $(MAKE)
-       mkdir -p $@/usr/local/bin $@/usr/lib
-       cp $(src)/_compiled/bin*/* $@/usr/local/bin
-       cp $(src)/orte/contrib/shape/ortedemo $@/usr/local/bin
+       mkdir -p $(tgt)/usr/local/bin $(tgt)/usr/lib
+       cp $(src)/_compiled/bin*/* $(tgt)/usr/local/bin
+       cp $(src)/orte/contrib/shape/ortedemo $(tgt)/usr/local/bin
        ldd $(src)/orte/contrib/shape/ortedemo |grep '\(Qt\|audio\)' |grep -o '/usr/lib/[^ ]*'|while read lib; do \
-               cp -v `readlink -e $$lib` $@/usr/lib; \
+               cp -v `readlink -e $$lib` $(tgt)/usr/lib; \
        done
        $(MAKE) -C $(src) distclean
-       cp ortedemo.sh $@/usr/local/bin
-       mkdir -p $@/root/Desktop
-       cp ortedemo.desktop $@/root/Desktop
+       cp ortedemo.sh $(tgt)/usr/local/bin
+       mkdir -p $(tgt)/home/slax/Desktop
+       cp ortedemo.desktop $(tgt)/home/slax/Desktop
 
-       find /usr/share/icons/hicolor -name 'kfouleggs.*'|while read icon; do\
-               mkdir -p `dirname $@$${icon}`; \
-               cp -v $$icon $@$${icon}; \
+       find icons/usr/share/icons/hicolor -name 'kfouleggs.*'|while read icon; do\
+               mkdir -p `dirname $(tgt)$${icon#icons}`; \
+               cp -v $$icon $(tgt)$${icon#icons}; \
        done
+       touch $@
+
+-include slax.iso.dep
+slax.iso: $(SLAX_MODULES:%=frescor_slax_0.9/slax/modules/010_frescor_content/%.lzm)
+       ./frescor_slax_0.9/slax/make_iso.sh $@
+       $(call mkdep,frescor_slax_0.9)
+
+run: slax.iso
+       kvm -m 512 -cdrom slax.iso
 
 clean:
-       rm $(SLAX_MODULES:%=%.lzm) $(SLAX_MODULES:%=%.lzm.dep)
-       rm -rf $(SLAX_MODULES)
+       -rm $(SLAX_MODULES:%=%.lzm) $(SLAX_MODULES:%=%.lzm.dep) $(SLAX_MODULES:%=%.stamp)
+       -rm -rf $(SLAX_MODULES)
+       -rm slax.iso

diff --git a/Source code.desktop b/Source code.desktop
new file mode 100644 (file)
index 0000000..cc4be27
--- /dev/null
+++ b/Source code.desktop
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Icon=folder
+Type=Link
+URL[$e]=/usr/src

diff --git a/frsh-forb-demo.desktop b/frsh-forb-demo.desktop
new file mode 100644 (file)
index 0000000..33937f5
--- /dev/null
+++ b/frsh-forb-demo.desktop
@@ -0,0 +1,18 @@
+[Desktop Entry]
+Comment=
+Comment[en_US]=
+Exec[$e]=frsh-forb-demo.sh
+GenericName=Demonstration of FRSH/FORB - real-time resource reservation middleware
+GenericName[en_US]=Demonstration of FRSH/FORB - real-time resource reservation middleware
+Icon=kcontrol
+MimeType=
+Name=FRSH/FORB demo
+Name[en_US]=FRSH/FORB demo
+Path[$e]=
+StartupNotify=true
+Terminal=true
+TerminalOptions=
+Type=Application
+X-DCOP-ServiceType=
+X-KDE-SubstituteUID=false
+X-KDE-Username=

diff --git a/icons/usr/share/icons/hicolor/128x128/apps/kfouleggs.png b/icons/usr/share/icons/hicolor/128x128/apps/kfouleggs.png
new file mode 100644 (file)
index 0000000..a912985
Binary files /dev/null and b/icons/usr/share/icons/hicolor/128x128/apps/kfouleggs.png differ

diff --git a/icons/usr/share/icons/hicolor/16x16/apps/kfouleggs.png b/icons/usr/share/icons/hicolor/16x16/apps/kfouleggs.png
new file mode 100644 (file)
index 0000000..ce66ca7
Binary files /dev/null and b/icons/usr/share/icons/hicolor/16x16/apps/kfouleggs.png differ

diff --git a/icons/usr/share/icons/hicolor/22x22/apps/kfouleggs.png b/icons/usr/share/icons/hicolor/22x22/apps/kfouleggs.png
new file mode 100644 (file)
index 0000000..2871319
Binary files /dev/null and b/icons/usr/share/icons/hicolor/22x22/apps/kfouleggs.png differ

diff --git a/icons/usr/share/icons/hicolor/32x32/apps/kfouleggs.png b/icons/usr/share/icons/hicolor/32x32/apps/kfouleggs.png
new file mode 100644 (file)
index 0000000..b7286d4
Binary files /dev/null and b/icons/usr/share/icons/hicolor/32x32/apps/kfouleggs.png differ

diff --git a/icons/usr/share/icons/hicolor/48x48/apps/kfouleggs.png b/icons/usr/share/icons/hicolor/48x48/apps/kfouleggs.png
new file mode 100644 (file)
index 0000000..c6b5fc5
Binary files /dev/null and b/icons/usr/share/icons/hicolor/48x48/apps/kfouleggs.png differ

diff --git a/icons/usr/share/icons/hicolor/64x64/apps/kfouleggs.png b/icons/usr/share/icons/hicolor/64x64/apps/kfouleggs.png
new file mode 100644 (file)
index 0000000..5c4ff35
Binary files /dev/null and b/icons/usr/share/icons/hicolor/64x64/apps/kfouleggs.png differ

diff --git a/run b/run
index 31980794800a82cba1708ea10daa8f74a5704299..ca4de685dcfe33f49c7b64b646339dbba57727aa 100755 (executable)
--- a/run
+++ b/run
@@ -1,4 +1,6 @@
 #!/bin/sh
+kvm -m 512 -cdrom slax.iso
+exit $?
 
 append="autoexec=xconf;telinit~4"
 
@@ -10,5 +12,4 @@ while [ $# -gt 0 ]; do
 done
 
 #NET="-net nic,vlan=0 -net tap,vlan=0,ifname=tap0"
-
-kvm $NET -no-acpi -kernel freslax-0.2/boot/vmlinuz -hda fat:freslax-0.2 -initrd freslax-0.2/boot/initrd.gz -append "ramdisk_size=6666 root=/dev/ram0 rw $append"
+kvm -m 512 $NET -no-acpi -kernel frescor_slax_0.9/boot/vmlinuz -initrd frescor_slax_0.9/boot/initrd.gz -append "ramdisk_size=6666 root=/dev/ram0 rw $append"