[Glibc-bsd-commits] r5759 - trunk/kfreebsd-kernel-headers/debian
stevenc-guest at alioth.debian.org
stevenc-guest at alioth.debian.org
Fri Aug 21 19:22:26 UTC 2015
Author: stevenc-guest
Date: 2015-08-21 19:22:26 +0000 (Fri, 21 Aug 2015)
New Revision: 5759
Modified:
trunk/kfreebsd-kernel-headers/debian/changelog
trunk/kfreebsd-kernel-headers/debian/compat
trunk/kfreebsd-kernel-headers/debian/control
trunk/kfreebsd-kernel-headers/debian/install
trunk/kfreebsd-kernel-headers/debian/links
trunk/kfreebsd-kernel-headers/debian/rules
Log:
Use multiarch triplet for install paths. reverse-deps may break.
This will allow to bootstrap other architectures more easily.
- Revert r5758, probably not needed now
- Raise debhelper compat level to 9
Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog 2015-08-20 22:52:42 UTC (rev 5758)
+++ trunk/kfreebsd-kernel-headers/debian/changelog 2015-08-21 19:22:26 UTC (rev 5759)
@@ -1,8 +1,7 @@
kfreebsd-kernel-headers (10.1~6) UNRELEASED; urgency=medium
- * Declare conflict against Linux libcap-dev, possible within a multi-
- arch environment:
- - sys/capability.h
+ * Use multiarch triplet for install paths.
+ * Raise debhelper compat level to 9
-- Steven Chamberlain <steven at pyro.eu.org> Thu, 20 Aug 2015 23:45:34 +0100
Modified: trunk/kfreebsd-kernel-headers/debian/compat
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/compat 2015-08-20 22:52:42 UTC (rev 5758)
+++ trunk/kfreebsd-kernel-headers/debian/compat 2015-08-21 19:22:26 UTC (rev 5759)
@@ -1 +1 @@
-7
+9
Modified: trunk/kfreebsd-kernel-headers/debian/control
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/control 2015-08-20 22:52:42 UTC (rev 5758)
+++ trunk/kfreebsd-kernel-headers/debian/control 2015-08-21 19:22:26 UTC (rev 5759)
@@ -20,7 +20,6 @@
Architecture: kfreebsd-any
Depends: ${misc:Depends}
Replaces: libc0.1-dev (<= 2.3.6.ds1-8)
-Conflicts: libcap-dev
Description: kFreeBSD headers for development
This package provides headers from the kernel of FreeBSD. These headers
are used by the installed headers for GNU glibc and other system libraries.
Modified: trunk/kfreebsd-kernel-headers/debian/install
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/install 2015-08-20 22:52:42 UTC (rev 5758)
+++ trunk/kfreebsd-kernel-headers/debian/install 2015-08-21 19:22:26 UTC (rev 5759)
@@ -1,355 +1,356 @@
-sys/bsm/*.h usr/include/bsm
-sys/cam/*.h usr/include/cam
-sys/cam/ata/*.h usr/include/cam/ata
-sys/cam/scsi/*.h usr/include/cam/scsi
-sys/contrib/altq/altq/*.h usr/include/altq
-sys/dev/acpica/*.h usr/include/dev/acpica
-sys/dev/an/*.h usr/include/dev/an
-sys/dev/bktr/ioctl_bt848.h usr/include/dev/bktr
-sys/dev/bktr/ioctl_meteor.h usr/include/dev/bktr
-sys/dev/firewire/*.h usr/include/dev/firewire
-sys/dev/hwpmc/*.h usr/include/dev/hwpmc
-sys/dev/ic/*.h usr/include/dev/ic
-sys/dev/ieee488/*.h usr/include/dev/ieee488
-sys/dev/iicbus/*.h usr/include/dev/iicbus
-sys/dev/lmc/*.h usr/include/dev/lmc
-sys/dev/mpt/mpilib/*.h usr/include/dev/mpt/mpilib
-sys/dev/ofw/*.h usr/include/dev/ofw
-sys/dev/pbio/*.h usr/include/dev/pbio
+#! /usr/bin/dh-exec
+sys/bsm/*.h usr/include/${DEB_HOST_MULTIARCH}/bsm
+sys/cam/*.h usr/include/${DEB_HOST_MULTIARCH}/cam
+sys/cam/ata/*.h usr/include/${DEB_HOST_MULTIARCH}/cam/ata
+sys/cam/scsi/*.h usr/include/${DEB_HOST_MULTIARCH}/cam/scsi
+sys/contrib/altq/altq/*.h usr/include/${DEB_HOST_MULTIARCH}/altq
+sys/dev/acpica/*.h usr/include/${DEB_HOST_MULTIARCH}/dev/acpica
+sys/dev/an/*.h usr/include/${DEB_HOST_MULTIARCH}/dev/an
+sys/dev/bktr/ioctl_bt848.h usr/include/${DEB_HOST_MULTIARCH}/dev/bktr
+sys/dev/bktr/ioctl_meteor.h usr/include/${DEB_HOST_MULTIARCH}/dev/bktr
+sys/dev/firewire/*.h usr/include/${DEB_HOST_MULTIARCH}/dev/firewire
+sys/dev/hwpmc/*.h usr/include/${DEB_HOST_MULTIARCH}/dev/hwpmc
+sys/dev/ic/*.h usr/include/${DEB_HOST_MULTIARCH}/dev/ic
+sys/dev/ieee488/*.h usr/include/${DEB_HOST_MULTIARCH}/dev/ieee488
+sys/dev/iicbus/*.h usr/include/${DEB_HOST_MULTIARCH}/dev/iicbus
+sys/dev/lmc/*.h usr/include/${DEB_HOST_MULTIARCH}/dev/lmc
+sys/dev/mpt/mpilib/*.h usr/include/${DEB_HOST_MULTIARCH}/dev/mpt/mpilib
+sys/dev/ofw/*.h usr/include/${DEB_HOST_MULTIARCH}/dev/ofw
+sys/dev/pbio/*.h usr/include/${DEB_HOST_MULTIARCH}/dev/pbio
# pcireg.h is needed by oss4
-sys/dev/pci/*.h usr/include/dev/pci
-sys/dev/powermac_nvram/*.h usr/include/dev/powermac_nvram
-sys/dev/ppbus/*.h usr/include/dev/ppbus
-sys/dev/smbus/*.h usr/include/dev/smbus
-sys/dev/speaker/*.h usr/include/dev/speaker
-sys/dev/usb/*.h usr/include/dev/usb
-sys/dev/utopia/*.h usr/include/dev/utopia
-sys/dev/vkbd/*.h usr/include/dev/vkbd
-sys/dev/wi/*.h usr/include/dev/wi
-sys/fs/cd9660/*.h usr/include/fs/cd9660
-sys/fs/devfs/*.h usr/include/fs/devfs
-sys/fs/fdescfs/*.h usr/include/fs/fdescfs
-sys/fs/msdosfs/*.h usr/include/fs/msdosfs
-sys/fs/nfs/*.h usr/include/fs/nfs
-sys/fs/nullfs/*.h usr/include/fs/nullfs
-sys/fs/procfs/*.h usr/include/fs/procfs
-sys/fs/pseudofs/*.h usr/include/fs/pseudofs
-sys/fs/smbfs/*.h usr/include/fs/smbfs
-sys/fs/tmpfs/*.h usr/include/fs/tmpfs
-sys/fs/udf/*.h usr/include/fs/udf
-sys/fs/unionfs/*.h usr/include/fs/unionfs
-sys/geom/*.h usr/include/geom
-sys/geom/bde/*.h usr/include/geom/bde
-sys/geom/cache/*.h usr/include/geom/cache
-sys/geom/concat/*.h usr/include/geom/concat
-sys/geom/eli/*.h usr/include/geom/eli
-sys/geom/gate/*.h usr/include/geom/gate
-sys/geom/journal/*.h usr/include/geom/journal
-sys/geom/label/*.h usr/include/geom/label
-sys/geom/linux_lvm/*.h usr/include/geom/linux_lvm
-sys/geom/mirror/*.h usr/include/geom/mirror
-sys/geom/mountver/*.h usr/include/geom/mountver
-sys/geom/multipath/*.h usr/include/geom/multipath
-sys/geom/nop/*.h usr/include/geom/nop
-sys/geom/part/*.h usr/include/geom/part
-sys/geom/raid/*.h usr/include/geom/raid
-sys/geom/raid3/*.h usr/include/geom/raid3
-sys/geom/shsec/*.h usr/include/geom/shsec
-sys/geom/stripe/*.h usr/include/geom/stripe
-sys/geom/vinum/*.h usr/include/geom/vinum
-sys/geom/virstor/*.h usr/include/geom/virstor
-sys/net/bpf.h usr/include/net
-sys/net/bpfdesc.h usr/include/net
-sys/net/bridgestp.h usr/include/net
-sys/net/flowtable.h usr/include/net
-sys/net/if.h usr/include/sys/kglue/net
-sys/net/if_arc.h usr/include/net
-sys/net/if_arp.h usr/include/net
-sys/net/if_atm.h usr/include/net
-sys/net/if_bridgevar.h usr/include/net
-sys/net/if_dl.h usr/include/net
-sys/net/if_gif.h usr/include/net
-sys/net/if_gre.h usr/include/net
-sys/net/if_lagg.h usr/include/net
-sys/net/if_llc.h usr/include/net
-sys/net/if_media.h usr/include/net
-sys/net/if_mib.h usr/include/net
-sys/net/if_pflog.h usr/include/net
-sys/net/if_pfsync.h usr/include/net
-sys/net/if_sppp.h usr/include/net
-sys/net/if_stf.h usr/include/net
-sys/net/if_tap.h usr/include/net
-sys/net/if_tapvar.h usr/include/net
-sys/net/if_tun.h usr/include/net
-sys/net/if_types.h usr/include/net
-sys/net/if_var.h usr/include/net
-sys/net/if_vlan_var.h usr/include/net
-sys/net/iso88025.h usr/include/net
-sys/net/netisr.h usr/include/net
-sys/net/netisr_internal.h usr/include/net
-sys/net/ppp_defs.h usr/include/net
-sys/net/pfkeyv2.h usr/include/net
-sys/net/pfvar.h usr/include/net
-sys/netpfil/pf/pf_altq.h usr/include/netpfil/pf
-sys/netpfil/pf/pf_mtag.h usr/include/netpfil/pf
-sys/netpfil/pf/pf.h usr/include/netpfil/pf
-sys/net/radix.h usr/include/net
-sys/net/raw_cb.h usr/include/net
-sys/net/route.h usr/include/net
-sys/net/slcompress.h usr/include/net
-sys/net/vnet.h usr/include/net
-sys/net/zlib.h usr/include/net
-sys/net80211/*.h usr/include/net80211
-sys/netatalk/aarp.h usr/include/netatalk
-sys/netatalk/at.h usr/include/netatalk
-sys/netatalk/at_extern.h usr/include/netatalk
-sys/netatalk/at_var.h usr/include/netatalk
-sys/netatalk/ddp.h usr/include/netatalk
-sys/netatalk/ddp_var.h usr/include/netatalk
-sys/netatalk/endian.h usr/include/netatalk
-sys/netatalk/phase2.h usr/include/netatalk
-sys/netgraph/*.h usr/include/netgraph
-sys/netgraph/atm/*.h usr/include/netgraph/atm
-sys/netgraph/atm/ccatm/*.h usr/include/netgraph/atm/ccatm
-sys/netgraph/atm/sscfu/*.h usr/include/netgraph/atm/sscfu
-sys/netgraph/atm/sscop/*.h usr/include/netgraph/atm/sscop
-sys/netgraph/atm/uni/*.h usr/include/netgraph/atm/uni
-sys/netgraph/bluetooth/drivers/bt3c/*.h usr/include/netgraph/bluetooth/drivers/bt3c
-sys/netgraph/bluetooth/drivers/h4/*.h usr/include/netgraph/bluetooth/drivers/h4
-sys/netgraph/bluetooth/drivers/ubt/*.h usr/include/netgraph/bluetooth/drivers/ubt
-sys/netgraph/bluetooth/hci/*.h usr/include/netgraph/bluetooth/hci
-sys/netgraph/bluetooth/include/*.h usr/include/netgraph/bluetooth/include
-sys/netgraph/bluetooth/l2cap/*.h usr/include/netgraph/bluetooth/l2cap
-sys/netgraph/netflow/*.h usr/include/netgraph/netflow
-sys/netinet/icmp_var.h usr/include/netinet
-sys/netinet/if_atm.h usr/include/netinet
-sys/netinet/if_ether.h usr/include/sys/kglue/netinet
-sys/netinet/igmp_var.h usr/include/netinet
-sys/netinet/in_gif.h usr/include/netinet
-sys/netinet/in_pcb.h usr/include/netinet
-sys/netinet/in_var.h usr/include/netinet
-sys/netinet/ip_carp.h usr/include/netinet
-sys/netinet/ip_dummynet.h usr/include/netinet
-sys/netinet/ip_ecn.h usr/include/netinet
-sys/netinet/ip_encap.h usr/include/netinet
-sys/netinet/ip_fw.h usr/include/netinet
-sys/netinet/ip_mroute.h usr/include/netinet
-sys/netinet/ip_var.h usr/include/netinet
-sys/netinet/pim.h usr/include/netinet
-sys/netinet/pim_var.h usr/include/netinet
-sys/netinet/sctp*.h usr/include/netinet
-sys/netinet/tcp_debug.h usr/include/netinet
-sys/netinet/tcp_fsm.h usr/include/netinet
-sys/netinet/tcp_seq.h usr/include/netinet
-sys/netinet/tcp_timer.h usr/include/netinet
-sys/netinet/tcp_var.h usr/include/netinet
-sys/netinet/tcpip.h usr/include/netinet
-sys/netinet/udp_var.h usr/include/netinet
-sys/netinet6/in6_gif.h usr/include/netinet6
-sys/netinet6/in6_pcb.h usr/include/netinet6
-sys/netinet6/in6_var.h usr/include/netinet6
-sys/netinet6/ip6_mroute.h usr/include/netinet6
-sys/netinet6/ip6_var.h usr/include/netinet6
-sys/netinet6/ip6protosw.h usr/include/netinet6
-sys/netinet6/nd6.h usr/include/netinet6
-sys/netinet6/pim6.h usr/include/netinet6
-sys/netinet6/pim6_var.h usr/include/netinet6
-sys/netinet6/raw_ip6.h usr/include/netinet6
-sys/netipsec/*.h usr/include/netipsec
-sys/netipx/ipx.h usr/include/netipx
-sys/netipx/ipx_if.h usr/include/netipx
-sys/netipx/ipx_pcb.h usr/include/netipx
-sys/netipx/ipx_var.h usr/include/netipx
-sys/netipx/spx.h usr/include/netipx
-sys/netipx/spx_debug.h usr/include/netipx
-sys/netipx/spx_timer.h usr/include/netipx
-sys/netipx/spx_var.h usr/include/netipx
-sys/netsmb/*.h usr/include/netsmb
-sys/nfs/*.h usr/include/nfs
-sys/nfsserver/*.h usr/include/nfsserver
-sys/nfsclient/*.h usr/include/nfsclient
-sys/opencrypto/*.h usr/include/opencrypto
-sys/sys/_bitset.h usr/include/sys
-sys/sys/_bus_dma.h usr/include/sys
-sys/sys/_callout.h usr/include/sys
-sys/sys/_cpuset.h usr/include/sys
-sys/sys/_iovec.h usr/include/sys
-sys/sys/_lock.h usr/include/sys
-sys/sys/_lockmgr.h usr/include/sys
-sys/sys/_mutex.h usr/include/sys
-sys/sys/_null.h usr/include/sys
-sys/sys/_pctrie.h usr/include/sys
-sys/sys/_rmlock.h usr/include/sys
-sys/sys/_rwlock.h usr/include/sys
-sys/sys/_semaphore.h usr/include/sys
-sys/sys/_sigset.h usr/include/sys
-sys/sys/_sx.h usr/include/sys
-sys/sys/_stdint.h usr/include/sys
-sys/sys/_task.h usr/include/sys
-sys/sys/_termios.h usr/include/sys
-sys/sys/_timeval.h usr/include/sys
-sys/sys/_types.h usr/include/sys
-sys/sys/acct.h usr/include/sys
-sys/sys/agpio.h usr/include/sys
-sys/sys/assym.h usr/include/sys
-sys/sys/ata.h usr/include/sys
-sys/sys/bio.h usr/include/sys
-sys/sys/bitset.h usr/include/sys
-sys/sys/bitstring.h usr/include/sys
-sys/sys/blist.h usr/include/sys
-sys/sys/buf.h usr/include/sys
-sys/sys/bufobj.h usr/include/sys
-sys/sys/bus.h usr/include/sys
-sys/sys/bus_dma.h usr/include/sys
-sys/sys/callout.h usr/include/sys
-sys/sys/capability.h usr/include/sys
-sys/sys/caprights.h usr/include/sys
-sys/sys/cdio.h usr/include/sys
-sys/sys/cdrio.h usr/include/sys
-sys/sys/chio.h usr/include/sys
-sys/sys/condvar.h usr/include/sys
-sys/sys/conf.h usr/include/sys
-sys/sys/cons.h usr/include/sys
-sys/sys/consio.h usr/include/sys
-sys/sys/counter.h usr/include/sys
-sys/sys/copyright.h usr/include/sys
-sys/sys/cpuset.h usr/include/sys
-sys/sys/ctype.h usr/include/sys
-sys/sys/dataacq.h usr/include/sys
-sys/sys/devicestat.h usr/include/sys
-sys/sys/disk.h usr/include/sys
-sys/sys/diskmbr.h usr/include/sys
-sys/sys/disklabel.h usr/include/sys
-sys/sys/dkstat.h usr/include/sys
-sys/sys/domain.h usr/include/sys
-sys/sys/dvdio.h usr/include/sys
-sys/sys/elf.h usr/include/sys
-sys/sys/elf32.h usr/include/sys
-sys/sys/elf64.h usr/include/sys
-sys/sys/elf_common.h usr/include/sys
-sys/sys/elf_generic.h usr/include/sys
-sys/sys/endian.h usr/include/sys
-sys/sys/event.h usr/include/sys
-sys/sys/eventhandler.h usr/include/sys
-sys/sys/exec.h usr/include/sys
-sys/sys/extattr.h usr/include/sys
-sys/sys/fbio.h usr/include/sys
-sys/sys/file.h usr/include/sys/kglue/sys
-sys/sys/filedesc.h usr/include/sys
-sys/sys/filio.h usr/include/sys
-sys/sys/fnv_hash.h usr/include/sys
-sys/sys/iconv.h usr/include/sys
-sys/sys/imgact.h usr/include/sys
-sys/sys/imgact_aout.h usr/include/sys
-sys/sys/imgact_elf.h usr/include/sys
-sys/sys/inflate.h usr/include/sys
-sys/sys/interrupt.h usr/include/sys
-sys/sys/ioccom.h usr/include/sys
-sys/sys/ioctl_compat.h usr/include/sys
-sys/sys/jail.h usr/include/sys
-sys/sys/joystick.h usr/include/sys
-sys/sys/kbio.h usr/include/sys
-sys/sys/kenv.h usr/include/sys
-sys/sys/kernel.h usr/include/sys
-sys/sys/kerneldump.h usr/include/sys
-sys/sys/kobj.h usr/include/sys
-sys/sys/kthread.h usr/include/sys
-sys/sys/ktr.h usr/include/sys
-sys/sys/ktrace.h usr/include/sys
-sys/sys/libkern.h usr/include/sys
-sys/sys/limits.h usr/include/sys
-sys/sys/linker.h usr/include/sys
-sys/sys/linker_set.h usr/include/sys
-sys/sys/lock.h usr/include/sys
-sys/sys/lock_profile.h usr/include/sys
-sys/sys/lockf.h usr/include/sys
-sys/sys/lockmgr.h usr/include/sys
-sys/sys/mac.h usr/include/sys
-sys/sys/malloc.h usr/include/sys
-sys/sys/mbuf.h usr/include/sys
-sys/sys/mchain.h usr/include/sys
-sys/sys/md4.h usr/include/sys
-sys/sys/md5.h usr/include/sys
-sys/sys/mdioctl.h usr/include/sys
-sys/sys/memrange.h usr/include/sys
-sys/sys/module.h usr/include/sys
-sys/sys/mouse.h usr/include/sys
-sys/sys/msgbuf.h usr/include/sys
-sys/sys/mutex.h usr/include/sys
-sys/sys/namei.h usr/include/sys
-sys/sys/nlist_aout.h usr/include/sys
-sys/sys/osd.h usr/include/sys
-sys/sys/param.h usr/include/sys/kglue/sys
-sys/sys/pciio.h usr/include/sys
-sys/sys/pcpu.h usr/include/sys
-sys/sys/pioctl.h usr/include/sys
-sys/sys/posix4.h usr/include/sys
-sys/sys/priority.h usr/include/sys
-sys/sys/proc.h usr/include/sys
-sys/sys/procctl.h usr/include/sys
-sys/sys/procfs.h usr/include/sys
-sys/sys/protosw.h usr/include/sys
-sys/sys/ptio.h usr/include/sys
-sys/sys/queue.h usr/include/sys/kglue/sys
-sys/sys/rangelock.h usr/include/sys
-sys/sys/random.h usr/include/sys
-sys/sys/refcount.h usr/include/sys
-sys/sys/resourcevar.h usr/include/sys
-sys/sys/rman.h usr/include/sys
-sys/sys/rtprio.h usr/include/sys
-sys/sys/runq.h usr/include/sys
+sys/dev/pci/*.h usr/include/${DEB_HOST_MULTIARCH}/dev/pci
+sys/dev/powermac_nvram/*.h usr/include/${DEB_HOST_MULTIARCH}/dev/powermac_nvram
+sys/dev/ppbus/*.h usr/include/${DEB_HOST_MULTIARCH}/dev/ppbus
+sys/dev/smbus/*.h usr/include/${DEB_HOST_MULTIARCH}/dev/smbus
+sys/dev/speaker/*.h usr/include/${DEB_HOST_MULTIARCH}/dev/speaker
+sys/dev/usb/*.h usr/include/${DEB_HOST_MULTIARCH}/dev/usb
+sys/dev/utopia/*.h usr/include/${DEB_HOST_MULTIARCH}/dev/utopia
+sys/dev/vkbd/*.h usr/include/${DEB_HOST_MULTIARCH}/dev/vkbd
+sys/dev/wi/*.h usr/include/${DEB_HOST_MULTIARCH}/dev/wi
+sys/fs/cd9660/*.h usr/include/${DEB_HOST_MULTIARCH}/fs/cd9660
+sys/fs/devfs/*.h usr/include/${DEB_HOST_MULTIARCH}/fs/devfs
+sys/fs/fdescfs/*.h usr/include/${DEB_HOST_MULTIARCH}/fs/fdescfs
+sys/fs/msdosfs/*.h usr/include/${DEB_HOST_MULTIARCH}/fs/msdosfs
+sys/fs/nfs/*.h usr/include/${DEB_HOST_MULTIARCH}/fs/nfs
+sys/fs/nullfs/*.h usr/include/${DEB_HOST_MULTIARCH}/fs/nullfs
+sys/fs/procfs/*.h usr/include/${DEB_HOST_MULTIARCH}/fs/procfs
+sys/fs/pseudofs/*.h usr/include/${DEB_HOST_MULTIARCH}/fs/pseudofs
+sys/fs/smbfs/*.h usr/include/${DEB_HOST_MULTIARCH}/fs/smbfs
+sys/fs/tmpfs/*.h usr/include/${DEB_HOST_MULTIARCH}/fs/tmpfs
+sys/fs/udf/*.h usr/include/${DEB_HOST_MULTIARCH}/fs/udf
+sys/fs/unionfs/*.h usr/include/${DEB_HOST_MULTIARCH}/fs/unionfs
+sys/geom/*.h usr/include/${DEB_HOST_MULTIARCH}/geom
+sys/geom/bde/*.h usr/include/${DEB_HOST_MULTIARCH}/geom/bde
+sys/geom/cache/*.h usr/include/${DEB_HOST_MULTIARCH}/geom/cache
+sys/geom/concat/*.h usr/include/${DEB_HOST_MULTIARCH}/geom/concat
+sys/geom/eli/*.h usr/include/${DEB_HOST_MULTIARCH}/geom/eli
+sys/geom/gate/*.h usr/include/${DEB_HOST_MULTIARCH}/geom/gate
+sys/geom/journal/*.h usr/include/${DEB_HOST_MULTIARCH}/geom/journal
+sys/geom/label/*.h usr/include/${DEB_HOST_MULTIARCH}/geom/label
+sys/geom/linux_lvm/*.h usr/include/${DEB_HOST_MULTIARCH}/geom/linux_lvm
+sys/geom/mirror/*.h usr/include/${DEB_HOST_MULTIARCH}/geom/mirror
+sys/geom/mountver/*.h usr/include/${DEB_HOST_MULTIARCH}/geom/mountver
+sys/geom/multipath/*.h usr/include/${DEB_HOST_MULTIARCH}/geom/multipath
+sys/geom/nop/*.h usr/include/${DEB_HOST_MULTIARCH}/geom/nop
+sys/geom/part/*.h usr/include/${DEB_HOST_MULTIARCH}/geom/part
+sys/geom/raid/*.h usr/include/${DEB_HOST_MULTIARCH}/geom/raid
+sys/geom/raid3/*.h usr/include/${DEB_HOST_MULTIARCH}/geom/raid3
+sys/geom/shsec/*.h usr/include/${DEB_HOST_MULTIARCH}/geom/shsec
+sys/geom/stripe/*.h usr/include/${DEB_HOST_MULTIARCH}/geom/stripe
+sys/geom/vinum/*.h usr/include/${DEB_HOST_MULTIARCH}/geom/vinum
+sys/geom/virstor/*.h usr/include/${DEB_HOST_MULTIARCH}/geom/virstor
+sys/net/bpf.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/bpfdesc.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/bridgestp.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/flowtable.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/if.h usr/include/${DEB_HOST_MULTIARCH}/sys/kglue/net
+sys/net/if_arc.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/if_arp.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/if_atm.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/if_bridgevar.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/if_dl.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/if_gif.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/if_gre.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/if_lagg.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/if_llc.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/if_media.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/if_mib.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/if_pflog.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/if_pfsync.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/if_sppp.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/if_stf.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/if_tap.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/if_tapvar.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/if_tun.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/if_types.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/if_var.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/if_vlan_var.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/iso88025.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/netisr.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/netisr_internal.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/ppp_defs.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/pfkeyv2.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/pfvar.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/netpfil/pf/pf_altq.h usr/include/${DEB_HOST_MULTIARCH}/netpfil/pf
+sys/netpfil/pf/pf_mtag.h usr/include/${DEB_HOST_MULTIARCH}/netpfil/pf
+sys/netpfil/pf/pf.h usr/include/${DEB_HOST_MULTIARCH}/netpfil/pf
+sys/net/radix.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/raw_cb.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/route.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/slcompress.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/vnet.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net/zlib.h usr/include/${DEB_HOST_MULTIARCH}/net
+sys/net80211/*.h usr/include/${DEB_HOST_MULTIARCH}/net80211
+sys/netatalk/aarp.h usr/include/${DEB_HOST_MULTIARCH}/netatalk
+sys/netatalk/at.h usr/include/${DEB_HOST_MULTIARCH}/netatalk
+sys/netatalk/at_extern.h usr/include/${DEB_HOST_MULTIARCH}/netatalk
+sys/netatalk/at_var.h usr/include/${DEB_HOST_MULTIARCH}/netatalk
+sys/netatalk/ddp.h usr/include/${DEB_HOST_MULTIARCH}/netatalk
+sys/netatalk/ddp_var.h usr/include/${DEB_HOST_MULTIARCH}/netatalk
+sys/netatalk/endian.h usr/include/${DEB_HOST_MULTIARCH}/netatalk
+sys/netatalk/phase2.h usr/include/${DEB_HOST_MULTIARCH}/netatalk
+sys/netgraph/*.h usr/include/${DEB_HOST_MULTIARCH}/netgraph
+sys/netgraph/atm/*.h usr/include/${DEB_HOST_MULTIARCH}/netgraph/atm
+sys/netgraph/atm/ccatm/*.h usr/include/${DEB_HOST_MULTIARCH}/netgraph/atm/ccatm
+sys/netgraph/atm/sscfu/*.h usr/include/${DEB_HOST_MULTIARCH}/netgraph/atm/sscfu
+sys/netgraph/atm/sscop/*.h usr/include/${DEB_HOST_MULTIARCH}/netgraph/atm/sscop
+sys/netgraph/atm/uni/*.h usr/include/${DEB_HOST_MULTIARCH}/netgraph/atm/uni
+sys/netgraph/bluetooth/drivers/bt3c/*.h usr/include/${DEB_HOST_MULTIARCH}/netgraph/bluetooth/drivers/bt3c
+sys/netgraph/bluetooth/drivers/h4/*.h usr/include/${DEB_HOST_MULTIARCH}/netgraph/bluetooth/drivers/h4
+sys/netgraph/bluetooth/drivers/ubt/*.h usr/include/${DEB_HOST_MULTIARCH}/netgraph/bluetooth/drivers/ubt
+sys/netgraph/bluetooth/hci/*.h usr/include/${DEB_HOST_MULTIARCH}/netgraph/bluetooth/hci
+sys/netgraph/bluetooth/include/*.h usr/include/${DEB_HOST_MULTIARCH}/netgraph/bluetooth/include
+sys/netgraph/bluetooth/l2cap/*.h usr/include/${DEB_HOST_MULTIARCH}/netgraph/bluetooth/l2cap
+sys/netgraph/netflow/*.h usr/include/${DEB_HOST_MULTIARCH}/netgraph/netflow
+sys/netinet/icmp_var.h usr/include/${DEB_HOST_MULTIARCH}/netinet
+sys/netinet/if_atm.h usr/include/${DEB_HOST_MULTIARCH}/netinet
+sys/netinet/if_ether.h usr/include/${DEB_HOST_MULTIARCH}/sys/kglue/netinet
+sys/netinet/igmp_var.h usr/include/${DEB_HOST_MULTIARCH}/netinet
+sys/netinet/in_gif.h usr/include/${DEB_HOST_MULTIARCH}/netinet
+sys/netinet/in_pcb.h usr/include/${DEB_HOST_MULTIARCH}/netinet
+sys/netinet/in_var.h usr/include/${DEB_HOST_MULTIARCH}/netinet
+sys/netinet/ip_carp.h usr/include/${DEB_HOST_MULTIARCH}/netinet
+sys/netinet/ip_dummynet.h usr/include/${DEB_HOST_MULTIARCH}/netinet
+sys/netinet/ip_ecn.h usr/include/${DEB_HOST_MULTIARCH}/netinet
+sys/netinet/ip_encap.h usr/include/${DEB_HOST_MULTIARCH}/netinet
+sys/netinet/ip_fw.h usr/include/${DEB_HOST_MULTIARCH}/netinet
+sys/netinet/ip_mroute.h usr/include/${DEB_HOST_MULTIARCH}/netinet
+sys/netinet/ip_var.h usr/include/${DEB_HOST_MULTIARCH}/netinet
+sys/netinet/pim.h usr/include/${DEB_HOST_MULTIARCH}/netinet
+sys/netinet/pim_var.h usr/include/${DEB_HOST_MULTIARCH}/netinet
+sys/netinet/sctp*.h usr/include/${DEB_HOST_MULTIARCH}/netinet
+sys/netinet/tcp_debug.h usr/include/${DEB_HOST_MULTIARCH}/netinet
+sys/netinet/tcp_fsm.h usr/include/${DEB_HOST_MULTIARCH}/netinet
+sys/netinet/tcp_seq.h usr/include/${DEB_HOST_MULTIARCH}/netinet
+sys/netinet/tcp_timer.h usr/include/${DEB_HOST_MULTIARCH}/netinet
+sys/netinet/tcp_var.h usr/include/${DEB_HOST_MULTIARCH}/netinet
+sys/netinet/tcpip.h usr/include/${DEB_HOST_MULTIARCH}/netinet
+sys/netinet/udp_var.h usr/include/${DEB_HOST_MULTIARCH}/netinet
+sys/netinet6/in6_gif.h usr/include/${DEB_HOST_MULTIARCH}/netinet6
+sys/netinet6/in6_pcb.h usr/include/${DEB_HOST_MULTIARCH}/netinet6
+sys/netinet6/in6_var.h usr/include/${DEB_HOST_MULTIARCH}/netinet6
+sys/netinet6/ip6_mroute.h usr/include/${DEB_HOST_MULTIARCH}/netinet6
+sys/netinet6/ip6_var.h usr/include/${DEB_HOST_MULTIARCH}/netinet6
+sys/netinet6/ip6protosw.h usr/include/${DEB_HOST_MULTIARCH}/netinet6
+sys/netinet6/nd6.h usr/include/${DEB_HOST_MULTIARCH}/netinet6
+sys/netinet6/pim6.h usr/include/${DEB_HOST_MULTIARCH}/netinet6
+sys/netinet6/pim6_var.h usr/include/${DEB_HOST_MULTIARCH}/netinet6
+sys/netinet6/raw_ip6.h usr/include/${DEB_HOST_MULTIARCH}/netinet6
+sys/netipsec/*.h usr/include/${DEB_HOST_MULTIARCH}/netipsec
+sys/netipx/ipx.h usr/include/${DEB_HOST_MULTIARCH}/netipx
+sys/netipx/ipx_if.h usr/include/${DEB_HOST_MULTIARCH}/netipx
+sys/netipx/ipx_pcb.h usr/include/${DEB_HOST_MULTIARCH}/netipx
+sys/netipx/ipx_var.h usr/include/${DEB_HOST_MULTIARCH}/netipx
+sys/netipx/spx.h usr/include/${DEB_HOST_MULTIARCH}/netipx
+sys/netipx/spx_debug.h usr/include/${DEB_HOST_MULTIARCH}/netipx
+sys/netipx/spx_timer.h usr/include/${DEB_HOST_MULTIARCH}/netipx
+sys/netipx/spx_var.h usr/include/${DEB_HOST_MULTIARCH}/netipx
+sys/netsmb/*.h usr/include/${DEB_HOST_MULTIARCH}/netsmb
+sys/nfs/*.h usr/include/${DEB_HOST_MULTIARCH}/nfs
+sys/nfsserver/*.h usr/include/${DEB_HOST_MULTIARCH}/nfsserver
+sys/nfsclient/*.h usr/include/${DEB_HOST_MULTIARCH}/nfsclient
+sys/opencrypto/*.h usr/include/${DEB_HOST_MULTIARCH}/opencrypto
+sys/sys/_bitset.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/_bus_dma.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/_callout.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/_cpuset.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/_iovec.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/_lock.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/_lockmgr.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/_mutex.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/_null.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/_pctrie.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/_rmlock.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/_rwlock.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/_semaphore.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/_sigset.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/_sx.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/_stdint.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/_task.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/_termios.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/_timeval.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/_types.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/acct.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/agpio.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/assym.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/ata.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/bio.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/bitset.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/bitstring.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/blist.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/buf.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/bufobj.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/bus.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/bus_dma.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/callout.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/capability.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/caprights.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/cdio.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/cdrio.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/chio.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/condvar.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/conf.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/cons.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/consio.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/counter.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/copyright.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/cpuset.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/ctype.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/dataacq.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/devicestat.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/disk.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/diskmbr.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/disklabel.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/dkstat.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/domain.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/dvdio.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/elf.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/elf32.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/elf64.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/elf_common.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/elf_generic.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/endian.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/event.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/eventhandler.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/exec.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/extattr.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/fbio.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/file.h usr/include/${DEB_HOST_MULTIARCH}/sys/kglue/sys
+sys/sys/filedesc.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/filio.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/fnv_hash.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/iconv.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/imgact.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/imgact_aout.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/imgact_elf.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/inflate.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/interrupt.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/ioccom.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/ioctl_compat.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/jail.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/joystick.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/kbio.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/kenv.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/kernel.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/kerneldump.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/kobj.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/kthread.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/ktr.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/ktrace.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/libkern.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/limits.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/linker.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/linker_set.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/lock.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/lock_profile.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/lockf.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/lockmgr.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/mac.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/malloc.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/mbuf.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/mchain.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/md4.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/md5.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/mdioctl.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/memrange.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/module.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/mouse.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/msgbuf.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/mutex.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/namei.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/nlist_aout.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/osd.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/param.h usr/include/${DEB_HOST_MULTIARCH}/sys/kglue/sys
+sys/sys/pciio.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/pcpu.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/pioctl.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/posix4.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/priority.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/proc.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/procctl.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/procfs.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/protosw.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/ptio.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/queue.h usr/include/${DEB_HOST_MULTIARCH}/sys/kglue/sys
+sys/sys/rangelock.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/random.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/refcount.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/resourcevar.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/rman.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/rtprio.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/runq.h usr/include/${DEB_HOST_MULTIARCH}/sys
# See #726248
-#sys/sys/sdt.h usr/include/sys
-sys/sys/seq.h usr/include/sys
-sys/sys/selinfo.h usr/include/sys
-sys/sys/sf_buf.h usr/include/sys
-sys/sys/sigio.h usr/include/sys
-sys/sys/signal.h usr/include/sys/kglue/sys
-sys/sys/signalvar.h usr/include/sys
-sys/sys/snoop.h usr/include/sys
-sys/sys/socket.h usr/include/sys/kglue/sys
-sys/sys/sockio.h usr/include/sys
-sys/sys/soundcard.h usr/include/sys
-sys/sys/sx.h usr/include/sys
-sys/sys/sysctl.h usr/include/sys
-sys/sys/sysent.h usr/include/sys
-sys/sys/syslimits.h usr/include/sys
-sys/sys/sysproto.h usr/include/sys
-sys/sys/systm.h usr/include/sys
-sys/sys/timepps.h usr/include/sys
-sys/sys/timers.h usr/include/sys
-sys/sys/timespec.h usr/include/sys
-sys/sys/timex.h usr/include/sys
-sys/sys/tree.h usr/include/sys
-sys/sys/tty.h usr/include/sys
-sys/sys/ttycom.h usr/include/sys
-sys/sys/ttyqueue.h usr/include/sys
-sys/sys/time.h usr/include/sys/kglue/sys
-sys/sys/types.h usr/include/sys/kglue/sys
-sys/sys/ucred.h usr/include/sys
-sys/sys/unpcb.h usr/include/sys
-sys/sys/user.h usr/include/sys
-sys/sys/vmmeter.h usr/include/sys
-sys/sys/vnode.h usr/include/sys
-sys/ufs/ffs/*.h usr/include/ufs/ffs
-sys/ufs/ufs/*.h usr/include/ufs/ufs
-sys/vm/*.h usr/include/vm
+#sys/sys/sdt.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/seq.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/selinfo.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/sf_buf.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/sigio.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/signal.h usr/include/${DEB_HOST_MULTIARCH}/sys/kglue/sys
+sys/sys/signalvar.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/snoop.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/socket.h usr/include/${DEB_HOST_MULTIARCH}/sys/kglue/sys
+sys/sys/sockio.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/soundcard.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/sx.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/sysctl.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/sysent.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/syslimits.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/sysproto.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/systm.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/timepps.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/timers.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/timespec.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/timex.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/tree.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/tty.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/ttycom.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/ttyqueue.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/time.h usr/include/${DEB_HOST_MULTIARCH}/sys/kglue/sys
+sys/sys/types.h usr/include/${DEB_HOST_MULTIARCH}/sys/kglue/sys
+sys/sys/ucred.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/unpcb.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/user.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/vmmeter.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/sys/vnode.h usr/include/${DEB_HOST_MULTIARCH}/sys
+sys/ufs/ffs/*.h usr/include/${DEB_HOST_MULTIARCH}/ufs/ffs
+sys/ufs/ufs/*.h usr/include/${DEB_HOST_MULTIARCH}/ufs/ufs
+sys/vm/*.h usr/include/${DEB_HOST_MULTIARCH}/vm
# FIXME: kFreeBSD >= 9 provides its own version in sys/compat/linux/,
# however upstream doesn't use them. For now they prefer the ones
# from v4l_compat port (and yes, they're installed in linux dir).
-misc/videodev.h usr/include/linux
-misc/videodev2.h usr/include/linux
+misc/videodev.h usr/include/${DEB_HOST_MULTIARCH}/linux
+misc/videodev2.h usr/include/${DEB_HOST_MULTIARCH}/linux
# FIXME: FreeBSD osreldate.h is not a kernel header. We're currently
# abusing this path for __FreeBSD_kernel_version definition (needed
# by glibc).
-misc/osreldate.h usr/include
+misc/osreldate.h usr/include/${DEB_HOST_MULTIARCH}
# For backward compatibility with kern -> kglue transition
-misc/kern/param.h usr/include/sys/kern
-misc/kern/queue.h usr/include/sys/kern
-misc/kern/time.h usr/include/sys/kern
-misc/kern/types.h usr/include/sys/kern
+misc/kern/param.h usr/include/${DEB_HOST_MULTIARCH}/sys/kern
+misc/kern/queue.h usr/include/${DEB_HOST_MULTIARCH}/sys/kern
+misc/kern/time.h usr/include/${DEB_HOST_MULTIARCH}/sys/kern
+misc/kern/types.h usr/include/${DEB_HOST_MULTIARCH}/sys/kern
-misc/sys/stdint.h usr/include/sys
+misc/sys/stdint.h usr/include/${DEB_HOST_MULTIARCH}/sys
Modified: trunk/kfreebsd-kernel-headers/debian/links
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/links 2015-08-20 22:52:42 UTC (rev 5758)
+++ trunk/kfreebsd-kernel-headers/debian/links 2015-08-21 19:22:26 UTC (rev 5759)
@@ -1,2 +1,3 @@
-usr/include/opencrypto usr/include/crypto
-usr/include/fs/cd9660 usr/include/isofs/cd9660
+#! /usr/bin/dh-exec
+usr/include/opencrypto usr/include/${DEB_HOST_MULTIARCH}/crypto
+usr/include/fs/cd9660 usr/include/${DEB_HOST_MULTIARCH}/isofs/cd9660
Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules 2015-08-20 22:52:42 UTC (rev 5758)
+++ trunk/kfreebsd-kernel-headers/debian/rules 2015-08-21 19:22:26 UTC (rev 5759)
@@ -103,7 +103,7 @@
.PHONY: build-indep build-arch build
-install-indep: build-indep
+-indep: build-indep
install-arch: build-arch
dh_testdir
@@ -114,18 +114,18 @@
dh_link
ifneq ($(filter amd64, $(kfreebsd_cpu)),)
- sh debian/generate-asm.sh $(kfreebsd_cpu) $(CURDIR)/sys $(HEADERS_PACKAGE)/usr/include
+ sh debian/generate-asm.sh $(kfreebsd_cpu) $(CURDIR)/sys $(HEADERS_PACKAGE)/usr/include/$(DEB_HOST_MULTIARCH)
else
- mkdir -p $(HEADERS_PACKAGE)/usr/include/machine
+ mkdir -p $(HEADERS_PACKAGE)/usr/include/$(DEB_HOST_MULTIARCH)/machine
cd $(CURDIR)/sys/$(kfreebsd_cpu)/include \
- && find . -type f -name "*.h" -exec cp --parents {} $(HEADERS_PACKAGE)/usr/include/machine \;
+ && find . -type f -name "*.h" -exec cp --parents {} $(HEADERS_PACKAGE)/usr/include/$(DEB_HOST_MULTIARCH)/machine \;
endif
ifneq ($(filter i386 amd64, $(kfreebsd_cpu)),)
# Install "x86" directory (only on i386 and amd64).
- mkdir -p $(HEADERS_PACKAGE)/usr/include/x86
+ mkdir -p $(HEADERS_PACKAGE)/usr/include/$(DEB_HOST_MULTIARCH)/x86
cd $(CURDIR)/sys/x86/include \
- && find . -type f -name "*.h" -exec cp --parents {} $(HEADERS_PACKAGE)/usr/include/x86 \;
+ && find . -type f -name "*.h" -exec cp --parents {} $(HEADERS_PACKAGE)/usr/include/$(DEB_HOST_MULTIARCH)/x86 \;
endif
# headers must be tested after they're installed
More information about the Glibc-bsd-commits
mailing list