Packaged for Dyson

4 files changed, 20 insertions, 16 deletions

diff --git a/debian/control b/debian/control
index d21e9981..a7d39b1f 100644
--- a/debian/control
+++ b/debian/control
@@ -81,7 +81,7 @@ Package: libblkid1
 Section: libs
 Priority: required
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Architecture: any
+Architecture: !illumos-amd64
 Description: block device id library
  The blkid library which allows system programs like fsck and
  mount to quickly and easily find block devices by filesystem UUID and
@@ -94,7 +94,7 @@ XC-Package-Type: udeb
 Section: debian-installer
 Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Architecture: any
+Architecture: !illumos-amd64
 Description: block device id library
  The blkid library which allows system programs like fsck and
  mount to quickly and easily find block devices by filesystem UUID and
@@ -108,7 +108,7 @@ Package: libblkid-dev
 Section: libdevel
 Priority: extra
 Depends: libc6-dev | libc-dev, libblkid1 (= ${binary:Version}), uuid-dev, ${shlibs:Depends}, ${misc:Depends}
-Architecture: any
+Architecture: !illumos-amd64
 Description: block device id library - headers and static libraries
  The blkid library which allows system programs like fsck and
  mount to quickly and easily find block devices by filesystem UUID and
diff --git a/debian/libuuid1.files b/debian/libuuid1.files
index c983c755..0761f3b8 100644
--- a/debian/libuuid1.files
+++ b/debian/libuuid1.files
@@ -1 +1 @@
-lib/libuuid*.so.*
+lib/*/libuuid*.so.*
diff --git a/debian/rules b/debian/rules
index e083ab35..668ecb2e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,9 +43,9 @@ endif
 ifeq ($(DEB_HOST_ARCH_OS),illumos)
 CPPFLAGS = "-DBYTE_ORDER=LITTLE_ENDIAN -DLITTLE_ENDIAN=1234 -D__sighandler_t=sighandler_t -Difr_hwaddr=ifr_addr -DNGROUPS=NGROUPS_MAX"
 # /bin is a symlink to /usr/bin:
-CONFOPTS += --bindir=/usr/bin
-CONFOPTS += --sbindir=/usr/sbin
-CONFOPTS += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
+CONFOPTS += --prefix=/usr
+CONFOPTS += --sbindir=\$${prefix}/sbin
+CONFOPTS += --libdir=/lib/$(DEB_HOST_MULTIARCH)
 # No /proc/partitions on Illumos/Solaris:
 CONFOPTS += --disable-libblkid
 CONFOPTS += --disable-mount
@@ -83,8 +83,10 @@ install: build
 	dh_installdirs
 	$(MAKE) install DESTDIR=`pwd`/debian/util-linux INSTALL_STRIP_FLAG=""
 	dh_installdocs -i -s
+ifneq ($(DEB_HOST_ARCH_OS),illumos)
 	install -m 644 login-utils/README.modems-with-agetty debian/util-linux/usr/share/doc/util-linux/README.modems-with-agetty
 	install -m 755 debian/util-linux.initramfs debian/util-linux/usr/share/initramfs-tools/hooks/utillinux
+endif
 	dh_installexamples -i -s
 	dh_installmenu -i -s
 	dh_installcron -i -s
@@ -96,8 +98,8 @@ install: build
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 	mv debian/util-linux/usr/sbin/*part* debian/util-linux/usr/bin
 	mv debian/util-linux/usr/bin/cytune debian/util-linux/usr/sbin
-endif
 	mv debian/util-linux/usr/bin/tailf debian/util-linux/bin
+endif
 	mv debian/util-linux/usr/bin/isosize debian/util-linux/sbin
 	mv debian/util-linux/usr/share/man/man8/linux32.8 debian/util-linux/usr/share/man/man1/linux32.1
 	mv debian/util-linux/usr/share/man/man8/linux64.8 debian/util-linux/usr/share/man/man1/linux64.1
@@ -136,6 +138,7 @@ endif
 	    install -m 644 debian/hwclock.rules debian/util-linux/lib/udev/rules.d/85-hwclock.rules; \
 	    install -m 755 debian/hwclock-set debian/util-linux/lib/udev/hwclock-set; \
 	fi
+ifneq ($(DEB_HOST_ARCH_OS),illumos)
 	# copy blkid library and symlink into udeb
 	ln debian/libblkid1/lib/libblkid.so.1.* debian/libblkid1-udeb/lib/
 	ln debian/libblkid1/lib/libblkid.so.1   debian/libblkid1-udeb/lib/
@@ -143,9 +146,10 @@ endif
 	# overwrite copyright
 	install -m 644 debian/libblkid.copyright debian/libblkid1/usr/share/doc/libblkid1/copyright
 	install -m 644 debian/libblkid.copyright debian/libblkid-dev/usr/share/doc/libblkid-dev/copyright
+endif
 	# copy uuid library and symlink into udeb
-	ln debian/libuuid1/lib/libuuid.so.1.* debian/libuuid1-udeb/lib/
-	ln debian/libuuid1/lib/libuuid.so.1   debian/libuuid1-udeb/lib/
+	ln debian/libuuid1/lib/$(DEB_HOST_MULTIARCH)/libuuid.so.1.* debian/libuuid1-udeb/lib/
+	ln debian/libuuid1/lib/$(DEB_HOST_MULTIARCH)/libuuid.so.1   debian/libuuid1-udeb/lib/
 	# overwrite copyright
 	install -m 644 debian/libuuid.copyright debian/libuuid1/usr/share/doc/libuuid1/copyright
 	install -m 644 debian/libuuid.copyright debian/uuid-dev/usr/share/doc/uuid-dev/copyright
@@ -154,8 +158,8 @@ endif
 	cd debian; if [ -f util-linux/sbin/fdisk ]; then \
 	    ln util-linux/sbin/*fdisk fdisk-udeb/usr/sbin/; \
 	    S=fdisk-udeb/usr/sbin/cfdisk; if [ -f $$S ]; then mv $$S cfdisk-udeb/usr/sbin/; fi; \
+		cd util-linux-locales && find usr/share/locale -type f | while read x; do ln $$x ../cfdisk-udeb/$$x; done \
 	fi
-	cd debian/util-linux-locales && find usr/share/locale -type f | while read x; do ln $$x ../cfdisk-udeb/$$x; done
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 	install -m 644 debian/mount.fstab debian/mount/usr/share/doc/mount/examples/fstab
 ifeq ($(arch),$(findstring $(arch),powerpc ppc64))
@@ -165,11 +169,11 @@ else
 	cd debian/util-linux && if [ -f sbin/hwclock ] ; then ln -sf hwclock.8.gz usr/share/man/man8/clock.8.gz; fi
 endif
 endif
-ifneq ($(DEB_HOST_ARCH_OS),hurd)
+ifeq (,$(findstring $(DEB_HOST_ARCH_OS),hurd illumos))
 	cd debian/util-linux/sbin ; ln agetty getty
 	cd debian/util-linux/usr/share/man/man8 ; ln agetty.8 getty.8
 endif
-ifneq ($(DEB_HOST_ARCH_OS),linux)
+ifeq (,$(findstring $(DEB_HOST_ARCH_OS),linux illumos))
 	cd debian/util-linux/sbin ; mv mkswap mkswap.linux
 	cd debian/util-linux/usr/share/man/man8 ; mv mkswap.8 mkswap.linux.8
 endif
diff --git a/debian/uuid-dev.files b/debian/uuid-dev.files
index 48ef580a..147adbbe 100644
--- a/debian/uuid-dev.files
+++ b/debian/uuid-dev.files
@@ -1,5 +1,5 @@
-usr/lib/libuuid.so
-usr/lib/libuuid.a
+usr/lib/*/libuuid.so
+usr/lib/*/libuuid.a
 usr/include/uuid
 usr/share/man/man3/uuid*
-usr/lib/pkgconfig/uuid.pc
+usr/lib/*/pkgconfig/uuid.pc