Updated from illumos-source-4.3

7 files changed, 68 insertions, 23 deletions

diff --git a/debian/changelog b/debian/changelog
index 9f84eb6..85a51ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+driverdb (4.3) UNRELEASED; urgency=medium
+
+  * Bump version to reflect illumos
+  * Added a new target "newdb" in debian/rules to get new authentic db from
+    illumos sources
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Sun, 02 Mar 2014 16:53:37 +0400
+
 driverdb (0.1.1) unstable; urgency=low
 
   * Make package optional
diff --git a/debian/db/etc/devlink.tab b/debian/db/etc/devlink.tab
index 4430ac6..6614af1 100644
--- a/debian/db/etc/devlink.tab
+++ b/debian/db/etc/devlink.tab
@@ -1,5 +1,4 @@
 type=ddi_ctl:devctl;minor1=t4nex	t4nex\M2
-type=ddi_pseudo;minor1=cpqary3	cpqary3\M2
 type=ddi_pseudo;name=ii	\D
 type=ddi_pseudo;name=ncall	\D
 type=ddi_pseudo;name=nsctl	\D
diff --git a/debian/db/etc/driver_aliases b/debian/db/etc/driver_aliases
index cb6d3a9..2d676f7 100644
--- a/debian/db/etc/driver_aliases
+++ b/debian/db/etc/driver_aliases
@@ -247,6 +247,13 @@ cpqary3 "pci103c,3247"
 cpqary3 "pci103c,3249"
 cpqary3 "pci103c,324a"
 cpqary3 "pci103c,324b"
+cpqary3 "pci103c,3350"
+cpqary3 "pci103c,3351"
+cpqary3 "pci103c,3352"
+cpqary3 "pci103c,3353"
+cpqary3 "pci103c,3354"
+cpqary3 "pci103c,3355"
+cpqary3 "pci103c,3356"
 cpqary3 "pcie11,4070"
 cpqary3 "pcie11,4080"
 cpqary3 "pcie11,4082"
@@ -256,6 +263,7 @@ cpqary3 "pcie11,409a"
 cpqary3 "pcie11,409b"
 cpqary3 "pcie11,409c"
 cpqary3 "pcie11,409d"
+cpqary3 "pcie11,409e"
 cpudrv "cpu"
 cpunex "cpus"
 cxgbe "cxgbe"
@@ -376,6 +384,10 @@ e1000g "pci8086,10f6"
 e1000g "pci8086,1502"
 e1000g "pci8086,1503"
 e1000g "pci8086,150c"
+e1000g "pci8086,153a"
+e1000g "pci8086,153b"
+e1000g "pci8086,1559"
+e1000g "pci8086,155a"
 e1000g "pci8086,294c"
 e1000g "pci8086,f0fe"
 e1000g "pciex8086,1049"
@@ -427,6 +439,10 @@ e1000g "pciex8086,10f6"
 e1000g "pciex8086,1502"
 e1000g "pciex8086,1503"
 e1000g "pciex8086,150c"
+e1000g "pciex8086,153a"
+e1000g "pciex8086,153b"
+e1000g "pciex8086,1559"
+e1000g "pciex8086,155a"
 e1000g "pciex8086,294c"
 e1000g "pciex8086,f0fe"
 ecpp "lp"
@@ -531,8 +547,19 @@ igb "pciex8086,1511"
 igb "pciex8086,1516"
 igb "pciex8086,1518"
 igb "pciex8086,1521"
+igb "pciex8086,1522"
 igb "pciex8086,1523"
+igb "pciex8086,1524"
 igb "pciex8086,1526"
+igb "pciex8086,1533"
+igb "pciex8086,1534"
+igb "pciex8086,1535"
+igb "pciex8086,1536"
+igb "pciex8086,1537"
+igb "pciex8086,1538"
+igb "pciex8086,1539"
+igb "pciex8086,1546"
+igb "pciex8086,438"
 intel_nb5000 "pci8086,25c0"
 intel_nb5000 "pci8086,25d0"
 intel_nb5000 "pci8086,25d4"
@@ -801,7 +828,12 @@ nulldriver "scsa,nodev"
 nulldriver "scsa,probe"
 nv_sata "pci10de,266"
 nv_sata "pci10de,267"
+nv_sata "pci10de,36"
+nv_sata "pci10de,37e"
 nv_sata "pci10de,37f"
+nv_sata "pci10de,3e"
+nv_sata "pci10de,3f6"
+nv_sata "pci10de,3f7"
 nv_sata "pci10de,54"
 nv_sata "pci10de,55"
 nxge "SUNW,niusl"
@@ -809,11 +841,6 @@ nxge "pciex108e,abcd"
 oce "pciex19a2,700"
 oce "pciex19a2,710"
 ohci "pciclass,0c0310"
-pcan "pccard15f,7"
-pcan "pccard15f,a"
-pcan "pci14b9,5000"
-pcan "pci14b9,a504"
-pcata "pccard,disk"
 pci_pci "pci1011,1"
 pci_pci "pci1011,21"
 pci_pci "pci1014,22"
@@ -825,16 +852,6 @@ pcieb "pciexclass,060400"
 pcieb "pciexclass,060401"
 pcn "pci1022,2000"
 pcn "pci103c,104c"
-pcser "pccard,Intel_MODEM_2400+_iNC110US_A-"
-pcser "pccard,serial"
-pcser "pccard102,2"
-pcser "pccard102,5"
-pcwl "pccard138,2"
-pcwl "pccard156,2"
-pcwl "pccardb,7300"
-pcwl "pci1260,3872"
-pcwl "pci1260,3873"
-pcwl "pci1385,4105"
 pit_beep "SUNW,pit_beep"
 pmcs "pciex11f8,8001"
 pseudo "zconsnex"
diff --git a/debian/db/etc/driver_classes b/debian/db/etc/driver_classes
index e36a49d..16e81eb 100644
--- a/debian/db/etc/driver_classes
+++ b/debian/db/etc/driver_classes
@@ -6,7 +6,7 @@ arcmsr	scsi
 ata	dada
 ata	scsi
 bcm_sata	scsi-self-identifying
-cpqary3	scsi
+cpqary3	scsi-self-identifying
 emlxs	fibre-channel
 glm	scsi
 isa	sysbus
diff --git a/debian/db/etc/minor_perm b/debian/db/etc/minor_perm
index 2a3f704..d64512f 100644
--- a/debian/db/etc/minor_perm
+++ b/debian/db/etc/minor_perm
@@ -70,9 +70,7 @@ clone:mwl 0666 root sys
 clone:mxfe 0666 root sys
 clone:myri10ge 0666 root sys
 clone:nge 0666 root sys
-clone:pcan 0666 root sys
 clone:pcn 0666 root sys
-clone:pcwl 0666 root sys
 clone:ptmx 0666 root sys
 clone:ral 0666 root sys
 clone:rge 0666 root sys
@@ -155,6 +153,7 @@ igb:* 0666 root sys
 ii:* 0666 root sys
 ip6:ip6 0666 root sys
 ip:ip 0666 root sys
+ipd:* 0600 root sys
 ipf:* 0666 root sys
 ipmi:* 0600 root sys
 ipnet:lo0 0666 root sys
@@ -201,10 +200,7 @@ nxge:* 0600 root sys
 oce:* 0666 root sys
 ohci:* 0644 root sys
 openeepr:openprom 0640 root sys
-pcan:* 0666 root sys
 pcn:* 0666 root sys
-pcser:* 0666 uucp uucp
-pcwl:* 0666 root sys
 physmem:* 0600 root sys
 pm:* 0666 root sys
 pmcs:* 0600 root sys
diff --git a/debian/db/etc/name_to_major b/debian/db/etc/name_to_major
index 6e0f17a..25f5e35 100644
--- a/debian/db/etc/name_to_major
+++ b/debian/db/etc/name_to_major
@@ -326,3 +326,7 @@ vboxvideo 325
 vboxguest 326
 vboxms 327
 fuse 328
+ipd 329
+vioblk 330
+cxgbe 331
+t4nex 332
diff --git a/debian/rules b/debian/rules
index be15bb7..e7f690b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,27 @@ binary binary-arch binary-indep: binary-stamp
 build build-arch build-indep:
 install: install-stamp
 
+mf-define := -m debian/db/etc/name_to_major
+
+mf-define += -D i386_ONLY= -D ARCH=i386 -a i386
+ifeq (illumos-amd64,$(DEB_HOST_ARCH))
+mf-define += -D ARCH64=amd64
+else
+$(error $(DEB_HOST_ARCH) is not supported)
+endif
+
+.PHONY: newdb
+# This target is not used in ordinary build,
+# it can be helpful when doing major updates
+newdb: unpack-illumos-stamp
+	rm -rf newdb
+	mkdir -p newdb
+	find usr/src/pkg/manifests -type f -name \*.mf | \
+		debian/drivers.pl $(mf-define) -r newdb
+unpack-illumos-stamp:
+	dh_illumos_gate usr/src/pkg/manifests
+	touch $@
+
 install-stamp:
 	dh_testdir
 	rm -rf debian/driverdb
@@ -34,5 +55,5 @@ binary-stamp: install-stamp
 clean:
 	dh_testdir
 	dh_clean
-	rm -rf usr
+	rm -rf usr newdb