Discussion:
[pve-devel] [PVE-User] pve-firmware conflicts with squeeze packages
Derek W. Poon
2011-12-09 22:10:37 UTC
Permalink
I'm submitting a patch on pve-kernel-2.6.32 to blacklist firmware files already included in Debian packages. Switching this thread from pve-user to pve-devel...
Would you mind to create a patch?
pve-firmware 1.0-13 conflicts with the packages firmware-qlogic, firmware-
bnx2x, and firmware-bnx2 of Debian squeeze. It would be nice if you could
either make use of the standard Debian packages, or mark pve-firmware as
conflicting with or replacing the Debian packages so that APT can work
properly.
Derek W. Poon
2011-12-09 22:15:01 UTC
Permalink
To allow coexistence with Debian packages, exclude firmware files
already distributed by Debian when building pve-firmware. Otherwise,
proxmox-ve could fail to install on top of an existing Debian system.
---
Makefile | 2 +-
assemble-firmware.pl | 210 +++++++++++++++++++++++++++++++++++++++++++++++---
changelog.firmware | 6 ++
control.firmware | 3 +-
4 files changed, 208 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index cc6d6f2..e1a1a72 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ KERNEL_CFG=config-${KERNEL_VER}
KERNEL_CFG_ORG=config-${KERNEL_VER}-${OVZVER}.x86_64

FW_VER=1.0
-FW_REL=13
+FW_REL=14
FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb

AOEDIR=aoe6-77
diff --git a/assemble-firmware.pl b/assemble-firmware.pl
index 1a507b8..02a81a8 100755
--- a/assemble-firmware.pl
+++ b/assemble-firmware.pl
@@ -15,15 +15,14 @@ die "no firmware list specified" if !$fwlist || ! -f $fwlist;
my $target = shift;
die "no target directory" if !$target || ! -d $target;

-my $force_skip = {
+my $force_skip = { map { $_ => 1 } (

# not needed, the HBA has burned-in firmware
- 'ql8100_fw.bin' => 1,
-};
+ 'ql8100_fw.bin',
+)};

-my $skip = {};
# debian squeeze also misses those files
-foreach my $fw (qw(
+my $skip = { map { $_ => 1 } (qw(
libertas/gspi8385.bin libertas/gspi8385_hlp.bin
cbfw.bin ctfw.bin
tehuti/firmware.bin
@@ -61,7 +60,6 @@ symbol_sp24t_sec_fw
symbol_sp24t_prim_fw
prism_ap_fw.bin
prism_sta_fw.bin
-ar9170.fw
iwmc3200wifi-lmac-sdio.bin
iwmc3200wifi-calib-sdio.bin
iwmc3200wifi-umac-sdio.bin
@@ -115,10 +113,200 @@ mwl8k/helper_8363.fw
iwlwifi-6000g2a-4.ucode
iwlwifi-130-5.ucode
cxgb4/t4fw.bin
-
-)) {
- $skip->{$fw} = 1;
-}
+))};
+
+# These firmwares are included in packages generated from Debian source
+# package firmware-nonfree-0.28+squeeze1. They should be excluded from
+# pve-firmware so as not to conflict with Debian; otherwise, some package
+# will fail to install.
+#
+# This list was generated by building firmware-nonfree, then running
+# find debian/firmware-*/lib/firmware -type f | \
+# sed -e 's,^debian/firmware-.*/lib/firmware/,,'
+# ... and finally appending the filelist of the firmware-linux-free package.
+my $debian_fw = { map { $_ => 1 } (qw(
+ar7010_1_1.fw
+ar9170.fw
+ar9271.fw
+ar7010.fw
+ath3k-1.fw
+bnx2-09-4.0.5.fw
+bnx2-06-4.0.5.fw
+bnx2/bnx2-rv2p-09ax-6.0.17.fw
+bnx2/bnx2-rv2p-09-6.0.17.fw
+bnx2/bnx2-rv2p-06-6.0.15.fw
+bnx2/bnx2-mips-06-6.0.15.fw
+bnx2/bnx2-rv2p-06-5.0.0.j3.fw
+bnx2/bnx2-mips-09-6.0.17.fw
+bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw
+bnx2/bnx2-mips-06-5.0.0.j3.fw
+bnx2/bnx2-rv2p-09-5.0.0.j3.fw
+bnx2/bnx2-mips-09-5.0.0.j3.fw
+bnx2x-e1-4.8.53.0.fw
+bnx2x/bnx2x-e1-6.0.34.0.fw
+bnx2x/bnx2x-e2-6.0.34.0.fw
+bnx2x/bnx2x-e1h-6.0.34.0.fw
+bnx2x-e1-5.0.21.0.fw
+bnx2x-e1h-4.8.53.0.fw
+bnx2x-e1h-5.0.21.0.fw
+brcm/bcm43xx_hdr-0.fw
+brcm/bcm43xx-0.fw
+i6050-fw-usb-1.5.sbcf
+i2400m-fw-usb-1.4.sbcf
+i2400m-fw-usb-1.5.sbcf
+ipw2200-sniffer.fw
+ipw2100-1.3.fw
+ipw2200-ibss.fw
+ipw2100-1.3-p.fw
+ipw2100-1.3-i.fw
+ipw2200-bss.fw
+v4l-cx2341x-dec.fw
+v4l-pvrusb2-24xxx-01.fw
+v4l-cx2341x-enc.fw
+v4l-pvrusb2-29xxx-01.fw
+v4l-cx25840.fw
+v4l-cx2341x-init.mpg
+iwlwifi-5150-2.ucode
+iwlwifi-6000-4.ucode
+iwlwifi-1000-3.ucode
+iwlwifi-5000-2.ucode
+iwlwifi-6050-4.ucode
+iwlwifi-6050-5.ucode
+iwlwifi-5000-1.ucode
+iwlwifi-3945-2.ucode
+iwlwifi-4965-1.ucode
+iwlwifi-4965-2.ucode
+iwlwifi-6000g2a-5.ucode
+iwlwifi-3945-1.ucode
+iwlwifi-6000g2b-5.ucode
+tehuti/bdx.bin
+mts_gsm.fw
+agere_ap_fw.bin
+e100/d101s_ucode.bin
+e100/d102e_ucode.bin
+e100/d101m_ucode.bin
+3com/typhoon.bin
+advansys/38C0800.bin
+advansys/38C1600.bin
+advansys/3550.bin
+advansys/mcode.bin
+vntwusb.fw
+radeon/R520_cp.bin
+radeon/REDWOOD_pfp.bin
+radeon/REDWOOD_rlc.bin
+radeon/RV710_pfp.bin
+radeon/RV630_me.bin
+radeon/CEDAR_pfp.bin
+radeon/CYPRESS_rlc.bin
+radeon/R420_cp.bin
+radeon/JUNIPER_pfp.bin
+radeon/CYPRESS_me.bin
+radeon/RS780_me.bin
+radeon/RV620_me.bin
+radeon/REDWOOD_me.bin
+radeon/RV610_pfp.bin
+radeon/R600_rlc.bin
+radeon/RV710_me.bin
+radeon/RV610_me.bin
+radeon/RV620_pfp.bin
+radeon/RS600_cp.bin
+radeon/R200_cp.bin
+radeon/RV635_me.bin
+radeon/JUNIPER_me.bin
+radeon/RV770_pfp.bin
+radeon/RV730_me.bin
+radeon/RV670_me.bin
+radeon/R300_cp.bin
+radeon/RV670_pfp.bin
+radeon/R600_me.bin
+radeon/RV635_pfp.bin
+radeon/RS690_cp.bin
+radeon/CEDAR_rlc.bin
+radeon/RV730_pfp.bin
+radeon/R700_rlc.bin
+radeon/RV770_me.bin
+radeon/R100_cp.bin
+radeon/CEDAR_me.bin
+radeon/CYPRESS_pfp.bin
+radeon/JUNIPER_rlc.bin
+radeon/R600_pfp.bin
+radeon/RS780_pfp.bin
+radeon/RV630_pfp.bin
+dvb-usb-dib0700-1.20.fw
+matrox/g200_warp.fw
+matrox/g400_warp.fw
+kaweth/trigger_code_fix.bin
+kaweth/trigger_code.bin
+kaweth/new_code_fix.bin
+kaweth/new_code.bin
+tigon/tg3_tso5.bin
+tigon/tg3_tso.bin
+tigon/tg3.bin
+agere_sta_fw.bin
+dvb-fe-xc5000-1.6.114.fw
+dabusb/firmware.fw
+dabusb/bitstream.bin
+mts_edge.fw
+r128/r128_cce.bin
+mts_cdma.fw
+cxgb3/ael2005_twx_edc.bin
+cxgb3/ael2005_opt_edc.bin
+cxgb3/t3c_psram-1.1.0.bin
+cxgb3/t3b_psram-1.1.0.bin
+cxgb3/ael2020_twx_edc.bin
+cxgb3/t3fw-7.4.0.bin
+phanfw.bin
+qlogic/1280.bin
+qlogic/sd7220.fw
+qlogic/1040.bin
+qlogic/12160.bin
+ql2400_fw.bin
+ql2100_fw.bin
+ql2500_fw.bin
+ql2300_fw.bin
+ql2200_fw.bin
+ql2322_fw.bin
+rt2561.bin
+rt2860.bin
+rt73.bin
+rt3090.bin
+rt2870.bin
+rt3071.bin
+rt2561s.bin
+rt3070.bin
+rt2661.bin
+rtl_nic/rtl8105e-1.fw
+rtl_nic/rtl8168e-2.fw
+rtl_nic/rtl8168d-2.fw
+rtl_nic/rtl8168e-1.fw
+rtl_nic/rtl8168e-3.fw
+rtl_nic/rtl8168d-1.fw
+RTL8192SU/rtl8192sfw.bin
+rtlwifi/rtl8712u.bin
+RTL8192E/boot.img
+RTL8192E/main.img
+RTL8192E/data.img
+
+av7110/bootcode.bin
+cis/3CCFEM556.cis
+cis/3CXEM556.cis
+cis/COMpad2.cis
+cis/COMpad4.cis
+cis/DP83903.cis
+cis/LA-PCM.cis
+cis/MT5634ZLX.cis
+cis/NE2K.cis
+cis/PCMLM28.cis
+cis/PE-200.cis
+cis/RS-COM-2P.cis
+cis/SW_555_SER.cis
+cis/SW_7xx_SER.cis
+cis/SW_8xx_SER.cis
+cis/tamarack.cis
+dsp56k/bootstrap.bin
+keyspan_pda/keyspan_pda.fw
+keyspan_pda/xircom_pgs.fw
+))};

sub copy_fw {
my ($src, $dstfw) = @_;
@@ -169,6 +357,8 @@ while(defined(my $line = <TMP>)) {
$fw = 'cis/PE520.cis';
}

+ next if $debian_fw->{$fw};
+
if (-f "$fwsrc0/$fw") {
copy_fw("$fwsrc0/$fw", $fwdest);
next;
diff --git a/changelog.firmware b/changelog.firmware
index 009d888..f92d096 100644
--- a/changelog.firmware
+++ b/changelog.firmware
@@ -1,3 +1,9 @@
+pve-firmware (1.0-13) unstable; urgency=low
+
+ * exclude firmware files distributed by Debian, to allow coexistence
+
+ -- Derek Poon <derekp+***@ece.ubc.ca> Fri, 9 Dec 2011 13:51:20 -0800
+
pve-firmware (1.0-12) unstable; urgency=low

* add Brocade firmware
diff --git a/control.firmware b/control.firmware
index 00b949c..cf91e70 100644
--- a/control.firmware
+++ b/control.firmware
@@ -3,8 +3,7 @@ Version: @VERSION@
Section: misc
Priority: optional
Architecture: all
-Suggests: linux-image
-Conflicts: firmware-linux-free, firmware-linux-nonfree
+Suggests: linux-image, firmware-linux, firmware-linux-nonfree, firmware-atheros, firmware-bnx2, firmware-bnx2x, firmware-brcm80211, firmware-intelwimax, firmware-ipw2x00, firmware-ivtv, firmware-iwlwifi, firmware-netxen, firmware-qlogic, firmware-ralink, firmware-realtek
Maintainer: Proxmox Support Team <***@proxmox.com>
Description: Binary firmware code for the pve-kernel
This package contains the binary firmware for various modules used in
--
1.7.2.5
Dietmar Maurer
2011-12-10 09:05:16 UTC
Permalink
The whole purpose of the pve-firmware package is that it includes 'all'
necessary (all referenced) firmware drivers.

So the correct way to fix that is to add 'Conflict' and 'Replaces' tags in the control file.

So what packages makes problems exactly?

- Dietmar
-----Original Message-----
Sent: Freitag, 09. Dezember 2011 23:15
Subject: [pve-devel] [PATCH] exclude firmware files distributed by Debian
To allow coexistence with Debian packages, exclude firmware files already
distributed by Debian when building pve-firmware. Otherwise, proxmox-ve
could fail to install on top of an existing Debian system.
---
Makefile | 2 +-
assemble-firmware.pl | 210
+++++++++++++++++++++++++++++++++++++++++++++++---
changelog.firmware | 6 ++
control.firmware | 3 +-
4 files changed, 208 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile
index cc6d6f2..e1a1a72 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ KERNEL_CFG=config-${KERNEL_VER}
KERNEL_CFG_ORG=config-${KERNEL_VER}-${OVZVER}.x86_64
FW_VER=1.0
-FW_REL=13
+FW_REL=14
FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
AOEDIR=aoe6-77
diff --git a/assemble-firmware.pl b/assemble-firmware.pl index
1a507b8..02a81a8 100755
--- a/assemble-firmware.pl
+++ b/assemble-firmware.pl
@@ -15,15 +15,14 @@ die "no firmware list specified" if !$fwlist || ! -f $fwlist;
my $target = shift; die "no target directory" if !$target || ! -d $target;
-my $force_skip = {
+my $force_skip = { map { $_ => 1 } (
# not needed, the HBA has burned-in firmware
- 'ql8100_fw.bin' => 1,
-};
+ 'ql8100_fw.bin',
+)};
-my $skip = {};
# debian squeeze also misses those files -foreach my $fw (qw(
+my $skip = { map { $_ => 1 } (qw(
libertas/gspi8385.bin libertas/gspi8385_hlp.bin cbfw.bin ctfw.bin
symbol_sp24t_prim_fw prism_ap_fw.bin prism_sta_fw.bin -ar9170.fw
iwmc3200wifi-lmac-sdio.bin iwmc3200wifi-calib-sdio.bin iwmc3200wifi-umac-
4.ucode iwlwifi-130-5.ucode cxgb4/t4fw.bin
-
-)) {
- $skip->{$fw} = 1;
-}
+))};
+
+# These firmwares are included in packages generated from Debian source
+# package firmware-nonfree-0.28+squeeze1. They should be excluded from
+# pve-firmware so as not to conflict with Debian; otherwise, some
+package # will fail to install.
+#
+# This list was generated by building firmware-nonfree, then running
+# find debian/firmware-*/lib/firmware -type f | \
+# sed -e 's,^debian/firmware-.*/lib/firmware/,,'
+# ... and finally appending the filelist of the firmware-linux-free package.
+my $debian_fw = { map { $_ => 1 } (qw(
+ar7010_1_1.fw
+ar9170.fw
+ar9271.fw
+ar7010.fw
+ath3k-1.fw
+bnx2-09-4.0.5.fw
+bnx2-06-4.0.5.fw
+bnx2/bnx2-rv2p-09ax-6.0.17.fw
+bnx2/bnx2-rv2p-09-6.0.17.fw
+bnx2/bnx2-rv2p-06-6.0.15.fw
+bnx2/bnx2-mips-06-6.0.15.fw
+bnx2/bnx2-rv2p-06-5.0.0.j3.fw
+bnx2/bnx2-mips-09-6.0.17.fw
+bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw
+bnx2/bnx2-mips-06-5.0.0.j3.fw
+bnx2/bnx2-rv2p-09-5.0.0.j3.fw
+bnx2/bnx2-mips-09-5.0.0.j3.fw
+bnx2x-e1-4.8.53.0.fw
+bnx2x/bnx2x-e1-6.0.34.0.fw
+bnx2x/bnx2x-e2-6.0.34.0.fw
+bnx2x/bnx2x-e1h-6.0.34.0.fw
+bnx2x-e1-5.0.21.0.fw
+bnx2x-e1h-4.8.53.0.fw
+bnx2x-e1h-5.0.21.0.fw
+brcm/bcm43xx_hdr-0.fw
+brcm/bcm43xx-0.fw
+i6050-fw-usb-1.5.sbcf
+i2400m-fw-usb-1.4.sbcf
+i2400m-fw-usb-1.5.sbcf
+ipw2200-sniffer.fw
+ipw2100-1.3.fw
+ipw2200-ibss.fw
+ipw2100-1.3-p.fw
+ipw2100-1.3-i.fw
+ipw2200-bss.fw
+v4l-cx2341x-dec.fw
+v4l-pvrusb2-24xxx-01.fw
+v4l-cx2341x-enc.fw
+v4l-pvrusb2-29xxx-01.fw
+v4l-cx25840.fw
+v4l-cx2341x-init.mpg
+iwlwifi-5150-2.ucode
+iwlwifi-6000-4.ucode
+iwlwifi-1000-3.ucode
+iwlwifi-5000-2.ucode
+iwlwifi-6050-4.ucode
+iwlwifi-6050-5.ucode
+iwlwifi-5000-1.ucode
+iwlwifi-3945-2.ucode
+iwlwifi-4965-1.ucode
+iwlwifi-4965-2.ucode
+iwlwifi-6000g2a-5.ucode
+iwlwifi-3945-1.ucode
+iwlwifi-6000g2b-5.ucode
+tehuti/bdx.bin
+mts_gsm.fw
+agere_ap_fw.bin
+e100/d101s_ucode.bin
+e100/d102e_ucode.bin
+e100/d101m_ucode.bin
+3com/typhoon.bin
+advansys/38C0800.bin
+advansys/38C1600.bin
+advansys/3550.bin
+advansys/mcode.bin
+vntwusb.fw
+radeon/R520_cp.bin
+radeon/REDWOOD_pfp.bin
+radeon/REDWOOD_rlc.bin
+radeon/RV710_pfp.bin
+radeon/RV630_me.bin
+radeon/CEDAR_pfp.bin
+radeon/CYPRESS_rlc.bin
+radeon/R420_cp.bin
+radeon/JUNIPER_pfp.bin
+radeon/CYPRESS_me.bin
+radeon/RS780_me.bin
+radeon/RV620_me.bin
+radeon/REDWOOD_me.bin
+radeon/RV610_pfp.bin
+radeon/R600_rlc.bin
+radeon/RV710_me.bin
+radeon/RV610_me.bin
+radeon/RV620_pfp.bin
+radeon/RS600_cp.bin
+radeon/R200_cp.bin
+radeon/RV635_me.bin
+radeon/JUNIPER_me.bin
+radeon/RV770_pfp.bin
+radeon/RV730_me.bin
+radeon/RV670_me.bin
+radeon/R300_cp.bin
+radeon/RV670_pfp.bin
+radeon/R600_me.bin
+radeon/RV635_pfp.bin
+radeon/RS690_cp.bin
+radeon/CEDAR_rlc.bin
+radeon/RV730_pfp.bin
+radeon/R700_rlc.bin
+radeon/RV770_me.bin
+radeon/R100_cp.bin
+radeon/CEDAR_me.bin
+radeon/CYPRESS_pfp.bin
+radeon/JUNIPER_rlc.bin
+radeon/R600_pfp.bin
+radeon/RS780_pfp.bin
+radeon/RV630_pfp.bin
+dvb-usb-dib0700-1.20.fw
+matrox/g200_warp.fw
+matrox/g400_warp.fw
+kaweth/trigger_code_fix.bin
+kaweth/trigger_code.bin
+kaweth/new_code_fix.bin
+kaweth/new_code.bin
+tigon/tg3_tso5.bin
+tigon/tg3_tso.bin
+tigon/tg3.bin
+agere_sta_fw.bin
+dvb-fe-xc5000-1.6.114.fw
+dabusb/firmware.fw
+dabusb/bitstream.bin
+mts_edge.fw
+r128/r128_cce.bin
+mts_cdma.fw
+cxgb3/ael2005_twx_edc.bin
+cxgb3/ael2005_opt_edc.bin
+cxgb3/t3c_psram-1.1.0.bin
+cxgb3/t3b_psram-1.1.0.bin
+cxgb3/ael2020_twx_edc.bin
+cxgb3/t3fw-7.4.0.bin
+phanfw.bin
+qlogic/1280.bin
+qlogic/sd7220.fw
+qlogic/1040.bin
+qlogic/12160.bin
+ql2400_fw.bin
+ql2100_fw.bin
+ql2500_fw.bin
+ql2300_fw.bin
+ql2200_fw.bin
+ql2322_fw.bin
+rt2561.bin
+rt2860.bin
+rt73.bin
+rt3090.bin
+rt2870.bin
+rt3071.bin
+rt2561s.bin
+rt3070.bin
+rt2661.bin
+rtl_nic/rtl8105e-1.fw
+rtl_nic/rtl8168e-2.fw
+rtl_nic/rtl8168d-2.fw
+rtl_nic/rtl8168e-1.fw
+rtl_nic/rtl8168e-3.fw
+rtl_nic/rtl8168d-1.fw
+RTL8192SU/rtl8192sfw.bin
+rtlwifi/rtl8712u.bin
+RTL8192E/boot.img
+RTL8192E/main.img
+RTL8192E/data.img
+
+av7110/bootcode.bin
+cis/3CCFEM556.cis
+cis/3CXEM556.cis
+cis/COMpad2.cis
+cis/COMpad4.cis
+cis/DP83903.cis
+cis/LA-PCM.cis
+cis/MT5634ZLX.cis
+cis/NE2K.cis
+cis/PCMLM28.cis
+cis/PE-200.cis
+cis/RS-COM-2P.cis
+cis/SW_555_SER.cis
+cis/SW_7xx_SER.cis
+cis/SW_8xx_SER.cis
+cis/tamarack.cis
+dsp56k/bootstrap.bin
+keyspan_pda/keyspan_pda.fw
+keyspan_pda/xircom_pgs.fw
+))};
sub copy_fw {
@@ -169,6 +357,8 @@ while(defined(my $line = <TMP>)) {
$fw = 'cis/PE520.cis';
}
+ next if $debian_fw->{$fw};
+
if (-f "$fwsrc0/$fw") {
copy_fw("$fwsrc0/$fw", $fwdest);
next;
diff --git a/changelog.firmware b/changelog.firmware index 009d888..f92d096
100644
--- a/changelog.firmware
+++ b/changelog.firmware
@@ -1,3 +1,9 @@
+pve-firmware (1.0-13) unstable; urgency=low
+
+ * exclude firmware files distributed by Debian, to allow coexistence
+
+
pve-firmware (1.0-12) unstable; urgency=low
* add Brocade firmware
diff --git a/control.firmware b/control.firmware index 00b949c..cf91e70 100644
--- a/control.firmware
+++ b/control.firmware
@@ -3,8 +3,7 @@ Version: @VERSION@
Section: misc
Priority: optional
Architecture: all
-Suggests: linux-image
-Conflicts: firmware-linux-free, firmware-linux-nonfree
+Suggests: linux-image, firmware-linux, firmware-linux-nonfree,
+firmware-atheros, firmware-bnx2, firmware-bnx2x, firmware-brcm80211,
+firmware-intelwimax, firmware-ipw2x00, firmware-ivtv, firmware-iwlwifi,
+firmware-netxen, firmware-qlogic, firmware-ralink, firmware-realtek
Description: Binary firmware code for the pve-kernel
This package contains the binary firmware for various modules used in
--
1.7.2.5
_______________________________________________
pve-devel mailing list
http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
Derek W. Poon
2011-12-12 12:56:54 UTC
Permalink
Dietmar,

Below is the list of files in pve-firmware-1.0-13 that conflict with Debian. You are right that "Replaces" might be a more appropriate solution.

Derek

firmare-linux-free: lib/firmware/av7110/bootcode.bin
firmare-linux-free: lib/firmware/cis/3CCFEM556.cis
firmare-linux-free: lib/firmware/cis/3CXEM556.cis
firmare-linux-free: lib/firmware/cis/COMpad2.cis
firmare-linux-free: lib/firmware/cis/COMpad4.cis
firmare-linux-free: lib/firmware/cis/DP83903.cis
firmare-linux-free: lib/firmware/cis/LA-PCM.cis
firmare-linux-free: lib/firmware/cis/MT5634ZLX.cis
firmare-linux-free: lib/firmware/cis/NE2K.cis
firmare-linux-free: lib/firmware/cis/PCMLM28.cis
firmare-linux-free: lib/firmware/cis/PE-200.cis
firmare-linux-free: lib/firmware/cis/RS-COM-2P.cis
firmare-linux-free: lib/firmware/cis/SW_555_SER.cis
firmare-linux-free: lib/firmware/cis/SW_7xx_SER.cis
firmare-linux-free: lib/firmware/cis/SW_8xx_SER.cis
firmare-linux-free: lib/firmware/cis/tamarack.cis
firmare-linux-free: lib/firmware/keyspan_pda/keyspan_pda.fw
firmare-linux-free: lib/firmware/keyspan_pda/xircom_pgs.fw
firmware-atheros: lib/firmware/ath3k-1.fw
firmware-bnx2: lib/firmware/bnx2/bnx2-mips-06-5.0.0.j3.fw
firmware-bnx2: lib/firmware/bnx2/bnx2-mips-09-5.0.0.j3.fw
firmware-bnx2: lib/firmware/bnx2/bnx2-rv2p-06-5.0.0.j3.fw
firmware-bnx2: lib/firmware/bnx2/bnx2-rv2p-06-6.0.15.fw
firmware-bnx2: lib/firmware/bnx2/bnx2-rv2p-09-5.0.0.j3.fw
firmware-bnx2: lib/firmware/bnx2/bnx2-rv2p-09-6.0.17.fw
firmware-bnx2: lib/firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw
firmware-bnx2: lib/firmware/bnx2/bnx2-rv2p-09ax-6.0.17.fw
firmware-bnx2x: lib/firmware/bnx2x-e1-5.0.21.0.fw
firmware-bnx2x: lib/firmware/bnx2x-e1h-5.0.21.0.fw
firmware-intelwimax: lib/firmware/i2400m-fw-usb-1.4.sbcf
firmware-intelwimax: lib/firmware/i2400m-fw-usb-1.5.sbcf
firmware-intelwimax: lib/firmware/i6050-fw-usb-1.5.sbcf
firmware-ipw2x00: lib/firmware/ipw2100-1.3-i.fw
firmware-ipw2x00: lib/firmware/ipw2100-1.3-p.fw
firmware-ipw2x00: lib/firmware/ipw2100-1.3.fw
firmware-ipw2x00: lib/firmware/ipw2200-bss.fw
firmware-ipw2x00: lib/firmware/ipw2200-ibss.fw
firmware-ipw2x00: lib/firmware/ipw2200-sniffer.fw
firmware-iwlwifi: lib/firmware/iwlwifi-1000-3.ucode
firmware-iwlwifi: lib/firmware/iwlwifi-3945-2.ucode
firmware-iwlwifi: lib/firmware/iwlwifi-4965-2.ucode
firmware-iwlwifi: lib/firmware/iwlwifi-5000-2.ucode
firmware-iwlwifi: lib/firmware/iwlwifi-5150-2.ucode
firmware-iwlwifi: lib/firmware/iwlwifi-6000-4.ucode
firmware-iwlwifi: lib/firmware/iwlwifi-6000g2a-5.ucode
firmware-iwlwifi: lib/firmware/iwlwifi-6000g2b-5.ucode
firmware-iwlwifi: lib/firmware/iwlwifi-6050-4.ucode
firmware-iwlwifi: lib/firmware/iwlwifi-6050-5.ucode
firmware-linux-nonfree: lib/firmware/3com/typhoon.bin
firmware-linux-nonfree: lib/firmware/advansys/3550.bin
firmware-linux-nonfree: lib/firmware/advansys/38C0800.bin
firmware-linux-nonfree: lib/firmware/advansys/38C1600.bin
firmware-linux-nonfree: lib/firmware/advansys/mcode.bin
firmware-linux-nonfree: lib/firmware/agere_ap_fw.bin
firmware-linux-nonfree: lib/firmware/agere_sta_fw.bin
firmware-linux-nonfree: lib/firmware/cxgb3/ael2005_opt_edc.bin
firmware-linux-nonfree: lib/firmware/cxgb3/ael2005_twx_edc.bin
firmware-linux-nonfree: lib/firmware/cxgb3/ael2020_twx_edc.bin
firmware-linux-nonfree: lib/firmware/cxgb3/t3b_psram-1.1.0.bin
firmware-linux-nonfree: lib/firmware/cxgb3/t3c_psram-1.1.0.bin
firmware-linux-nonfree: lib/firmware/cxgb3/t3fw-7.4.0.bin
firmware-linux-nonfree: lib/firmware/dabusb/bitstream.bin
firmware-linux-nonfree: lib/firmware/dabusb/firmware.fw
firmware-linux-nonfree: lib/firmware/e100/d101m_ucode.bin
firmware-linux-nonfree: lib/firmware/e100/d101s_ucode.bin
firmware-linux-nonfree: lib/firmware/e100/d102e_ucode.bin
firmware-linux-nonfree: lib/firmware/kaweth/new_code.bin
firmware-linux-nonfree: lib/firmware/kaweth/new_code_fix.bin
firmware-linux-nonfree: lib/firmware/kaweth/trigger_code.bin
firmware-linux-nonfree: lib/firmware/kaweth/trigger_code_fix.bin
firmware-linux-nonfree: lib/firmware/matrox/g200_warp.fw
firmware-linux-nonfree: lib/firmware/matrox/g400_warp.fw
firmware-linux-nonfree: lib/firmware/mts_cdma.fw
firmware-linux-nonfree: lib/firmware/mts_edge.fw
firmware-linux-nonfree: lib/firmware/mts_gsm.fw
firmware-linux-nonfree: lib/firmware/r128/r128_cce.bin
firmware-linux-nonfree: lib/firmware/radeon/CEDAR_me.bin
firmware-linux-nonfree: lib/firmware/radeon/CEDAR_pfp.bin
firmware-linux-nonfree: lib/firmware/radeon/CEDAR_rlc.bin
firmware-linux-nonfree: lib/firmware/radeon/CYPRESS_me.bin
firmware-linux-nonfree: lib/firmware/radeon/CYPRESS_pfp.bin
firmware-linux-nonfree: lib/firmware/radeon/CYPRESS_rlc.bin
firmware-linux-nonfree: lib/firmware/radeon/JUNIPER_me.bin
firmware-linux-nonfree: lib/firmware/radeon/JUNIPER_pfp.bin
firmware-linux-nonfree: lib/firmware/radeon/JUNIPER_rlc.bin
firmware-linux-nonfree: lib/firmware/radeon/R100_cp.bin
firmware-linux-nonfree: lib/firmware/radeon/R200_cp.bin
firmware-linux-nonfree: lib/firmware/radeon/R300_cp.bin
firmware-linux-nonfree: lib/firmware/radeon/R420_cp.bin
firmware-linux-nonfree: lib/firmware/radeon/R520_cp.bin
firmware-linux-nonfree: lib/firmware/radeon/R600_me.bin
firmware-linux-nonfree: lib/firmware/radeon/R600_pfp.bin
firmware-linux-nonfree: lib/firmware/radeon/R600_rlc.bin
firmware-linux-nonfree: lib/firmware/radeon/R700_rlc.bin
firmware-linux-nonfree: lib/firmware/radeon/REDWOOD_me.bin
firmware-linux-nonfree: lib/firmware/radeon/REDWOOD_pfp.bin
firmware-linux-nonfree: lib/firmware/radeon/REDWOOD_rlc.bin
firmware-linux-nonfree: lib/firmware/radeon/RS600_cp.bin
firmware-linux-nonfree: lib/firmware/radeon/RS690_cp.bin
firmware-linux-nonfree: lib/firmware/radeon/RS780_me.bin
firmware-linux-nonfree: lib/firmware/radeon/RS780_pfp.bin
firmware-linux-nonfree: lib/firmware/radeon/RV610_me.bin
firmware-linux-nonfree: lib/firmware/radeon/RV610_pfp.bin
firmware-linux-nonfree: lib/firmware/radeon/RV620_me.bin
firmware-linux-nonfree: lib/firmware/radeon/RV620_pfp.bin
firmware-linux-nonfree: lib/firmware/radeon/RV630_me.bin
firmware-linux-nonfree: lib/firmware/radeon/RV630_pfp.bin
firmware-linux-nonfree: lib/firmware/radeon/RV635_me.bin
firmware-linux-nonfree: lib/firmware/radeon/RV635_pfp.bin
firmware-linux-nonfree: lib/firmware/radeon/RV670_me.bin
firmware-linux-nonfree: lib/firmware/radeon/RV670_pfp.bin
firmware-linux-nonfree: lib/firmware/radeon/RV710_me.bin
firmware-linux-nonfree: lib/firmware/radeon/RV710_pfp.bin
firmware-linux-nonfree: lib/firmware/radeon/RV730_me.bin
firmware-linux-nonfree: lib/firmware/radeon/RV730_pfp.bin
firmware-linux-nonfree: lib/firmware/radeon/RV770_me.bin
firmware-linux-nonfree: lib/firmware/radeon/RV770_pfp.bin
firmware-linux-nonfree: lib/firmware/tehuti/bdx.bin
firmware-linux-nonfree: lib/firmware/tigon/tg3.bin
firmware-linux-nonfree: lib/firmware/tigon/tg3_tso.bin
firmware-linux-nonfree: lib/firmware/tigon/tg3_tso5.bin
firmware-netxen: lib/firmware/phanfw.bin
firmware-qlogic: lib/firmware/ql2100_fw.bin
firmware-qlogic: lib/firmware/ql2200_fw.bin
firmware-qlogic: lib/firmware/ql2300_fw.bin
firmware-qlogic: lib/firmware/ql2322_fw.bin
firmware-qlogic: lib/firmware/ql2400_fw.bin
firmware-qlogic: lib/firmware/ql2500_fw.bin
firmware-qlogic: lib/firmware/qlogic/1040.bin
firmware-qlogic: lib/firmware/qlogic/12160.bin
firmware-qlogic: lib/firmware/qlogic/1280.bin
firmware-qlogic: lib/firmware/qlogic/sd7220.fw
firmware-ralink: lib/firmware/rt2561.bin
firmware-ralink: lib/firmware/rt2561s.bin
firmware-ralink: lib/firmware/rt2661.bin
firmware-ralink: lib/firmware/rt2860.bin
firmware-ralink: lib/firmware/rt2870.bin
firmware-ralink: lib/firmware/rt3070.bin
firmware-ralink: lib/firmware/rt3071.bin
firmware-ralink: lib/firmware/rt3090.bin
firmware-ralink: lib/firmware/rt73.bin
firmware-realtek: lib/firmware/RTL8192E/boot.img
firmware-realtek: lib/firmware/RTL8192E/data.img
firmware-realtek: lib/firmware/RTL8192E/main.img
firmware-realtek: lib/firmware/RTL8192SU/rtl8192sfw.bin
firmware-realtek: lib/firmware/rtl_nic/rtl8168d-1.fw
firmware-realtek: lib/firmware/rtl_nic/rtl8168d-2.fw
Post by Dietmar Maurer
The whole purpose of the pve-firmware package is that it includes 'all'
necessary (all referenced) firmware drivers.
So the correct way to fix that is to add 'Conflict' and 'Replaces' tags in the control file.
So what packages makes problems exactly?
- Dietmar
-----Original Message-----
Sent: Freitag, 09. Dezember 2011 23:15
Subject: [pve-devel] [PATCH] exclude firmware files distributed by Debian
To allow coexistence with Debian packages, exclude firmware files already
distributed by Debian when building pve-firmware. Otherwise, proxmox-ve
could fail to install on top of an existing Debian system.
---
Makefile | 2 +-
assemble-firmware.pl | 210
+++++++++++++++++++++++++++++++++++++++++++++++---
changelog.firmware | 6 ++
control.firmware | 3 +-
4 files changed, 208 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile
index cc6d6f2..e1a1a72 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ KERNEL_CFG=config-${KERNEL_VER}
KERNEL_CFG_ORG=config-${KERNEL_VER}-${OVZVER}.x86_64
[...]
Dietmar Maurer
2011-12-13 05:44:38 UTC
Permalink
Post by Derek W. Poon
Below is the list of files in pve-firmware-1.0-13 that conflict with Debian. You
are right that "Replaces" might be a more appropriate solution.
Thanks - see:

https://git.proxmox.com/?p=pve-kernel-2.6.32.git;a=commit;h=12a08adb22dac8a283f890832bd0e9cca3168198

- Dietmar

Loading...