diff options
author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2013-01-23 13:09:18 -0600 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2013-01-23 13:38:04 -0600 |
commit | bb679b31119f59a0c27609f606967b4ba326dae4 (patch) | |
tree | 0399d7023685910e5b697ea6aa7fc40fbcf957ec /cpukit/preinstall.am | |
parent | bsp/gen83xx: Disable caches in bsp_restart() (diff) | |
download | rtems-bb679b31119f59a0c27609f606967b4ba326dae4.tar.bz2 |
Move <memory.h> and <sys/uio.h> to non-networking directory
These two header files were installed from libnetworking even
when networking was disabled. This patch moves them to a
non-networking location and updates uio.h to match the FreeBSD 8.x
source being used for the USB stack and TCP/IP stack upgrade.
- cpukit/include/memory.h
Move from cpukit/libnetworking/memory.h. No changes
- cpukit/include/sys/uio.h
Move from cpukit/libnetworking/sys/uio.h. Replace with FreeBSD 8.x version.
- cpukit/include/sys/_iovec.h
New. FreeBSD 8.x file supporting <sys/uio.h>.
- cpukit/Makefile.am
Reflect movement of <memory.h> and <sys/uio.h>.
- cpukit/preinstall.am
Regenerate
- cpukit/libnetworking/nfs/bootp_subr.c
Eliminate use of uio_procp field no longer in FreeBSD structure. This
field was set and never read so eliminating the set has no impact.
Diffstat (limited to 'cpukit/preinstall.am')
-rw-r--r-- | cpukit/preinstall.am | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cpukit/preinstall.am b/cpukit/preinstall.am index 26b90ecc75..d1e1f87804 100644 --- a/cpukit/preinstall.am +++ b/cpukit/preinstall.am @@ -43,7 +43,7 @@ $(PROJECT_INCLUDE)/sys/$(dirstamp): @: > $(PROJECT_INCLUDE)/sys/$(dirstamp) PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sys/$(dirstamp) -$(PROJECT_INCLUDE)/memory.h: libnetworking/memory.h $(PROJECT_INCLUDE)/$(dirstamp) +$(PROJECT_INCLUDE)/memory.h: include/memory.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/memory.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/memory.h @@ -87,10 +87,14 @@ $(PROJECT_INCLUDE)/sys/utsname.h: libcsupport/include/sys/utsname.h $(PROJECT_IN $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/utsname.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/utsname.h -$(PROJECT_INCLUDE)/sys/uio.h: libnetworking/sys/uio.h $(PROJECT_INCLUDE)/sys/$(dirstamp) +$(PROJECT_INCLUDE)/sys/uio.h: include/sys/uio.h $(PROJECT_INCLUDE)/sys/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/uio.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/uio.h +$(PROJECT_INCLUDE)/sys/_iovec.h: include/sys/_iovec.h $(PROJECT_INCLUDE)/sys/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/_iovec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/_iovec.h + $(PROJECT_INCLUDE)/sys/priority.h: include/sys/priority.h $(PROJECT_INCLUDE)/sys/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/priority.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/priority.h |