2010-08-26 22:22:58 +04:00
|
|
|
include $(top_srcdir)/config/Rules.am
|
|
|
|
|
|
|
|
|
|
DEFAULT_INCLUDES += \
|
2010-09-05 00:26:23 +04:00
|
|
|
-I$(top_srcdir)/include \
|
|
|
|
|
-I$(top_srcdir)/lib/libspl/include
|
2010-08-26 22:22:58 +04:00
|
|
|
|
|
|
|
|
sbin_PROGRAMS = zpool
|
|
|
|
|
|
|
|
|
|
zpool_SOURCES = \
|
2014-06-10 01:55:31 +04:00
|
|
|
zpool_iter.c \
|
|
|
|
|
zpool_main.c \
|
|
|
|
|
zpool_util.c \
|
|
|
|
|
zpool_util.h \
|
|
|
|
|
zpool_vdev.c
|
2010-08-26 22:22:58 +04:00
|
|
|
|
|
|
|
|
zpool_LDADD = \
|
|
|
|
|
$(top_builddir)/lib/libnvpair/libnvpair.la \
|
|
|
|
|
$(top_builddir)/lib/libuutil/libuutil.la \
|
|
|
|
|
$(top_builddir)/lib/libzpool/libzpool.la \
|
2013-11-17 14:47:50 +04:00
|
|
|
$(top_builddir)/lib/libzfs/libzfs.la \
|
Properly link zpool command to libblkid
31fc19399e597e3391f19f1392ab120f1de0d5f2 incorrectly removed $(LIBBLKID)
from cmd/zpool/Makefile.am. This meant that the toolchain was not given
-lblkid, which resulted in the following build failure on Ubuntu 13.10:
/usr/bin/ld: zpool_vdev.o: undefined reference to symbol
'blkid_put_cache@@BLKID_1.0'
/lib/x86_64-linux-gnu/libblkid.so.1: error adding symbols: DSO missing
from command line
collect2: error: ld returned 1 exit status
That commit reworked various Makefile.am to follow best practices, so we
reintroduce $(LIBBLKID) in a manner consistent with that, rather than
explicitly reverting the change.
Reproduction of this issue was done on a Gentoo Linux system by
executing the following commands:
zfs create -o mountpoint=/mnt/ubuntu-13.10 rpool/ROOT/ubuntu-13.10
debootstrap --variant=buildd --arch amd64 saucy /mnt/ubuntu-13.10 http://archive.ubuntu.com/ubuntu/
mount -o bind /dev /mnt/ubuntu-13.10/dev/
mount -o bind /proc/ /mnt/ubuntu-13.10/proc/
mount -o bind /sys/ /mnt/ubuntu-13.10/sys/
cp /etc/resolv.conf /mnt/ubuntu-13.10/etc/
(cd /mnt/ubuntu-13.10/root/ && git clone git://github.com/zfsonlinux/zfs.git)
chroot /mnt/ubuntu-13.10/
apt-get install git autoconf libtool zlib1g-dev uuid-dev libblkid-dev
\#apt-get install alien fakeroot vim
cd /root/zfs
./autogen.sh
./configure --with-config=user --prefix=/usr
make
That will create a Ubuntu 13.10 chroot, fetch the sources and build
test. At this point, cmd/zpool/Makefile.am was modified and the
following commands were run to verify that the build issue was resolved:
git clean -xdf
./autogen.sh
./configure --with-config=user --prefix=/usr
make
Although it is not shown here, the absence of libblkid-dev enables ZFS
to build successfully without the patch. This could explain how this
escaped detection until recently. A test without libblkid-dev was done
to verify that the patch did not cause a regression in the absence of
libblkid:
apt-get remove libblkid-dev
git clean -xdf
./autogen.sh
./configure --with-config=user --prefix=/usr
make
Additionally, the commands themselves were tested against my live system
from within the chroot to ensure basic functionality. My live system had
corresponding kernel modules already installed and basic commands such
as `zpool list` and `zfs list` worked without incident. Lastly, this
patch was also build tested on Gentoo Linux, where it caused no
problems.
At time of writing, these steps can be used to reproduce these results
on any modern Linux system that has debootstrap installed. On Gentoo,
installing debootstrap can be done with `emerge dev-util/debootstrap`.
The current ZFSOnLinux HEAD revision as of writing is
fd23720ae14dca926800ae70e6c8f4b4f82efc08. Once this is fixed in HEAD,
either that revision or another before this fix and after
31fc19399e597e3391f19f1392ab120f1de0d5f2 will be needed to reproduce
this issue.
Lastly, it remains to be seen why the toolchains on the systems
performing regression tests did not catch this. This is not a
ZFS-specific issue, but it is something that we will want to explore in
the future.
Signed-off-by: Richard Yao <ryao@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #2038
2014-01-12 01:07:27 +04:00
|
|
|
$(top_builddir)/lib/libzfs_core/libzfs_core.la \
|
2016-02-29 21:05:23 +03:00
|
|
|
-lm $(LIBBLKID)
|
2017-04-21 19:27:04 +03:00
|
|
|
|
|
|
|
|
zpoolconfdir = $(sysconfdir)/zfs/zpool.d
|
|
|
|
|
zpoolexecdir = $(libexecdir)/zfs/zpool.d
|
|
|
|
|
|
|
|
|
|
EXTRA_DIST = zpool.d/README
|
|
|
|
|
|
|
|
|
|
dist_zpoolexec_SCRIPTS = \
|
|
|
|
|
zpool.d/enc \
|
|
|
|
|
zpool.d/encdev \
|
|
|
|
|
zpool.d/fault_led \
|
|
|
|
|
zpool.d/iostat \
|
|
|
|
|
zpool.d/iostat-1s \
|
|
|
|
|
zpool.d/iostat-10s \
|
|
|
|
|
zpool.d/label \
|
|
|
|
|
zpool.d/locate_led \
|
|
|
|
|
zpool.d/lsblk \
|
|
|
|
|
zpool.d/model \
|
|
|
|
|
zpool.d/serial \
|
|
|
|
|
zpool.d/ses \
|
|
|
|
|
zpool.d/size \
|
|
|
|
|
zpool.d/slaves \
|
|
|
|
|
zpool.d/slot \
|
|
|
|
|
zpool.d/upath \
|
|
|
|
|
zpool.d/vendor
|
|
|
|
|
|
|
|
|
|
zpoolconfdefaults = \
|
|
|
|
|
enc \
|
|
|
|
|
encdev \
|
|
|
|
|
fault_led \
|
|
|
|
|
iostat \
|
|
|
|
|
iostat-1s \
|
|
|
|
|
iostat-10s \
|
|
|
|
|
label \
|
|
|
|
|
locate_led \
|
|
|
|
|
lsblk \
|
|
|
|
|
model \
|
|
|
|
|
serial \
|
|
|
|
|
ses \
|
|
|
|
|
size \
|
|
|
|
|
slaves \
|
|
|
|
|
slot \
|
|
|
|
|
upath \
|
|
|
|
|
vendor
|
|
|
|
|
|
|
|
|
|
install-data-hook:
|
|
|
|
|
$(MKDIR_P) "$(DESTDIR)$(zpoolconfdir)"
|
|
|
|
|
for f in $(zpoolconfdefaults); do \
|
|
|
|
|
test -f "$(DESTDIR)$(zpoolconfdir)/$${f}" -o \
|
|
|
|
|
-L "$(DESTDIR)$(zpoolconfdir)/$${f}" || \
|
|
|
|
|
ln -s "$(zpoolexecdir)/$${f}" "$(DESTDIR)$(zpoolconfdir)"; \
|
|
|
|
|
done
|