Allowing libraries to search their own include/ for <foo.h> is a huge mess
that results in issues when glibc has foo.h. The fix is to not allow that,
and to insist libraries refer to their own files by their full name
(libname/foo.h).
All user libraries (other than pthread) now have their include directories
arranged as:
user/LIBNAME/include/LIBNAME/FOO.h
With their include path being set to user/LIBNAME/include/, and all
#includes explicitly list the libname.
Due to moving parlib's arch symlink, you'll need to do something like:
$ rm user/parlib/include/arch
$ make mrproper
$ mv .config.old .config
$ make ARCH=x86 oldconfig
$ make userclean
Signed-off-by: Barret Rhoden <[email protected]>
---
.gitignore | 2 +-
Makefile | 4 ++--
tools/compilers/gcc-glibc/Makefile | 3 +--
user/Makefrag-user-lib | 9 ++-------
user/benchutil/include/benchutil | 1 -
user/benchutil/include/{ => benchutil}/alarm.h | 0
user/benchutil/include/{ => benchutil}/measure.h | 0
user/benchutil/include/{ => benchutil}/pvcalarm.h | 0
user/iplib/include/iplib | 1 -
user/iplib/include/{ => iplib}/icmp.h | 0
user/iplib/include/{ => iplib}/iplib.h | 0
user/ndblib/include/ndblib | 1 -
user/ndblib/include/{ => ndblib}/fcallfmt.h | 0
user/ndblib/include/{ => ndblib}/ndb.h | 0
user/ndblib/include/{ => ndblib}/ndbhf.h | 0
user/ndblib/ndbopen.c | 2 +-
user/parlib/include/parlib | 1 -
user/parlib/include/{ => parlib}/arc.h | 0
user/parlib/include/{ => parlib}/assert.h | 0
user/parlib/include/{ => parlib}/bitmask.h | 0
user/parlib/include/{ => parlib}/ceq.h | 0
user/parlib/include/{ => parlib}/common.h | 0
user/parlib/include/{ => parlib}/dtls.h | 0
user/parlib/include/{ => parlib}/evbitmap.h | 0
user/parlib/include/{ => parlib}/event.h | 0
user/parlib/include/{ => parlib}/mcs.h | 0
user/parlib/include/{ => parlib}/net.h | 0
user/parlib/include/{ => parlib}/parlib.h | 0
user/parlib/include/{ => parlib}/poke.h | 0
user/parlib/include/{ => parlib}/pool.h | 0
user/parlib/include/{ => parlib}/printf-ext.h | 0
user/parlib/include/{ => parlib}/riscv/arch.h | 0
user/parlib/include/{ => parlib}/riscv/atomic.h | 0
user/parlib/include/{ => parlib}/riscv/bitmask.h | 0
user/parlib/include/{ => parlib}/riscv/trap.h | 0
user/parlib/include/{ => parlib}/riscv/vcore.h | 0
user/parlib/include/{ => parlib}/ros_debug.h | 0
user/parlib/include/{ => parlib}/serialize.h | 0
user/parlib/include/{ => parlib}/signal.h | 0
user/parlib/include/{ => parlib}/slab.h | 0
user/parlib/include/{ => parlib}/spinlock.h | 0
user/parlib/include/{ => parlib}/stdio.h | 0
user/parlib/include/{ => parlib}/timing.h | 0
user/parlib/include/{ => parlib}/tsc-compat.h | 0
user/parlib/include/{ => parlib}/ucq.h | 0
user/parlib/include/{ => parlib}/uthread.h | 0
user/parlib/include/{ => parlib}/vcore.h | 0
user/parlib/include/{ => parlib}/waitfreelist.h | 0
user/parlib/include/{ => parlib}/x86/arch.h | 0
user/parlib/include/{ => parlib}/x86/atomic.h | 0
user/parlib/include/{ => parlib}/x86/bitmask.h | 0
user/parlib/include/{ => parlib}/x86/trap.h | 0
user/parlib/include/{ => parlib}/x86/vcore.h | 0
user/parlib/include/{ => parlib}/x86/vcore32.h | 0
user/parlib/include/{ => parlib}/x86/vcore64.h | 0
user/vmm/include/vmm | 1 -
user/vmm/include/{ => vmm}/acpi/acakaros.h | 0
user/vmm/include/{acpi/platform => vmm/acpi}/acakarosex.h | 0
user/vmm/include/{ => vmm}/acpi/acbuffer.h | 0
user/vmm/include/{ => vmm}/acpi/acconfig.h | 0
user/vmm/include/{ => vmm}/acpi/acenv.h | 0
user/vmm/include/{ => vmm}/acpi/acenvex.h | 0
user/vmm/include/{ => vmm}/acpi/acexcep.h | 0
user/vmm/include/{acpi/platform => vmm/acpi}/acgcc.h | 0
user/vmm/include/{ => vmm}/acpi/acnames.h | 0
user/vmm/include/{ => vmm}/acpi/acoutput.h | 0
user/vmm/include/{ => vmm}/acpi/acpi.h | 0
user/vmm/include/{ => vmm}/acpi/acpi_bus.h | 0
user/vmm/include/{ => vmm}/acpi/acpi_drivers.h | 0
user/vmm/include/{ => vmm}/acpi/acpi_io.h | 0
user/vmm/include/{ => vmm}/acpi/acpi_lpat.h | 0
user/vmm/include/{ => vmm}/acpi/acpi_numa.h | 0
user/vmm/include/{ => vmm}/acpi/acpiosxf.h | 0
user/vmm/include/{ => vmm}/acpi/acpixf.h | 0
user/vmm/include/{ => vmm}/acpi/acrestyp.h | 0
user/vmm/include/{ => vmm}/acpi/actbl.h | 0
user/vmm/include/{ => vmm}/acpi/actbl1.h | 0
user/vmm/include/{ => vmm}/acpi/actbl2.h | 0
user/vmm/include/{ => vmm}/acpi/actbl3.h | 0
user/vmm/include/{ => vmm}/acpi/actypes.h | 0
user/vmm/include/{ => vmm}/acpi/acuuid.h | 0
user/vmm/include/{ => vmm}/acpi/apei.h | 0
user/vmm/include/{ => vmm}/acpi/button.h | 0
user/vmm/include/{ => vmm}/acpi/ghes.h | 0
user/vmm/include/{ => vmm}/acpi/hed.h | 0
user/vmm/include/{ => vmm}/acpi/pdc_intel.h | 0
user/vmm/include/{ => vmm}/acpi/platform/acakaros.h | 0
user/vmm/include/{acpi => vmm/acpi/platform}/acakarosex.h | 0
user/vmm/include/{ => vmm}/acpi/platform/acenv.h | 0
user/vmm/include/{ => vmm}/acpi/platform/acenvex.h | 0
user/vmm/include/{acpi => vmm/acpi/platform}/acgcc.h | 0
user/vmm/include/{ => vmm}/acpi/processor.h | 0
user/vmm/include/{ => vmm}/acpi/reboot.h | 0
user/vmm/include/{ => vmm}/acpi/video.h | 0
user/vmm/include/{ => vmm}/coreboot_tables.h | 0
user/vmm/include/{ => vmm}/linux_bootparam.h | 0
user/vmm/include/{ => vmm}/virtio.h | 0
user/vmm/include/{ => vmm}/virtio_9p.h | 0
user/vmm/include/{ => vmm}/virtio_balloon.h | 0
user/vmm/include/{ => vmm}/virtio_blk.h | 0
user/vmm/include/{ => vmm}/virtio_config.h | 0
user/vmm/include/{ => vmm}/virtio_console.h | 0
user/vmm/include/{ => vmm}/virtio_ids.h | 0
user/vmm/include/{ => vmm}/virtio_input.h | 0
user/vmm/include/{ => vmm}/virtio_mmio.h | 0
user/vmm/include/{ => vmm}/virtio_net.h | 0
user/vmm/include/{ => vmm}/virtio_pci.h | 0
user/vmm/include/{ => vmm}/virtio_ring.h | 0
user/vmm/include/{ => vmm}/virtio_rng.h | 0
user/vmm/include/{ => vmm}/virtio_scsi.h | 0
user/vmm/include/{ => vmm}/virtio_types.h | 0
user/vmm/include/{ => vmm}/vmm.h | 0
112 files changed, 7 insertions(+), 18 deletions(-)
delete mode 120000 user/benchutil/include/benchutil
rename user/benchutil/include/{ => benchutil}/alarm.h (100%)
rename user/benchutil/include/{ => benchutil}/measure.h (100%)
rename user/benchutil/include/{ => benchutil}/pvcalarm.h (100%)
delete mode 120000 user/iplib/include/iplib
rename user/iplib/include/{ => iplib}/icmp.h (100%)
rename user/iplib/include/{ => iplib}/iplib.h (100%)
delete mode 120000 user/ndblib/include/ndblib
rename user/ndblib/include/{ => ndblib}/fcallfmt.h (100%)
rename user/ndblib/include/{ => ndblib}/ndb.h (100%)
rename user/ndblib/include/{ => ndblib}/ndbhf.h (100%)
delete mode 120000 user/parlib/include/parlib
rename user/parlib/include/{ => parlib}/arc.h (100%)
rename user/parlib/include/{ => parlib}/assert.h (100%)
rename user/parlib/include/{ => parlib}/bitmask.h (100%)
rename user/parlib/include/{ => parlib}/ceq.h (100%)
rename user/parlib/include/{ => parlib}/common.h (100%)
rename user/parlib/include/{ => parlib}/dtls.h (100%)
rename user/parlib/include/{ => parlib}/evbitmap.h (100%)
rename user/parlib/include/{ => parlib}/event.h (100%)
rename user/parlib/include/{ => parlib}/mcs.h (100%)
rename user/parlib/include/{ => parlib}/net.h (100%)
rename user/parlib/include/{ => parlib}/parlib.h (100%)
rename user/parlib/include/{ => parlib}/poke.h (100%)
rename user/parlib/include/{ => parlib}/pool.h (100%)
rename user/parlib/include/{ => parlib}/printf-ext.h (100%)
rename user/parlib/include/{ => parlib}/riscv/arch.h (100%)
rename user/parlib/include/{ => parlib}/riscv/atomic.h (100%)
rename user/parlib/include/{ => parlib}/riscv/bitmask.h (100%)
rename user/parlib/include/{ => parlib}/riscv/trap.h (100%)
rename user/parlib/include/{ => parlib}/riscv/vcore.h (100%)
rename user/parlib/include/{ => parlib}/ros_debug.h (100%)
rename user/parlib/include/{ => parlib}/serialize.h (100%)
rename user/parlib/include/{ => parlib}/signal.h (100%)
rename user/parlib/include/{ => parlib}/slab.h (100%)
rename user/parlib/include/{ => parlib}/spinlock.h (100%)
rename user/parlib/include/{ => parlib}/stdio.h (100%)
rename user/parlib/include/{ => parlib}/timing.h (100%)
rename user/parlib/include/{ => parlib}/tsc-compat.h (100%)
rename user/parlib/include/{ => parlib}/ucq.h (100%)
rename user/parlib/include/{ => parlib}/uthread.h (100%)
rename user/parlib/include/{ => parlib}/vcore.h (100%)
rename user/parlib/include/{ => parlib}/waitfreelist.h (100%)
rename user/parlib/include/{ => parlib}/x86/arch.h (100%)
rename user/parlib/include/{ => parlib}/x86/atomic.h (100%)
rename user/parlib/include/{ => parlib}/x86/bitmask.h (100%)
rename user/parlib/include/{ => parlib}/x86/trap.h (100%)
rename user/parlib/include/{ => parlib}/x86/vcore.h (100%)
rename user/parlib/include/{ => parlib}/x86/vcore32.h (100%)
rename user/parlib/include/{ => parlib}/x86/vcore64.h (100%)
delete mode 120000 user/vmm/include/vmm
rename user/vmm/include/{ => vmm}/acpi/acakaros.h (100%)
rename user/vmm/include/{acpi/platform => vmm/acpi}/acakarosex.h (100%)
rename user/vmm/include/{ => vmm}/acpi/acbuffer.h (100%)
rename user/vmm/include/{ => vmm}/acpi/acconfig.h (100%)
rename user/vmm/include/{ => vmm}/acpi/acenv.h (100%)
rename user/vmm/include/{ => vmm}/acpi/acenvex.h (100%)
rename user/vmm/include/{ => vmm}/acpi/acexcep.h (100%)
rename user/vmm/include/{acpi/platform => vmm/acpi}/acgcc.h (100%)
rename user/vmm/include/{ => vmm}/acpi/acnames.h (100%)
rename user/vmm/include/{ => vmm}/acpi/acoutput.h (100%)
rename user/vmm/include/{ => vmm}/acpi/acpi.h (100%)
rename user/vmm/include/{ => vmm}/acpi/acpi_bus.h (100%)
rename user/vmm/include/{ => vmm}/acpi/acpi_drivers.h (100%)
rename user/vmm/include/{ => vmm}/acpi/acpi_io.h (100%)
rename user/vmm/include/{ => vmm}/acpi/acpi_lpat.h (100%)
rename user/vmm/include/{ => vmm}/acpi/acpi_numa.h (100%)
rename user/vmm/include/{ => vmm}/acpi/acpiosxf.h (100%)
rename user/vmm/include/{ => vmm}/acpi/acpixf.h (100%)
rename user/vmm/include/{ => vmm}/acpi/acrestyp.h (100%)
rename user/vmm/include/{ => vmm}/acpi/actbl.h (100%)
rename user/vmm/include/{ => vmm}/acpi/actbl1.h (100%)
rename user/vmm/include/{ => vmm}/acpi/actbl2.h (100%)
rename user/vmm/include/{ => vmm}/acpi/actbl3.h (100%)
rename user/vmm/include/{ => vmm}/acpi/actypes.h (100%)
rename user/vmm/include/{ => vmm}/acpi/acuuid.h (100%)
rename user/vmm/include/{ => vmm}/acpi/apei.h (100%)
rename user/vmm/include/{ => vmm}/acpi/button.h (100%)
rename user/vmm/include/{ => vmm}/acpi/ghes.h (100%)
rename user/vmm/include/{ => vmm}/acpi/hed.h (100%)
rename user/vmm/include/{ => vmm}/acpi/pdc_intel.h (100%)
rename user/vmm/include/{ => vmm}/acpi/platform/acakaros.h (100%)
rename user/vmm/include/{acpi => vmm/acpi/platform}/acakarosex.h (100%)
rename user/vmm/include/{ => vmm}/acpi/platform/acenv.h (100%)
rename user/vmm/include/{ => vmm}/acpi/platform/acenvex.h (100%)
rename user/vmm/include/{acpi => vmm/acpi/platform}/acgcc.h (100%)
rename user/vmm/include/{ => vmm}/acpi/processor.h (100%)
rename user/vmm/include/{ => vmm}/acpi/reboot.h (100%)
rename user/vmm/include/{ => vmm}/acpi/video.h (100%)
rename user/vmm/include/{ => vmm}/coreboot_tables.h (100%)
rename user/vmm/include/{ => vmm}/linux_bootparam.h (100%)
rename user/vmm/include/{ => vmm}/virtio.h (100%)
rename user/vmm/include/{ => vmm}/virtio_9p.h (100%)
rename user/vmm/include/{ => vmm}/virtio_balloon.h (100%)
rename user/vmm/include/{ => vmm}/virtio_blk.h (100%)
rename user/vmm/include/{ => vmm}/virtio_config.h (100%)
rename user/vmm/include/{ => vmm}/virtio_console.h (100%)
rename user/vmm/include/{ => vmm}/virtio_ids.h (100%)
rename user/vmm/include/{ => vmm}/virtio_input.h (100%)
rename user/vmm/include/{ => vmm}/virtio_mmio.h (100%)
rename user/vmm/include/{ => vmm}/virtio_net.h (100%)
rename user/vmm/include/{ => vmm}/virtio_pci.h (100%)
rename user/vmm/include/{ => vmm}/virtio_ring.h (100%)
rename user/vmm/include/{ => vmm}/virtio_rng.h (100%)
rename user/vmm/include/{ => vmm}/virtio_scsi.h (100%)
rename user/vmm/include/{ => vmm}/virtio_types.h (100%)
rename user/vmm/include/{ => vmm}/vmm.h (100%)
diff --git a/.gitignore b/.gitignore
index 2c8ba618be10..5cc90e405984 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,7 @@ kern/include/arch
kern/src/arch
kern/src/build_info.*
kern/src/error.c
-user/parlib/include/arch
+user/parlib/include/parlib/arch
Documentation/doxygen/rosdoc
sim/
sim
diff --git a/Makefile b/Makefile
index ad1a74cba200..1fb54ba85fcf 100644
--- a/Makefile
+++ b/Makefile
@@ -122,7 +122,7 @@ endif
PHONY += symlinks clean_symlinks
clean_symlinks: objclean
- @rm -f kern/include/arch kern/boot user/parlib/include/arch
+ @rm -f kern/include/arch kern/boot user/parlib/include/parlib/arch
arch-link := $(notdir $(shell readlink kern/include/arch))
valid-arches := $(notdir $(wildcard kern/arch/*))
@@ -140,7 +140,7 @@ symlinks: clean_symlinks
@echo Making symlinks...
$(Q)ln -fs ../arch/$(ARCH) kern/include/arch
$(Q)ln -fs arch/$(ARCH)/boot kern/boot
- $(Q)ln -fs $(ARCH) user/parlib/include/arch
+ $(Q)ln -fs $(ARCH) user/parlib/include/parlib/arch
$(Q)$(MAKE) -f $(srctree)/Makefile clean
else
diff --git a/tools/compilers/gcc-glibc/Makefile
b/tools/compilers/gcc-glibc/Makefile
index 55adf9eb9ac4..41f4f8b51a11 100644
--- a/tools/compilers/gcc-glibc/Makefile
+++ b/tools/compilers/gcc-glibc/Makefile
@@ -472,9 +472,8 @@ $(BINARY_PREFIX)gcc-stage2-builddir: gcc-$(GCC_VERSION)
mkdir -p $(SYSROOT)/usr/include/ros/arch
cp -r $(AKAROSDIR)/kern/arch/$(AKAROS_ARCH_DIR)/ros/* \
$(SYSROOT)/usr/include/ros/arch/
- mkdir -p $(SYSROOT)/usr/include/parlib
cp -r $(AKAROSDIR)/user/parlib/include/* \
- $(SYSROOT)/usr/include/parlib/
+ $(SYSROOT)/usr/include/
cp -r $(AKAROSDIR)/user/pthread/*.h \
$(SYSROOT)/usr/include/
diff --git a/user/Makefrag-user-lib b/user/Makefrag-user-lib
index 2ac9d05eebb3..2e27ad9785ad 100644
--- a/user/Makefrag-user-lib
+++ b/user/Makefrag-user-lib
@@ -43,15 +43,10 @@ $(FINALLIB): $(OBJS)
@mkdir -p $(@D)
$(Q)$(AR) rc $@ $(OBJS)
-# Allow three different patterns for installing include files
+# Allow two different patterns for installing include files
$(FINALLIB-INSTALL): $(FINALLIB)
@cp $(FINALLIB) $@
- @if [ -L "$(INCDIR)/$(LIBNAME)" ]; then \
- rm -rf $(XCC_TARGET_INCLUDE)/$(LIBNAME) ; \
- mkdir $(XCC_TARGET_INCLUDE)/$(LIBNAME) ; \
- cp -r $(INCDIR)/* $(XCC_TARGET_INCLUDE)/$(LIBNAME)/ ; \
- rm $(XCC_TARGET_INCLUDE)/$(LIBNAME)/$(LIBNAME) ; \
- elif [ -d "$(INCDIR)/$(LIBNAME)" ]; then \
+ @if [ -d "$(INCDIR)/$(LIBNAME)" ]; then \
rm -rf $(XCC_TARGET_INCLUDE)/$(LIBNAME) ; \
cp -r $(INCDIR)/$(LIBNAME) $(XCC_TARGET_INCLUDE)/ ; \
else \
diff --git a/user/benchutil/include/benchutil b/user/benchutil/include/benchutil
deleted file mode 120000
index 945c9b46d684..000000000000
--- a/user/benchutil/include/benchutil
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/user/benchutil/include/alarm.h
b/user/benchutil/include/benchutil/alarm.h
similarity index 100%
rename from user/benchutil/include/alarm.h
rename to user/benchutil/include/benchutil/alarm.h
diff --git a/user/benchutil/include/measure.h
b/user/benchutil/include/benchutil/measure.h
similarity index 100%
rename from user/benchutil/include/measure.h
rename to user/benchutil/include/benchutil/measure.h
diff --git a/user/benchutil/include/pvcalarm.h
b/user/benchutil/include/benchutil/pvcalarm.h
similarity index 100%
rename from user/benchutil/include/pvcalarm.h
rename to user/benchutil/include/benchutil/pvcalarm.h
diff --git a/user/iplib/include/iplib b/user/iplib/include/iplib
deleted file mode 120000
index 945c9b46d684..000000000000
--- a/user/iplib/include/iplib
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/user/iplib/include/icmp.h b/user/iplib/include/iplib/icmp.h
similarity index 100%
rename from user/iplib/include/icmp.h
rename to user/iplib/include/iplib/icmp.h
diff --git a/user/iplib/include/iplib.h b/user/iplib/include/iplib/iplib.h
similarity index 100%
rename from user/iplib/include/iplib.h
rename to user/iplib/include/iplib/iplib.h
diff --git a/user/ndblib/include/ndblib b/user/ndblib/include/ndblib
deleted file mode 120000
index 945c9b46d684..000000000000
--- a/user/ndblib/include/ndblib
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/user/ndblib/include/fcallfmt.h
b/user/ndblib/include/ndblib/fcallfmt.h
similarity index 100%
rename from user/ndblib/include/fcallfmt.h
rename to user/ndblib/include/ndblib/fcallfmt.h
diff --git a/user/ndblib/include/ndb.h b/user/ndblib/include/ndblib/ndb.h
similarity index 100%
rename from user/ndblib/include/ndb.h
rename to user/ndblib/include/ndblib/ndb.h
diff --git a/user/ndblib/include/ndbhf.h b/user/ndblib/include/ndblib/ndbhf.h
similarity index 100%
rename from user/ndblib/include/ndbhf.h
rename to user/ndblib/include/ndblib/ndbhf.h
diff --git a/user/ndblib/ndbopen.c b/user/ndblib/ndbopen.c
index 9f3d175c5400..03cd8d106b80 100755
--- a/user/ndblib/ndbopen.c
+++ b/user/ndblib/ndbopen.c
@@ -17,7 +17,7 @@
#include <fcntl.h>
#include <iplib/iplib.h>
#include <ndblib/ndb.h>
-#include "ndbhf.h"
+#include <ndblib/ndbhf.h>
static struct ndb* doopen(char*);
static void hffree(struct ndb*);
diff --git a/user/parlib/include/parlib b/user/parlib/include/parlib
deleted file mode 120000
index 945c9b46d684..000000000000
--- a/user/parlib/include/parlib
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/user/parlib/include/arc.h b/user/parlib/include/parlib/arc.h
similarity index 100%
rename from user/parlib/include/arc.h
rename to user/parlib/include/parlib/arc.h
diff --git a/user/parlib/include/assert.h b/user/parlib/include/parlib/assert.h
similarity index 100%
rename from user/parlib/include/assert.h
rename to user/parlib/include/parlib/assert.h
diff --git a/user/parlib/include/bitmask.h
b/user/parlib/include/parlib/bitmask.h
similarity index 100%
rename from user/parlib/include/bitmask.h
rename to user/parlib/include/parlib/bitmask.h
diff --git a/user/parlib/include/ceq.h b/user/parlib/include/parlib/ceq.h
similarity index 100%
rename from user/parlib/include/ceq.h
rename to user/parlib/include/parlib/ceq.h
diff --git a/user/parlib/include/common.h b/user/parlib/include/parlib/common.h
similarity index 100%
rename from user/parlib/include/common.h
rename to user/parlib/include/parlib/common.h
diff --git a/user/parlib/include/dtls.h b/user/parlib/include/parlib/dtls.h
similarity index 100%
rename from user/parlib/include/dtls.h
rename to user/parlib/include/parlib/dtls.h
diff --git a/user/parlib/include/evbitmap.h
b/user/parlib/include/parlib/evbitmap.h
similarity index 100%
rename from user/parlib/include/evbitmap.h
rename to user/parlib/include/parlib/evbitmap.h
diff --git a/user/parlib/include/event.h b/user/parlib/include/parlib/event.h
similarity index 100%
rename from user/parlib/include/event.h
rename to user/parlib/include/parlib/event.h
diff --git a/user/parlib/include/mcs.h b/user/parlib/include/parlib/mcs.h
similarity index 100%
rename from user/parlib/include/mcs.h
rename to user/parlib/include/parlib/mcs.h
diff --git a/user/parlib/include/net.h b/user/parlib/include/parlib/net.h
similarity index 100%
rename from user/parlib/include/net.h
rename to user/parlib/include/parlib/net.h
diff --git a/user/parlib/include/parlib.h b/user/parlib/include/parlib/parlib.h
similarity index 100%
rename from user/parlib/include/parlib.h
rename to user/parlib/include/parlib/parlib.h
diff --git a/user/parlib/include/poke.h b/user/parlib/include/parlib/poke.h
similarity index 100%
rename from user/parlib/include/poke.h
rename to user/parlib/include/parlib/poke.h
diff --git a/user/parlib/include/pool.h b/user/parlib/include/parlib/pool.h
similarity index 100%
rename from user/parlib/include/pool.h
rename to user/parlib/include/parlib/pool.h
diff --git a/user/parlib/include/printf-ext.h
b/user/parlib/include/parlib/printf-ext.h
similarity index 100%
rename from user/parlib/include/printf-ext.h
rename to user/parlib/include/parlib/printf-ext.h
diff --git a/user/parlib/include/riscv/arch.h
b/user/parlib/include/parlib/riscv/arch.h
similarity index 100%
rename from user/parlib/include/riscv/arch.h
rename to user/parlib/include/parlib/riscv/arch.h
diff --git a/user/parlib/include/riscv/atomic.h
b/user/parlib/include/parlib/riscv/atomic.h
similarity index 100%
rename from user/parlib/include/riscv/atomic.h
rename to user/parlib/include/parlib/riscv/atomic.h
diff --git a/user/parlib/include/riscv/bitmask.h
b/user/parlib/include/parlib/riscv/bitmask.h
similarity index 100%
rename from user/parlib/include/riscv/bitmask.h
rename to user/parlib/include/parlib/riscv/bitmask.h
diff --git a/user/parlib/include/riscv/trap.h
b/user/parlib/include/parlib/riscv/trap.h
similarity index 100%
rename from user/parlib/include/riscv/trap.h
rename to user/parlib/include/parlib/riscv/trap.h
diff --git a/user/parlib/include/riscv/vcore.h
b/user/parlib/include/parlib/riscv/vcore.h
similarity index 100%
rename from user/parlib/include/riscv/vcore.h
rename to user/parlib/include/parlib/riscv/vcore.h
diff --git a/user/parlib/include/ros_debug.h
b/user/parlib/include/parlib/ros_debug.h
similarity index 100%
rename from user/parlib/include/ros_debug.h
rename to user/parlib/include/parlib/ros_debug.h
diff --git a/user/parlib/include/serialize.h
b/user/parlib/include/parlib/serialize.h
similarity index 100%
rename from user/parlib/include/serialize.h
rename to user/parlib/include/parlib/serialize.h
diff --git a/user/parlib/include/signal.h b/user/parlib/include/parlib/signal.h
similarity index 100%
rename from user/parlib/include/signal.h
rename to user/parlib/include/parlib/signal.h
diff --git a/user/parlib/include/slab.h b/user/parlib/include/parlib/slab.h
similarity index 100%
rename from user/parlib/include/slab.h
rename to user/parlib/include/parlib/slab.h
diff --git a/user/parlib/include/spinlock.h
b/user/parlib/include/parlib/spinlock.h
similarity index 100%
rename from user/parlib/include/spinlock.h
rename to user/parlib/include/parlib/spinlock.h
diff --git a/user/parlib/include/stdio.h b/user/parlib/include/parlib/stdio.h
similarity index 100%
rename from user/parlib/include/stdio.h
rename to user/parlib/include/parlib/stdio.h
diff --git a/user/parlib/include/timing.h b/user/parlib/include/parlib/timing.h
similarity index 100%
rename from user/parlib/include/timing.h
rename to user/parlib/include/parlib/timing.h
diff --git a/user/parlib/include/tsc-compat.h
b/user/parlib/include/parlib/tsc-compat.h
similarity index 100%
rename from user/parlib/include/tsc-compat.h
rename to user/parlib/include/parlib/tsc-compat.h
diff --git a/user/parlib/include/ucq.h b/user/parlib/include/parlib/ucq.h
similarity index 100%
rename from user/parlib/include/ucq.h
rename to user/parlib/include/parlib/ucq.h
diff --git a/user/parlib/include/uthread.h
b/user/parlib/include/parlib/uthread.h
similarity index 100%
rename from user/parlib/include/uthread.h
rename to user/parlib/include/parlib/uthread.h
diff --git a/user/parlib/include/vcore.h b/user/parlib/include/parlib/vcore.h
similarity index 100%
rename from user/parlib/include/vcore.h
rename to user/parlib/include/parlib/vcore.h
diff --git a/user/parlib/include/waitfreelist.h
b/user/parlib/include/parlib/waitfreelist.h
similarity index 100%
rename from user/parlib/include/waitfreelist.h
rename to user/parlib/include/parlib/waitfreelist.h
diff --git a/user/parlib/include/x86/arch.h
b/user/parlib/include/parlib/x86/arch.h
similarity index 100%
rename from user/parlib/include/x86/arch.h
rename to user/parlib/include/parlib/x86/arch.h
diff --git a/user/parlib/include/x86/atomic.h
b/user/parlib/include/parlib/x86/atomic.h
similarity index 100%
rename from user/parlib/include/x86/atomic.h
rename to user/parlib/include/parlib/x86/atomic.h
diff --git a/user/parlib/include/x86/bitmask.h
b/user/parlib/include/parlib/x86/bitmask.h
similarity index 100%
rename from user/parlib/include/x86/bitmask.h
rename to user/parlib/include/parlib/x86/bitmask.h
diff --git a/user/parlib/include/x86/trap.h
b/user/parlib/include/parlib/x86/trap.h
similarity index 100%
rename from user/parlib/include/x86/trap.h
rename to user/parlib/include/parlib/x86/trap.h
diff --git a/user/parlib/include/x86/vcore.h
b/user/parlib/include/parlib/x86/vcore.h
similarity index 100%
rename from user/parlib/include/x86/vcore.h
rename to user/parlib/include/parlib/x86/vcore.h
diff --git a/user/parlib/include/x86/vcore32.h
b/user/parlib/include/parlib/x86/vcore32.h
similarity index 100%
rename from user/parlib/include/x86/vcore32.h
rename to user/parlib/include/parlib/x86/vcore32.h
diff --git a/user/parlib/include/x86/vcore64.h
b/user/parlib/include/parlib/x86/vcore64.h
similarity index 100%
rename from user/parlib/include/x86/vcore64.h
rename to user/parlib/include/parlib/x86/vcore64.h
diff --git a/user/vmm/include/vmm b/user/vmm/include/vmm
deleted file mode 120000
index 945c9b46d684..000000000000
--- a/user/vmm/include/vmm
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/user/vmm/include/acpi/acakaros.h
b/user/vmm/include/vmm/acpi/acakaros.h
similarity index 100%
rename from user/vmm/include/acpi/acakaros.h
rename to user/vmm/include/vmm/acpi/acakaros.h
diff --git a/user/vmm/include/acpi/platform/acakarosex.h
b/user/vmm/include/vmm/acpi/acakarosex.h
similarity index 100%
rename from user/vmm/include/acpi/platform/acakarosex.h
rename to user/vmm/include/vmm/acpi/acakarosex.h
diff --git a/user/vmm/include/acpi/acbuffer.h
b/user/vmm/include/vmm/acpi/acbuffer.h
similarity index 100%
rename from user/vmm/include/acpi/acbuffer.h
rename to user/vmm/include/vmm/acpi/acbuffer.h
diff --git a/user/vmm/include/acpi/acconfig.h
b/user/vmm/include/vmm/acpi/acconfig.h
similarity index 100%
rename from user/vmm/include/acpi/acconfig.h
rename to user/vmm/include/vmm/acpi/acconfig.h
diff --git a/user/vmm/include/acpi/acenv.h b/user/vmm/include/vmm/acpi/acenv.h
similarity index 100%
rename from user/vmm/include/acpi/acenv.h
rename to user/vmm/include/vmm/acpi/acenv.h
diff --git a/user/vmm/include/acpi/acenvex.h
b/user/vmm/include/vmm/acpi/acenvex.h
similarity index 100%
rename from user/vmm/include/acpi/acenvex.h
rename to user/vmm/include/vmm/acpi/acenvex.h
diff --git a/user/vmm/include/acpi/acexcep.h
b/user/vmm/include/vmm/acpi/acexcep.h
similarity index 100%
rename from user/vmm/include/acpi/acexcep.h
rename to user/vmm/include/vmm/acpi/acexcep.h
diff --git a/user/vmm/include/acpi/platform/acgcc.h
b/user/vmm/include/vmm/acpi/acgcc.h
similarity index 100%
rename from user/vmm/include/acpi/platform/acgcc.h
rename to user/vmm/include/vmm/acpi/acgcc.h
diff --git a/user/vmm/include/acpi/acnames.h
b/user/vmm/include/vmm/acpi/acnames.h
similarity index 100%
rename from user/vmm/include/acpi/acnames.h
rename to user/vmm/include/vmm/acpi/acnames.h
diff --git a/user/vmm/include/acpi/acoutput.h
b/user/vmm/include/vmm/acpi/acoutput.h
similarity index 100%
rename from user/vmm/include/acpi/acoutput.h
rename to user/vmm/include/vmm/acpi/acoutput.h
diff --git a/user/vmm/include/acpi/acpi.h b/user/vmm/include/vmm/acpi/acpi.h
similarity index 100%
rename from user/vmm/include/acpi/acpi.h
rename to user/vmm/include/vmm/acpi/acpi.h
diff --git a/user/vmm/include/acpi/acpi_bus.h
b/user/vmm/include/vmm/acpi/acpi_bus.h
similarity index 100%
rename from user/vmm/include/acpi/acpi_bus.h
rename to user/vmm/include/vmm/acpi/acpi_bus.h
diff --git a/user/vmm/include/acpi/acpi_drivers.h
b/user/vmm/include/vmm/acpi/acpi_drivers.h
similarity index 100%
rename from user/vmm/include/acpi/acpi_drivers.h
rename to user/vmm/include/vmm/acpi/acpi_drivers.h
diff --git a/user/vmm/include/acpi/acpi_io.h
b/user/vmm/include/vmm/acpi/acpi_io.h
similarity index 100%
rename from user/vmm/include/acpi/acpi_io.h
rename to user/vmm/include/vmm/acpi/acpi_io.h
diff --git a/user/vmm/include/acpi/acpi_lpat.h
b/user/vmm/include/vmm/acpi/acpi_lpat.h
similarity index 100%
rename from user/vmm/include/acpi/acpi_lpat.h
rename to user/vmm/include/vmm/acpi/acpi_lpat.h
diff --git a/user/vmm/include/acpi/acpi_numa.h
b/user/vmm/include/vmm/acpi/acpi_numa.h
similarity index 100%
rename from user/vmm/include/acpi/acpi_numa.h
rename to user/vmm/include/vmm/acpi/acpi_numa.h
diff --git a/user/vmm/include/acpi/acpiosxf.h
b/user/vmm/include/vmm/acpi/acpiosxf.h
similarity index 100%
rename from user/vmm/include/acpi/acpiosxf.h
rename to user/vmm/include/vmm/acpi/acpiosxf.h
diff --git a/user/vmm/include/acpi/acpixf.h b/user/vmm/include/vmm/acpi/acpixf.h
similarity index 100%
rename from user/vmm/include/acpi/acpixf.h
rename to user/vmm/include/vmm/acpi/acpixf.h
diff --git a/user/vmm/include/acpi/acrestyp.h
b/user/vmm/include/vmm/acpi/acrestyp.h
similarity index 100%
rename from user/vmm/include/acpi/acrestyp.h
rename to user/vmm/include/vmm/acpi/acrestyp.h
diff --git a/user/vmm/include/acpi/actbl.h b/user/vmm/include/vmm/acpi/actbl.h
similarity index 100%
rename from user/vmm/include/acpi/actbl.h
rename to user/vmm/include/vmm/acpi/actbl.h
diff --git a/user/vmm/include/acpi/actbl1.h b/user/vmm/include/vmm/acpi/actbl1.h
similarity index 100%
rename from user/vmm/include/acpi/actbl1.h
rename to user/vmm/include/vmm/acpi/actbl1.h
diff --git a/user/vmm/include/acpi/actbl2.h b/user/vmm/include/vmm/acpi/actbl2.h
similarity index 100%
rename from user/vmm/include/acpi/actbl2.h
rename to user/vmm/include/vmm/acpi/actbl2.h
diff --git a/user/vmm/include/acpi/actbl3.h b/user/vmm/include/vmm/acpi/actbl3.h
similarity index 100%
rename from user/vmm/include/acpi/actbl3.h
rename to user/vmm/include/vmm/acpi/actbl3.h
diff --git a/user/vmm/include/acpi/actypes.h
b/user/vmm/include/vmm/acpi/actypes.h
similarity index 100%
rename from user/vmm/include/acpi/actypes.h
rename to user/vmm/include/vmm/acpi/actypes.h
diff --git a/user/vmm/include/acpi/acuuid.h b/user/vmm/include/vmm/acpi/acuuid.h
similarity index 100%
rename from user/vmm/include/acpi/acuuid.h
rename to user/vmm/include/vmm/acpi/acuuid.h
diff --git a/user/vmm/include/acpi/apei.h b/user/vmm/include/vmm/acpi/apei.h
similarity index 100%
rename from user/vmm/include/acpi/apei.h
rename to user/vmm/include/vmm/acpi/apei.h
diff --git a/user/vmm/include/acpi/button.h b/user/vmm/include/vmm/acpi/button.h
similarity index 100%
rename from user/vmm/include/acpi/button.h
rename to user/vmm/include/vmm/acpi/button.h
diff --git a/user/vmm/include/acpi/ghes.h b/user/vmm/include/vmm/acpi/ghes.h
similarity index 100%
rename from user/vmm/include/acpi/ghes.h
rename to user/vmm/include/vmm/acpi/ghes.h
diff --git a/user/vmm/include/acpi/hed.h b/user/vmm/include/vmm/acpi/hed.h
similarity index 100%
rename from user/vmm/include/acpi/hed.h
rename to user/vmm/include/vmm/acpi/hed.h
diff --git a/user/vmm/include/acpi/pdc_intel.h
b/user/vmm/include/vmm/acpi/pdc_intel.h
similarity index 100%
rename from user/vmm/include/acpi/pdc_intel.h
rename to user/vmm/include/vmm/acpi/pdc_intel.h
diff --git a/user/vmm/include/acpi/platform/acakaros.h
b/user/vmm/include/vmm/acpi/platform/acakaros.h
similarity index 100%
rename from user/vmm/include/acpi/platform/acakaros.h
rename to user/vmm/include/vmm/acpi/platform/acakaros.h
diff --git a/user/vmm/include/acpi/acakarosex.h
b/user/vmm/include/vmm/acpi/platform/acakarosex.h
similarity index 100%
rename from user/vmm/include/acpi/acakarosex.h
rename to user/vmm/include/vmm/acpi/platform/acakarosex.h
diff --git a/user/vmm/include/acpi/platform/acenv.h
b/user/vmm/include/vmm/acpi/platform/acenv.h
similarity index 100%
rename from user/vmm/include/acpi/platform/acenv.h
rename to user/vmm/include/vmm/acpi/platform/acenv.h
diff --git a/user/vmm/include/acpi/platform/acenvex.h
b/user/vmm/include/vmm/acpi/platform/acenvex.h
similarity index 100%
rename from user/vmm/include/acpi/platform/acenvex.h
rename to user/vmm/include/vmm/acpi/platform/acenvex.h
diff --git a/user/vmm/include/acpi/acgcc.h
b/user/vmm/include/vmm/acpi/platform/acgcc.h
similarity index 100%
rename from user/vmm/include/acpi/acgcc.h
rename to user/vmm/include/vmm/acpi/platform/acgcc.h
diff --git a/user/vmm/include/acpi/processor.h
b/user/vmm/include/vmm/acpi/processor.h
similarity index 100%
rename from user/vmm/include/acpi/processor.h
rename to user/vmm/include/vmm/acpi/processor.h
diff --git a/user/vmm/include/acpi/reboot.h b/user/vmm/include/vmm/acpi/reboot.h
similarity index 100%
rename from user/vmm/include/acpi/reboot.h
rename to user/vmm/include/vmm/acpi/reboot.h
diff --git a/user/vmm/include/acpi/video.h b/user/vmm/include/vmm/acpi/video.h
similarity index 100%
rename from user/vmm/include/acpi/video.h
rename to user/vmm/include/vmm/acpi/video.h
diff --git a/user/vmm/include/coreboot_tables.h
b/user/vmm/include/vmm/coreboot_tables.h
similarity index 100%
rename from user/vmm/include/coreboot_tables.h
rename to user/vmm/include/vmm/coreboot_tables.h
diff --git a/user/vmm/include/linux_bootparam.h
b/user/vmm/include/vmm/linux_bootparam.h
similarity index 100%
rename from user/vmm/include/linux_bootparam.h
rename to user/vmm/include/vmm/linux_bootparam.h
diff --git a/user/vmm/include/virtio.h b/user/vmm/include/vmm/virtio.h
similarity index 100%
rename from user/vmm/include/virtio.h
rename to user/vmm/include/vmm/virtio.h
diff --git a/user/vmm/include/virtio_9p.h b/user/vmm/include/vmm/virtio_9p.h
similarity index 100%
rename from user/vmm/include/virtio_9p.h
rename to user/vmm/include/vmm/virtio_9p.h
diff --git a/user/vmm/include/virtio_balloon.h
b/user/vmm/include/vmm/virtio_balloon.h
similarity index 100%
rename from user/vmm/include/virtio_balloon.h
rename to user/vmm/include/vmm/virtio_balloon.h
diff --git a/user/vmm/include/virtio_blk.h b/user/vmm/include/vmm/virtio_blk.h
similarity index 100%
rename from user/vmm/include/virtio_blk.h
rename to user/vmm/include/vmm/virtio_blk.h
diff --git a/user/vmm/include/virtio_config.h
b/user/vmm/include/vmm/virtio_config.h
similarity index 100%
rename from user/vmm/include/virtio_config.h
rename to user/vmm/include/vmm/virtio_config.h
diff --git a/user/vmm/include/virtio_console.h
b/user/vmm/include/vmm/virtio_console.h
similarity index 100%
rename from user/vmm/include/virtio_console.h
rename to user/vmm/include/vmm/virtio_console.h
diff --git a/user/vmm/include/virtio_ids.h b/user/vmm/include/vmm/virtio_ids.h
similarity index 100%
rename from user/vmm/include/virtio_ids.h
rename to user/vmm/include/vmm/virtio_ids.h
diff --git a/user/vmm/include/virtio_input.h
b/user/vmm/include/vmm/virtio_input.h
similarity index 100%
rename from user/vmm/include/virtio_input.h
rename to user/vmm/include/vmm/virtio_input.h
diff --git a/user/vmm/include/virtio_mmio.h b/user/vmm/include/vmm/virtio_mmio.h
similarity index 100%
rename from user/vmm/include/virtio_mmio.h
rename to user/vmm/include/vmm/virtio_mmio.h
diff --git a/user/vmm/include/virtio_net.h b/user/vmm/include/vmm/virtio_net.h
similarity index 100%
rename from user/vmm/include/virtio_net.h
rename to user/vmm/include/vmm/virtio_net.h
diff --git a/user/vmm/include/virtio_pci.h b/user/vmm/include/vmm/virtio_pci.h
similarity index 100%
rename from user/vmm/include/virtio_pci.h
rename to user/vmm/include/vmm/virtio_pci.h
diff --git a/user/vmm/include/virtio_ring.h b/user/vmm/include/vmm/virtio_ring.h
similarity index 100%
rename from user/vmm/include/virtio_ring.h
rename to user/vmm/include/vmm/virtio_ring.h
diff --git a/user/vmm/include/virtio_rng.h b/user/vmm/include/vmm/virtio_rng.h
similarity index 100%
rename from user/vmm/include/virtio_rng.h
rename to user/vmm/include/vmm/virtio_rng.h
diff --git a/user/vmm/include/virtio_scsi.h b/user/vmm/include/vmm/virtio_scsi.h
similarity index 100%
rename from user/vmm/include/virtio_scsi.h
rename to user/vmm/include/vmm/virtio_scsi.h
diff --git a/user/vmm/include/virtio_types.h
b/user/vmm/include/vmm/virtio_types.h
similarity index 100%
rename from user/vmm/include/virtio_types.h
rename to user/vmm/include/vmm/virtio_types.h
diff --git a/user/vmm/include/vmm.h b/user/vmm/include/vmm/vmm.h
similarity index 100%
rename from user/vmm/include/vmm.h
rename to user/vmm/include/vmm/vmm.h
--
2.7.0.rc3.207.g0ac5344
--
You received this message because you are subscribed to the Google Groups
"Akaros" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
For more options, visit https://groups.google.com/d/optout.
