]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
Normalize the g(eom,cache,part,...) build.
authorbrooks <brooks@FreeBSD.org>
Mon, 25 Jun 2018 19:55:15 +0000 (19:55 +0000)
committerbrooks <brooks@FreeBSD.org>
Mon, 25 Jun 2018 19:55:15 +0000 (19:55 +0000)
commit9fa168b01a06a5e2a2fdb1c2ac3619b3a97e4fb4
tree2cb4088f70d2963a7584dc9069c3c90a27081d45
parent1d6e4247415d264485ee94b59fdbc12e0c566fd0
Normalize the g(eom,cache,part,...) build.

Rather then combining hardlink creation for the geom(8) binary with
shared library build, move libraries to src/lib/geom so they are
built and installed normally.  Create a common Makefile.classes
which is included by both lib/geom/Makefile and sbin/geom/Makefile
so the symlink and libraries stay in sync.

The relocation of libraries allows libraries to be build for 32-bit
compat.  This also reduces the number of non-standard builds in
the system.

This commit is not sufficent to run a 32-bit /sbin/geom on a 64-bit
system out of the box as it will look in the wrong place for libraries
unless GEOM_LIBRARY_PATH is set appropriatly in the environment.

Reviewed by: bdrewery
Sponsored by: DARPA, AFRL
Differential Revision: https://reviews.freebsd.org/D15360
77 files changed:
Makefile.inc1
etc/mtree/BSD.lib32.dist
lib/Makefile
lib/geom/Makefile [new file with mode: 0644]
lib/geom/Makefile.inc [moved from sbin/geom/class/Makefile.inc with 54% similarity]
lib/geom/cache/Makefile [moved from sbin/geom/class/cache/Makefile with 100% similarity]
lib/geom/cache/Makefile.depend [moved from sbin/geom/class/cache/Makefile.depend with 100% similarity]
lib/geom/cache/gcache.8 [moved from sbin/geom/class/cache/gcache.8 with 100% similarity]
lib/geom/cache/geom_cache.c [moved from sbin/geom/class/cache/geom_cache.c with 100% similarity]
lib/geom/concat/Makefile [moved from sbin/geom/class/concat/Makefile with 100% similarity]
lib/geom/concat/Makefile.depend [moved from sbin/geom/class/concat/Makefile.depend with 100% similarity]
lib/geom/concat/gconcat.8 [moved from sbin/geom/class/concat/gconcat.8 with 100% similarity]
lib/geom/concat/geom_concat.c [moved from sbin/geom/class/concat/geom_concat.c with 100% similarity]
lib/geom/eli/Makefile [moved from sbin/geom/class/eli/Makefile with 100% similarity]
lib/geom/eli/Makefile.depend [moved from sbin/geom/class/eli/Makefile.depend with 100% similarity]
lib/geom/eli/geli.8 [moved from sbin/geom/class/eli/geli.8 with 100% similarity]
lib/geom/eli/geom_eli.c [moved from sbin/geom/class/eli/geom_eli.c with 100% similarity]
lib/geom/journal/Makefile [moved from sbin/geom/class/journal/Makefile with 100% similarity]
lib/geom/journal/Makefile.depend [moved from sbin/geom/class/journal/Makefile.depend with 100% similarity]
lib/geom/journal/geom_journal.c [moved from sbin/geom/class/journal/geom_journal.c with 100% similarity]
lib/geom/journal/geom_journal.h [moved from sbin/geom/class/journal/geom_journal.h with 100% similarity]
lib/geom/journal/geom_journal_ufs.c [moved from sbin/geom/class/journal/geom_journal_ufs.c with 100% similarity]
lib/geom/journal/gjournal.8 [moved from sbin/geom/class/journal/gjournal.8 with 100% similarity]
lib/geom/label/Makefile [moved from sbin/geom/class/label/Makefile with 100% similarity]
lib/geom/label/Makefile.depend [moved from sbin/geom/class/label/Makefile.depend with 100% similarity]
lib/geom/label/geom_label.c [moved from sbin/geom/class/label/geom_label.c with 100% similarity]
lib/geom/label/glabel.8 [moved from sbin/geom/class/label/glabel.8 with 100% similarity]
lib/geom/mirror/Makefile [moved from sbin/geom/class/mirror/Makefile with 100% similarity]
lib/geom/mirror/Makefile.depend [moved from sbin/geom/class/mirror/Makefile.depend with 100% similarity]
lib/geom/mirror/geom_mirror.c [moved from sbin/geom/class/mirror/geom_mirror.c with 100% similarity]
lib/geom/mirror/gmirror.8 [moved from sbin/geom/class/mirror/gmirror.8 with 100% similarity]
lib/geom/mountver/Makefile [moved from sbin/geom/class/mountver/Makefile with 100% similarity]
lib/geom/mountver/Makefile.depend [moved from sbin/geom/class/mountver/Makefile.depend with 100% similarity]
lib/geom/mountver/geom_mountver.c [moved from sbin/geom/class/mountver/geom_mountver.c with 100% similarity]
lib/geom/mountver/gmountver.8 [moved from sbin/geom/class/mountver/gmountver.8 with 100% similarity]
lib/geom/multipath/Makefile [moved from sbin/geom/class/multipath/Makefile with 100% similarity]
lib/geom/multipath/Makefile.depend [moved from sbin/geom/class/multipath/Makefile.depend with 100% similarity]
lib/geom/multipath/geom_multipath.c [moved from sbin/geom/class/multipath/geom_multipath.c with 100% similarity]
lib/geom/multipath/gmultipath.8 [moved from sbin/geom/class/multipath/gmultipath.8 with 100% similarity]
lib/geom/nop/Makefile [moved from sbin/geom/class/nop/Makefile with 100% similarity]
lib/geom/nop/Makefile.depend [moved from sbin/geom/class/nop/Makefile.depend with 100% similarity]
lib/geom/nop/geom_nop.c [moved from sbin/geom/class/nop/geom_nop.c with 100% similarity]
lib/geom/nop/gnop.8 [moved from sbin/geom/class/nop/gnop.8 with 100% similarity]
lib/geom/part/Makefile [moved from sbin/geom/class/part/Makefile with 100% similarity]
lib/geom/part/Makefile.depend [moved from sbin/geom/class/part/Makefile.depend with 100% similarity]
lib/geom/part/geom_part.c [moved from sbin/geom/class/part/geom_part.c with 100% similarity]
lib/geom/part/gpart.8 [moved from sbin/geom/class/part/gpart.8 with 100% similarity]
lib/geom/raid/Makefile [moved from sbin/geom/class/raid/Makefile with 100% similarity]
lib/geom/raid/Makefile.depend [moved from sbin/geom/class/raid/Makefile.depend with 100% similarity]
lib/geom/raid/geom_raid.c [moved from sbin/geom/class/raid/geom_raid.c with 100% similarity]
lib/geom/raid/graid.8 [moved from sbin/geom/class/raid/graid.8 with 100% similarity]
lib/geom/raid3/Makefile [moved from sbin/geom/class/raid3/Makefile with 100% similarity]
lib/geom/raid3/Makefile.depend [moved from sbin/geom/class/raid3/Makefile.depend with 100% similarity]
lib/geom/raid3/geom_raid3.c [moved from sbin/geom/class/raid3/geom_raid3.c with 100% similarity]
lib/geom/raid3/graid3.8 [moved from sbin/geom/class/raid3/graid3.8 with 100% similarity]
lib/geom/sched/Makefile [moved from sbin/geom/class/sched/Makefile with 100% similarity]
lib/geom/sched/Makefile.depend [moved from sbin/geom/class/sched/Makefile.depend with 100% similarity]
lib/geom/sched/geom_sched.c [moved from sbin/geom/class/sched/geom_sched.c with 100% similarity]
lib/geom/sched/gsched.8 [moved from sbin/geom/class/sched/gsched.8 with 100% similarity]
lib/geom/shsec/Makefile [moved from sbin/geom/class/shsec/Makefile with 100% similarity]
lib/geom/shsec/Makefile.depend [moved from sbin/geom/class/shsec/Makefile.depend with 100% similarity]
lib/geom/shsec/geom_shsec.c [moved from sbin/geom/class/shsec/geom_shsec.c with 100% similarity]
lib/geom/shsec/gshsec.8 [moved from sbin/geom/class/shsec/gshsec.8 with 100% similarity]
lib/geom/stripe/Makefile [moved from sbin/geom/class/stripe/Makefile with 100% similarity]
lib/geom/stripe/Makefile.depend [moved from sbin/geom/class/stripe/Makefile.depend with 100% similarity]
lib/geom/stripe/geom_stripe.c [moved from sbin/geom/class/stripe/geom_stripe.c with 100% similarity]
lib/geom/stripe/gstripe.8 [moved from sbin/geom/class/stripe/gstripe.8 with 100% similarity]
lib/geom/virstor/Makefile [moved from sbin/geom/class/virstor/Makefile with 100% similarity]
lib/geom/virstor/Makefile.depend [moved from sbin/geom/class/virstor/Makefile.depend with 100% similarity]
lib/geom/virstor/geom_virstor.c [moved from sbin/geom/class/virstor/geom_virstor.c with 100% similarity]
lib/geom/virstor/gvirstor.8 [moved from sbin/geom/class/virstor/gvirstor.8 with 100% similarity]
sbin/geom/Makefile
sbin/geom/Makefile.inc [deleted file]
sbin/geom/class/Makefile [deleted file]
sbin/geom/core/Makefile [deleted file]
targets/pseudo/userland/Makefile.depend
targets/pseudo/userland/lib/Makefile.depend