Created
October 31, 2013 19:49
-
-
Save syuu1228/7255742 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Makefile b/Makefile | |
index 85f4e7a..92be6b8 100644 | |
--- a/Makefile | |
+++ b/Makefile | |
@@ -3,6 +3,7 @@ mode=release | |
out = build/$(mode) | |
submake = $(out)/Makefile | |
+modulemk = $(out)/module/module.mk | |
quiet = $(if $V, $1, @echo " $2"; $1) | |
silentant = $(if $V,, scripts/silentant.py) | |
@@ -18,7 +19,7 @@ mgmt = 1 | |
# idea whether the target has changed or not. So we call ant from here, | |
# and then the main makefile can treat the build products (jars) as inputs | |
-all: $(submake) | |
+all: $(submake) $(modulemk) | |
$(call quiet, $(silentant) ant -Dmode=$(mode) -Dout=$(abspath $(out)/tests/bench) \ | |
-e -f tests/bench/build.xml $(if $V,,-q), ANT tests/bench) | |
$(call only-if, $(mgmt), cd mgmt && ./gradlew --daemon :web:jar build) | |
@@ -32,6 +33,14 @@ $(submake): Makefile | |
echo 'VPATH = ../..' >> $@ | |
echo 'include ../../build.mk' >> $@ | |
+$(modulemk): Makefile | |
+ mkdir -p $(dir $@) | |
+ echo 'mode = $(mode)' > $@ | |
+ echo 'src = ../../../..' >> $@ | |
+ echo 'out = $(abspath $(out))' >> $@ | |
+ echo 'VPATH = ../../../../' >> $@ | |
+ echo 'include ../../../../build.mk' >> $@ | |
+ | |
qcow2: all | |
qemu-img convert -f raw -O qcow2 build/$(mode)/usr.img build/$(mode)/usr.qcow2 | |
diff --git a/bootfs.manifest b/bootfs.manifest | |
deleted file mode 100644 | |
index 289b518..0000000 | |
--- a/bootfs.manifest | |
+++ /dev/null | |
@@ -1,79 +0,0 @@ | |
-[manifest] | |
-/&/etc/fonts/fonts.conf: %(miscbase)s/& | |
-/&/etc/fonts/conf.d/20-unhint-small-vera.conf: %(miscbase)s/& | |
-/&/etc/fonts/conf.d/25-no-bitmap-fedora.conf: %(miscbase)s/& | |
-/&/etc/fonts/conf.d/25-unhint-nonlatin.conf: %(miscbase)s/& | |
-/&/etc/fonts/conf.d/30-metric-aliases.conf: %(miscbase)s/& | |
-/&/etc/fonts/conf.d/30-urw-aliases.conf: %(miscbase)s/& | |
-/&/etc/fonts/conf.d/40-nonlatin.conf: %(miscbase)s/& | |
-/&/etc/fonts/conf.d/45-latin.conf: %(miscbase)s/& | |
-/&/etc/fonts/conf.d/65-fonts-persian.conf: %(miscbase)s/& | |
-/&/etc/fonts/conf.d/65-nonlatin.conf: %(miscbase)s/& | |
-/&/etc/fonts/conf.d/69-unifont.conf: %(miscbase)s/& | |
-/&/etc/fonts/conf.d/80-delicious.conf: %(miscbase)s/& | |
-/&/etc/fonts/conf.d/90-synthetic.conf: %(miscbase)s/& | |
-/&/etc/fonts/conf.d/59-liberation-mono.conf: %(miscbase)s/& | |
-/&/etc/fonts/conf.d/59-liberation-sans.conf: %(miscbase)s/& | |
-/&/etc/fonts/conf.d/59-liberation-serif.conf: %(miscbase)s/& | |
-/tests/tst-pthread.so: ./tests/tst-pthread.so | |
-/tests/tst-malloc.so: ../../external/glibc-testsuite/build/debug/malloc/tst-malloc.so | |
-/tests/tst-getcwd.so: ../../external/glibc-testsuite/build/debug/io/tst-getcwd.so | |
-/tests/tst-clock.so: ../../external/glibc-testsuite/build/debug/rt/tst-clock.so | |
-/tests/tst-ramdisk.so: ./tests/tst-ramdisk.so | |
-/tests/tst-vblk.so: ./tests/tst-vblk.so | |
-/tests/tst-sockets.so: ./tests/tst-sockets.so | |
-/tests/tst-bsd-tcp1.so: ./tests/tst-bsd-tcp1.so | |
-/tests/tst-bsd-evh.so: ./tests/tst-bsd-evh.so | |
-/tests/tst-bsd-callout.so: ./tests/tst-bsd-callout.so | |
-/tests/tst-fpu.so: ./tests/tst-fpu.so | |
-/tests/tst-preempt.so: ./tests/tst-preempt.so | |
-/tests/tst-tracepoint.so: ./tests/tst-tracepoint.so | |
-/tests/tst-leak.so: ./tests/tst-leak.so | |
-/tests/tst-mmap.so: ./tests/tst-mmap.so | |
-/tests/tst-mmap-file.so: ./tests/tst-mmap-file.so | |
-/tests/tst-mutex.so: ./tests/tst-mutex.so | |
-/tests/tst-hub.so: ./tests/tst-hub.so | |
-/tests/tst-condvar.so: ./tests/tst-condvar.so | |
-/tests/tst-queue-mpsc.so: ./tests/tst-queue-mpsc.so | |
-/&/tests/tst-af-local.so: ./& | |
-/&/tests/tst-pipe.so: ./& | |
-/&/tests/tst-bsd-kthread.so: ./& | |
-/&/tests/tst-bsd-taskqueue.so: ./& | |
-/&/tests/tst-solaris-taskq.so: ./& | |
-/&/tests/tst-vfs.so: ./& | |
-/&/tests/tst-yield.so: ./& | |
-/&/tests/tst-ctxsw.so: ./& | |
-/&/tests/tst-readdir.so: ./& | |
-/&/tests/tst-zfs-simple.so: ./& | |
-/&/tests/tst-zfs-disk.so: ./& | |
-/&/tests/tst-zfs-mount.so: ./& | |
-/&/tests/tst-wake.so: ./& | |
-/&/tests/tst-epoll.so: ./& | |
-/&/tests/tst-lfring.so: ./& | |
-/&/tests/tst-sleep.so: ./& | |
-/&/tests/tst-resolve.so: ./& | |
-/&/tests/tst-except.so: ./& | |
-/&/tests/tst-tcp-sendonly.so: ./& | |
-/&/tests/tst-tcp-hash-srv.so: ./& | |
-/&/tests/tst-loadbalance.so: ./& | |
-/&/tests/tst-dns-resolver.so: ./& | |
-/&/tests/tst-fs-link.so: ./& | |
-/&/tests/tst-kill.so: ./& | |
-/&/tests/tst-rename.so: ./& | |
-/&/tests/tst-truncate.so: ./& | |
-/&/tests/tst-panic.so: ./& | |
-/&/tests/bench/bench.jar: ./& | |
-/testrunner.so: ./tests/testrunner.so | |
-/java/Hello.class: ./tests/hello/Hello.class | |
-/java.so: java/java.so | |
-/java/runjava.jar: java/runjava.jar | |
-/tools/ifconfig.so: ./tools/ifconfig/ifconfig.so | |
-/tools/lsroute.so: ./tools/route/lsroute.so | |
-/&/etc/hosts: ../../static/& | |
-/&/etc/inputrc: ../../static/& | |
-/libuutil.so: libuutil.so | |
-/zpool.so: zpool.so | |
-/libzfs.so: libzfs.so | |
-/zfs.so: zfs.so | |
-/tools/mkfs.so: tools/mkfs/mkfs.so | |
- | |
diff --git a/bootfs.manifest.skel b/bootfs.manifest.skel | |
new file mode 100644 | |
index 0000000..289b518 | |
--- /dev/null | |
+++ b/bootfs.manifest.skel | |
@@ -0,0 +1,79 @@ | |
+[manifest] | |
+/&/etc/fonts/fonts.conf: %(miscbase)s/& | |
+/&/etc/fonts/conf.d/20-unhint-small-vera.conf: %(miscbase)s/& | |
+/&/etc/fonts/conf.d/25-no-bitmap-fedora.conf: %(miscbase)s/& | |
+/&/etc/fonts/conf.d/25-unhint-nonlatin.conf: %(miscbase)s/& | |
+/&/etc/fonts/conf.d/30-metric-aliases.conf: %(miscbase)s/& | |
+/&/etc/fonts/conf.d/30-urw-aliases.conf: %(miscbase)s/& | |
+/&/etc/fonts/conf.d/40-nonlatin.conf: %(miscbase)s/& | |
+/&/etc/fonts/conf.d/45-latin.conf: %(miscbase)s/& | |
+/&/etc/fonts/conf.d/65-fonts-persian.conf: %(miscbase)s/& | |
+/&/etc/fonts/conf.d/65-nonlatin.conf: %(miscbase)s/& | |
+/&/etc/fonts/conf.d/69-unifont.conf: %(miscbase)s/& | |
+/&/etc/fonts/conf.d/80-delicious.conf: %(miscbase)s/& | |
+/&/etc/fonts/conf.d/90-synthetic.conf: %(miscbase)s/& | |
+/&/etc/fonts/conf.d/59-liberation-mono.conf: %(miscbase)s/& | |
+/&/etc/fonts/conf.d/59-liberation-sans.conf: %(miscbase)s/& | |
+/&/etc/fonts/conf.d/59-liberation-serif.conf: %(miscbase)s/& | |
+/tests/tst-pthread.so: ./tests/tst-pthread.so | |
+/tests/tst-malloc.so: ../../external/glibc-testsuite/build/debug/malloc/tst-malloc.so | |
+/tests/tst-getcwd.so: ../../external/glibc-testsuite/build/debug/io/tst-getcwd.so | |
+/tests/tst-clock.so: ../../external/glibc-testsuite/build/debug/rt/tst-clock.so | |
+/tests/tst-ramdisk.so: ./tests/tst-ramdisk.so | |
+/tests/tst-vblk.so: ./tests/tst-vblk.so | |
+/tests/tst-sockets.so: ./tests/tst-sockets.so | |
+/tests/tst-bsd-tcp1.so: ./tests/tst-bsd-tcp1.so | |
+/tests/tst-bsd-evh.so: ./tests/tst-bsd-evh.so | |
+/tests/tst-bsd-callout.so: ./tests/tst-bsd-callout.so | |
+/tests/tst-fpu.so: ./tests/tst-fpu.so | |
+/tests/tst-preempt.so: ./tests/tst-preempt.so | |
+/tests/tst-tracepoint.so: ./tests/tst-tracepoint.so | |
+/tests/tst-leak.so: ./tests/tst-leak.so | |
+/tests/tst-mmap.so: ./tests/tst-mmap.so | |
+/tests/tst-mmap-file.so: ./tests/tst-mmap-file.so | |
+/tests/tst-mutex.so: ./tests/tst-mutex.so | |
+/tests/tst-hub.so: ./tests/tst-hub.so | |
+/tests/tst-condvar.so: ./tests/tst-condvar.so | |
+/tests/tst-queue-mpsc.so: ./tests/tst-queue-mpsc.so | |
+/&/tests/tst-af-local.so: ./& | |
+/&/tests/tst-pipe.so: ./& | |
+/&/tests/tst-bsd-kthread.so: ./& | |
+/&/tests/tst-bsd-taskqueue.so: ./& | |
+/&/tests/tst-solaris-taskq.so: ./& | |
+/&/tests/tst-vfs.so: ./& | |
+/&/tests/tst-yield.so: ./& | |
+/&/tests/tst-ctxsw.so: ./& | |
+/&/tests/tst-readdir.so: ./& | |
+/&/tests/tst-zfs-simple.so: ./& | |
+/&/tests/tst-zfs-disk.so: ./& | |
+/&/tests/tst-zfs-mount.so: ./& | |
+/&/tests/tst-wake.so: ./& | |
+/&/tests/tst-epoll.so: ./& | |
+/&/tests/tst-lfring.so: ./& | |
+/&/tests/tst-sleep.so: ./& | |
+/&/tests/tst-resolve.so: ./& | |
+/&/tests/tst-except.so: ./& | |
+/&/tests/tst-tcp-sendonly.so: ./& | |
+/&/tests/tst-tcp-hash-srv.so: ./& | |
+/&/tests/tst-loadbalance.so: ./& | |
+/&/tests/tst-dns-resolver.so: ./& | |
+/&/tests/tst-fs-link.so: ./& | |
+/&/tests/tst-kill.so: ./& | |
+/&/tests/tst-rename.so: ./& | |
+/&/tests/tst-truncate.so: ./& | |
+/&/tests/tst-panic.so: ./& | |
+/&/tests/bench/bench.jar: ./& | |
+/testrunner.so: ./tests/testrunner.so | |
+/java/Hello.class: ./tests/hello/Hello.class | |
+/java.so: java/java.so | |
+/java/runjava.jar: java/runjava.jar | |
+/tools/ifconfig.so: ./tools/ifconfig/ifconfig.so | |
+/tools/lsroute.so: ./tools/route/lsroute.so | |
+/&/etc/hosts: ../../static/& | |
+/&/etc/inputrc: ../../static/& | |
+/libuutil.so: libuutil.so | |
+/zpool.so: zpool.so | |
+/libzfs.so: libzfs.so | |
+/zfs.so: zfs.so | |
+/tools/mkfs.so: tools/mkfs/mkfs.so | |
+ | |
diff --git a/build.mk b/build.mk | |
index 0fa8a67..a028ad1 100644 | |
--- a/build.mk | |
+++ b/build.mk | |
@@ -583,21 +583,21 @@ bsd/%.o: COMMON += -DSMP -D'__FBSDID(__str__)=extern int __bogus__' -D__x86_64__ | |
jni = java/jni/balloon.so java/jni/elf-loader.so java/jni/networking.so \ | |
java/jni/stty.so java/jni/tracepoint.so java/jni/power.so | |
-usr.img: loader.img scripts/mkzfs.py usr.manifest $(jni) | |
+usr.img: loader.img scripts/mkzfs.py $(out)/usr.manifest $(jni) | |
$(call quiet, qemu-img create $@ 10G, QEMU-IMG CREATE $@) | |
$(call quiet, dd if=loader.img of=$@ conv=notrunc > /dev/null 2>&1) | |
$(call quiet, $(src)/scripts/imgedit.py setpartition $@ 2 $(zfs-start) $(zfs-size), IMGEDIT $@) | |
- $(src)/scripts/mkzfs.py -o $@ -d $@.d --build-dir "$(abspath .)/zfs" -m $(src)/usr.manifest \ | |
+ $(src)/scripts/mkzfs.py -o $@ -d $@.d --build-dir "$(abspath .)/zfs" -m $(out)/usr.manifest \ | |
-D jdkbase=$(jdkbase) -D gccbase=$(gccbase) -D \ | |
glibcbase=$(glibcbase) -D miscbase=$(miscbase) -s $(zfs-start) | |
$(call quiet, $(src)/scripts/imgedit.py setargs $@ $(cmdline), IMGEDIT $@) | |
$(jni): INCLUDES += -I /usr/lib/jvm/java/include -I /usr/lib/jvm/java/include/linux/ | |
-bootfs.bin: scripts/mkbootfs.py bootfs.manifest $(tests) $(tools) \ | |
+bootfs.bin: scripts/mkbootfs.py $(out)/bootfs.manifest $(tests) $(tools) \ | |
tests/testrunner.so java/java.so java/runjava.jar \ | |
zpool.so zfs.so | |
- $(call quiet, $(src)/scripts/mkbootfs.py -o $@ -d $@.d -m $(src)/bootfs.manifest \ | |
+ $(call quiet, $(src)/scripts/mkbootfs.py -o $@ -d $@.d -m $(out)/bootfs.manifest \ | |
-D jdkbase=$(jdkbase) -D gccbase=$(gccbase) -D \ | |
glibcbase=$(glibcbase) -D miscbase=$(miscbase), MKBOOTFS $@) | |
@@ -627,6 +627,12 @@ gen/include/osv/version.h: $(src)/scripts/gen-version-header | |
$(src)/build.mk: $(generated-headers) | |
+$(out)/bootfs.manifest: $(src)/scripts/module.py | |
+ cd $(out)/module && ../../../scripts/module.py bootfs | |
+ | |
+$(out)/usr.manifest: $(src)/scripts/module.py | |
+ cd $(out)/module && ../../../scripts/module.py usr | |
+ | |
-include $(shell find -name '*.d') | |
.DELETE_ON_ERROR: | |
diff --git a/config.json b/config.json | |
new file mode 100644 | |
index 0000000..bb736f6 | |
--- /dev/null | |
+++ b/config.json | |
@@ -0,0 +1,4 @@ | |
+{ | |
+ "modules":[ | |
+ ] | |
+} | |
diff --git a/scripts/module.py b/scripts/module.py | |
new file mode 100755 | |
index 0000000..9e1d805 | |
--- /dev/null | |
+++ b/scripts/module.py | |
@@ -0,0 +1,45 @@ | |
+#!/usr/bin/python | |
+ | |
+import json | |
+import sys | |
+import os | |
+import subprocess | |
+ | |
+f = open("../../../config.json") | |
+conf = json.load(f) | |
+f.close() | |
+ | |
+mtype = sys.argv[1] | |
+mskel = open("../../../%s.manifest.skel" % mtype) | |
+m = open("../%s.manifest" % mtype, "w") | |
+for l in mskel.readlines(): | |
+ m.write(l) | |
+mskel.close() | |
+ | |
+for mod in conf["modules"]: | |
+ mmod_path = "%s/%s.manifest" % (mod["name"], mtype) | |
+ if os.access(mod["name"], os.F_OK) == False: | |
+ if mod["type"] == "git": | |
+ cmd = "git clone -b %s %s %s" % (mod["branch"], mod["path"], mod["name"]) | |
+ elif mod["type"] == "svn": | |
+ cmd = "svn co %s %s" % (mod["path"], mod["name"]) | |
+ elif mod["type"] == "dir": | |
+ cmd = "cp -a %s %s" % (mod["path"], mod["name"]) | |
+ else: | |
+ raise Exception("%s is unknown type" % mod["type"]) | |
+ print cmd | |
+ subprocess.call([cmd], shell=True) | |
+ if os.access(mmod_path, os.F_OK) == False: | |
+ pwd = os.getcwd() | |
+ print "cd %s" % mod["name"] | |
+ os.chdir(mod["name"]) | |
+ cmd = "make module" | |
+ subprocess.call([cmd], shell=True) | |
+ print "cd -" | |
+ os.chdir(pwd) | |
+ print "append %s to %s.manifest" % (mmod_path, mtype) | |
+ mmod = open(mmod_path) | |
+ for l in mmod.readlines(): | |
+ m.write(l) | |
+ mmod.close() | |
+m.close() | |
diff --git a/usr.manifest b/usr.manifest | |
deleted file mode 100644 | |
index c31cee0..0000000 | |
--- a/usr.manifest | |
+++ /dev/null | |
@@ -1,72 +0,0 @@ | |
-[manifest] | |
-/usr/lib/jvm/&/jre/lib/amd64/server/libjvm.so: %(jdkbase)s/& | |
-/usr/lib/jvm/&/jre/lib/amd64/libverify.so: %(jdkbase)s/& | |
-/usr/lib/jvm/&/jre/lib/amd64/libjava.so: %(jdkbase)s/& | |
-/usr/lib/jvm/&/jre/lib/amd64/libzip.so: %(jdkbase)s/& | |
-/usr/lib/jvm/&/jre/lib/amd64/libnio.so: %(jdkbase)s/& | |
-/usr/lib/jvm/&/jre/lib/amd64/libawt.so: %(jdkbase)s/& | |
-/usr/lib/jvm/&/jre/lib/amd64/librmi.so: %(jdkbase)s/& | |
-/usr/lib/jvm/&/jre/lib/amd64/libjdwp.so: %(jdkbase)s/& | |
-/usr/lib/jvm/&/jre/lib/amd64/libdt_socket.so: %(jdkbase)s/& | |
-/usr/lib/libnpt.so: %(jdkbase)s/jre/lib/amd64/libnpt.so | |
-/usr/lib/jvm/&/jre/lib/amd64/headless/libmawt.so: %(jdkbase)s/& | |
-/usr/lib/jvm/&/jre/lib/amd64/libfontmanager.so: %(jdkbase)s/& | |
-/usr/lib/jvm/&/jre/lib/amd64/libmanagement.so: %(jdkbase)s/& | |
-/usr/lib/jvm/&/jre/lib/amd64/libnet.so: %(jdkbase)s/& | |
-/usr/lib/jvm/&/jre/lib/amd64/libjavajpeg.so: %(jdkbase)s/& | |
-/usr/lib/jvm/&/jre/lib/amd64/libinstrument.so: %(jdkbase)s/& | |
-/usr/lib/jvm/&/jre/lib/amd64/jli/libjli.so: %(jdkbase)s/& | |
-/usr/lib/jvm/&/jre/lib/content-types.properties: %(jdkbase)s/& | |
-/usr/lib/jvm/&/jre/lib/management/management.properties: %(jdkbase)s/& | |
-/usr/lib/jvm/&/jre/lib/resources.jar: %(jdkbase)s/& | |
-/usr/lib/jvm/&/lib/tools.jar: %(jdkbase)s/& | |
-/usr/lib/jvm/&/jre/lib/rt.jar: %(jdkbase)s/& | |
-/usr/lib/jvm/&/jre/lib/jsse.jar: %(jdkbase)s/& | |
-/usr/lib/jvm/&/jre/lib/jce.jar: %(jdkbase)s/& | |
-/usr/lib/jvm/&/jre/lib/ext/sunjce_provider.jar: %(jdkbase)s/& | |
-/usr/lib/jvm/&/jre/lib/ext/sunpkcs11.jar: %(jdkbase)s/& | |
-/usr/lib/jvm/&/jre/lib/ext/sunec.jar: %(jdkbase)s/& | |
-/usr/lib/jvm/&/jre/lib/charsets.jar: %(jdkbase)s/& | |
-/usr/lib/jvm/&/jre/lib/rhino.jar: %(jdkbase)s/& | |
-/usr/lib/jvm/&/jre/lib/meta-index: %(jdkbase)s/& | |
-/usr/lib/jvm/&/jre/lib/currency.data: %(jdkbase)s/& | |
-/usr/lib/libz.so.1: %(miscbase)s/usr/lib64/libz.so.1 | |
-/usr/lib/&/libfontconfig.so.1: %(miscbase)s/usr/lib64/& | |
-/usr/lib/&/libfreetype.so.6: %(miscbase)s/usr/lib64/& | |
-/usr/lib/&/libexpat.so.1: %(miscbase)s/usr/lib64/& | |
-/usr/lib/&/libjpeg.so.62: %(miscbase)s/usr/lib64/& | |
-/usr/lib/&/libboost_unit_test_framework-mt.so.1.53.0: %(miscbase)s/usr/lib64/& | |
-/usr/lib/&/libboost_filesystem-mt.so.1.53.0: %(miscbase)s/usr/lib64/& | |
-/&/usr/share/fontconfig/conf.avail/59-liberation-mono.conf: %(miscbase)s/& | |
-/&/usr/share/fontconfig/conf.avail/59-liberation-sans.conf: %(miscbase)s/& | |
-/&/usr/share/fontconfig/conf.avail/59-liberation-serif.conf: %(miscbase)s/& | |
-/&/usr/share/fonts/liberation/LiberationMono-Bold.ttf: %(miscbase)s/& | |
-/&/usr/share/fonts/liberation/LiberationMono-BoldItalic.ttf: %(miscbase)s/& | |
-/&/usr/share/fonts/liberation/LiberationMono-Italic.ttf: %(miscbase)s/& | |
-/&/usr/share/fonts/liberation/LiberationMono-Regular.ttf: %(miscbase)s/& | |
-/&/usr/share/fonts/liberation/LiberationSans-Bold.ttf: %(miscbase)s/& | |
-/&/usr/share/fonts/liberation/LiberationSans-BoldItalic.ttf: %(miscbase)s/& | |
-/&/usr/share/fonts/liberation/LiberationSans-Italic.ttf: %(miscbase)s/& | |
-/&/usr/share/fonts/liberation/LiberationSans-Regular.ttf: %(miscbase)s/& | |
-/&/usr/share/fonts/liberation/LiberationSerif-Bold.ttf: %(miscbase)s/& | |
-/&/usr/share/fonts/liberation/LiberationSerif-BoldItalic.ttf: %(miscbase)s/& | |
-/&/usr/share/fonts/liberation/LiberationSerif-Italic.ttf: %(miscbase)s/& | |
-/&/usr/share/fonts/liberation/LiberationSerif-Regular.ttf: %(miscbase)s/& | |
-/&/usr/share/fonts/liberation/fonts.dir: %(miscbase)s/& | |
-/&/usr/share/fonts/liberation/fonts.scale: %(miscbase)s/& | |
-/usr/lib/jni/balloon.so: java/jni/balloon.so | |
-/usr/lib/&/jni/elf-loader.so: java/& | |
-/usr/lib/&/jni/networking.so: java/& | |
-/usr/lib/&/jni/stty.so: java/& | |
-/usr/lib/&/jni/tracepoint.so: java/& | |
-/usr/lib/&/jni/power.so: java/& | |
-/usr/mgmt/web-1.0.0.jar: ../../mgmt/web/build/libs/web-1.0.0.jar | |
-/usr/mgmt/crash-1.0.0.jar: ../../mgmt/crash/build/libs/crash-1.0.0.jar | |
-/usr/mgmt/mgmt.json: ../../mgmt/web/config/mgmt.json | |
-/usr/mgmt/uploads/index.rb: ../../mgmt/web/views/index.rb | |
-/usr/mgmt/apps/index.rb: ../../mgmt/web/views/index.rb | |
-/usr/mgmt/views/**: ../../mgmt/web/views/** | |
-/usr/mgmt/templates/**: ../../mgmt/web/templates/** | |
-/usr/mgmt/public/**: ../../mgmt/web/public/** | |
-/usr/mgmt/lib/**: ../../mgmt/web/lib/** | |
-/tmp/index.rb: ../../mgmt/web/views/index.rb | |
diff --git a/usr.manifest.skel b/usr.manifest.skel | |
new file mode 100644 | |
index 0000000..c31cee0 | |
--- /dev/null | |
+++ b/usr.manifest.skel | |
@@ -0,0 +1,72 @@ | |
+[manifest] | |
+/usr/lib/jvm/&/jre/lib/amd64/server/libjvm.so: %(jdkbase)s/& | |
+/usr/lib/jvm/&/jre/lib/amd64/libverify.so: %(jdkbase)s/& | |
+/usr/lib/jvm/&/jre/lib/amd64/libjava.so: %(jdkbase)s/& | |
+/usr/lib/jvm/&/jre/lib/amd64/libzip.so: %(jdkbase)s/& | |
+/usr/lib/jvm/&/jre/lib/amd64/libnio.so: %(jdkbase)s/& | |
+/usr/lib/jvm/&/jre/lib/amd64/libawt.so: %(jdkbase)s/& | |
+/usr/lib/jvm/&/jre/lib/amd64/librmi.so: %(jdkbase)s/& | |
+/usr/lib/jvm/&/jre/lib/amd64/libjdwp.so: %(jdkbase)s/& | |
+/usr/lib/jvm/&/jre/lib/amd64/libdt_socket.so: %(jdkbase)s/& | |
+/usr/lib/libnpt.so: %(jdkbase)s/jre/lib/amd64/libnpt.so | |
+/usr/lib/jvm/&/jre/lib/amd64/headless/libmawt.so: %(jdkbase)s/& | |
+/usr/lib/jvm/&/jre/lib/amd64/libfontmanager.so: %(jdkbase)s/& | |
+/usr/lib/jvm/&/jre/lib/amd64/libmanagement.so: %(jdkbase)s/& | |
+/usr/lib/jvm/&/jre/lib/amd64/libnet.so: %(jdkbase)s/& | |
+/usr/lib/jvm/&/jre/lib/amd64/libjavajpeg.so: %(jdkbase)s/& | |
+/usr/lib/jvm/&/jre/lib/amd64/libinstrument.so: %(jdkbase)s/& | |
+/usr/lib/jvm/&/jre/lib/amd64/jli/libjli.so: %(jdkbase)s/& | |
+/usr/lib/jvm/&/jre/lib/content-types.properties: %(jdkbase)s/& | |
+/usr/lib/jvm/&/jre/lib/management/management.properties: %(jdkbase)s/& | |
+/usr/lib/jvm/&/jre/lib/resources.jar: %(jdkbase)s/& | |
+/usr/lib/jvm/&/lib/tools.jar: %(jdkbase)s/& | |
+/usr/lib/jvm/&/jre/lib/rt.jar: %(jdkbase)s/& | |
+/usr/lib/jvm/&/jre/lib/jsse.jar: %(jdkbase)s/& | |
+/usr/lib/jvm/&/jre/lib/jce.jar: %(jdkbase)s/& | |
+/usr/lib/jvm/&/jre/lib/ext/sunjce_provider.jar: %(jdkbase)s/& | |
+/usr/lib/jvm/&/jre/lib/ext/sunpkcs11.jar: %(jdkbase)s/& | |
+/usr/lib/jvm/&/jre/lib/ext/sunec.jar: %(jdkbase)s/& | |
+/usr/lib/jvm/&/jre/lib/charsets.jar: %(jdkbase)s/& | |
+/usr/lib/jvm/&/jre/lib/rhino.jar: %(jdkbase)s/& | |
+/usr/lib/jvm/&/jre/lib/meta-index: %(jdkbase)s/& | |
+/usr/lib/jvm/&/jre/lib/currency.data: %(jdkbase)s/& | |
+/usr/lib/libz.so.1: %(miscbase)s/usr/lib64/libz.so.1 | |
+/usr/lib/&/libfontconfig.so.1: %(miscbase)s/usr/lib64/& | |
+/usr/lib/&/libfreetype.so.6: %(miscbase)s/usr/lib64/& | |
+/usr/lib/&/libexpat.so.1: %(miscbase)s/usr/lib64/& | |
+/usr/lib/&/libjpeg.so.62: %(miscbase)s/usr/lib64/& | |
+/usr/lib/&/libboost_unit_test_framework-mt.so.1.53.0: %(miscbase)s/usr/lib64/& | |
+/usr/lib/&/libboost_filesystem-mt.so.1.53.0: %(miscbase)s/usr/lib64/& | |
+/&/usr/share/fontconfig/conf.avail/59-liberation-mono.conf: %(miscbase)s/& | |
+/&/usr/share/fontconfig/conf.avail/59-liberation-sans.conf: %(miscbase)s/& | |
+/&/usr/share/fontconfig/conf.avail/59-liberation-serif.conf: %(miscbase)s/& | |
+/&/usr/share/fonts/liberation/LiberationMono-Bold.ttf: %(miscbase)s/& | |
+/&/usr/share/fonts/liberation/LiberationMono-BoldItalic.ttf: %(miscbase)s/& | |
+/&/usr/share/fonts/liberation/LiberationMono-Italic.ttf: %(miscbase)s/& | |
+/&/usr/share/fonts/liberation/LiberationMono-Regular.ttf: %(miscbase)s/& | |
+/&/usr/share/fonts/liberation/LiberationSans-Bold.ttf: %(miscbase)s/& | |
+/&/usr/share/fonts/liberation/LiberationSans-BoldItalic.ttf: %(miscbase)s/& | |
+/&/usr/share/fonts/liberation/LiberationSans-Italic.ttf: %(miscbase)s/& | |
+/&/usr/share/fonts/liberation/LiberationSans-Regular.ttf: %(miscbase)s/& | |
+/&/usr/share/fonts/liberation/LiberationSerif-Bold.ttf: %(miscbase)s/& | |
+/&/usr/share/fonts/liberation/LiberationSerif-BoldItalic.ttf: %(miscbase)s/& | |
+/&/usr/share/fonts/liberation/LiberationSerif-Italic.ttf: %(miscbase)s/& | |
+/&/usr/share/fonts/liberation/LiberationSerif-Regular.ttf: %(miscbase)s/& | |
+/&/usr/share/fonts/liberation/fonts.dir: %(miscbase)s/& | |
+/&/usr/share/fonts/liberation/fonts.scale: %(miscbase)s/& | |
+/usr/lib/jni/balloon.so: java/jni/balloon.so | |
+/usr/lib/&/jni/elf-loader.so: java/& | |
+/usr/lib/&/jni/networking.so: java/& | |
+/usr/lib/&/jni/stty.so: java/& | |
+/usr/lib/&/jni/tracepoint.so: java/& | |
+/usr/lib/&/jni/power.so: java/& | |
+/usr/mgmt/web-1.0.0.jar: ../../mgmt/web/build/libs/web-1.0.0.jar | |
+/usr/mgmt/crash-1.0.0.jar: ../../mgmt/crash/build/libs/crash-1.0.0.jar | |
+/usr/mgmt/mgmt.json: ../../mgmt/web/config/mgmt.json | |
+/usr/mgmt/uploads/index.rb: ../../mgmt/web/views/index.rb | |
+/usr/mgmt/apps/index.rb: ../../mgmt/web/views/index.rb | |
+/usr/mgmt/views/**: ../../mgmt/web/views/** | |
+/usr/mgmt/templates/**: ../../mgmt/web/templates/** | |
+/usr/mgmt/public/**: ../../mgmt/web/public/** | |
+/usr/mgmt/lib/**: ../../mgmt/web/lib/** | |
+/tmp/index.rb: ../../mgmt/web/views/index.rb |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment