Package: kvm
Version: 53-1
Severity: serious
Justification: Policy 2.1

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1


The orig.tar.gz you ship contains around 1 MB of various blobs. This
violates the LGPL under which most of them are released (you're shipping
binaries without accompanying source code) and it's also in violation of
the dfsg.

I've revived your old get-orig-source target from debian/rules and
extended it to remove the additional violating files, and also adding a
work around to make qemu's build system happy (patch attached, mostly
taken from qemu) and adding the proper dependencies to the kvm binary
package (bochsbios-qemu (new package, patch sent to Debian's bochs
maintainer), and vgabios) and putting symlinks in place, just like qemu
does it.

- -- System Information:
Debian Release: lenny/sid
  APT prefers hardy
  APT policy: (500, 'hardy')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.22-14-generic (SMP w/2 CPU cores)
Locale: LANG=da_DK.UTF-8, LC_CTYPE=da_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFHSqw6onjfXui9pOMRAkJVAJ4nyZt02MOK0e+JBfC2R+XF161b1ACgm7RQ
q9TVJguQSSkkTDPQgt/hsCc=
=2UhR
-----END PGP SIGNATURE-----
diff -urNw ../debian/kvm-53/debian/links debian/links
--- ../debian/kvm-53/debian/links       1970-01-01 01:00:00.000000000 +0100
+++ debian/links        2007-11-26 10:30:24.992510362 +0100
@@ -0,0 +1,3 @@
+usr/share/bochs/BIOS-bochs-latest-qemu usr/share/kvm/bios.bin
+usr/share/vgabios/vgabios.bin usr/share/kvm/vgabios.bin
+usr/share/vgabios/vgabios.cirrus.bin usr/share/kvm/vgabios-cirrus.bin
diff -urNw ../debian/kvm-53/debian/rules debian/rules
--- ../debian/kvm-53/debian/rules       2007-11-26 11:55:22.000000000 +0100
+++ debian/rules        2007-11-26 11:48:23.255340144 +0100
@@ -91,7 +91,7 @@
 
        # Add here command to compile/build the package.
        $(MAKE) qemu
-       $(MAKE) -C qemu/pc-bios
+#      $(MAKE) -C qemu/pc-bios
        touch $@
 
 # the binary-modules rule is invoked by module-assistant while processing the
@@ -142,7 +142,7 @@
        rm -f config.sub config.guess
 
        # Add here commands to clean up after the build process.
-       -$(MAKE) -C qemu/pc-bios clean
+#      -$(MAKE) -C qemu/pc-bios clean
        -$(MAKE) -C qemu distclean
        -$(MAKE) clean
 
@@ -155,7 +155,7 @@
 ifeq (1, 1)
 
 # Removing non-x86 bioses + linux_boot.bin which currently escapes to the metal
-unwanted_bios_files = ppc_rom.bin proll.elf openbios-sparc32 video.x 
linux_boot.bin pxe-ne2k_pci.bin pxe-pcnet.bin pxe-rtl8139.bin
+unwanted_bios_files = ppc_rom.bin openbios-sparc32 video.x pxe-ne2k_pci.bin 
pxe-pcnet.bin pxe-rtl8139.bin bios.bin vgabios.bin vgabios-cirrus.bin 
 
 else
 
@@ -173,10 +173,19 @@
        # Create the directories to install the source into
        dh_installdirs -p$(psource)  usr/src/modules/$(sname)/debian
 
+       # Make qemu's "make install" happy
+       for i in $(unwanted_bios_files); do \
+               touch qemu/pc-bios/$$i; \
+       done
        # Build & install normally, remove extraneous files
        $(MAKE) -C libkvm DESTDIR=$(CURDIR)/debian/$(sname) install
        $(MAKE) -C qemu DESTDIR=$(CURDIR)/debian/$(sname) install
 
+       # Clean up the mess
+       for i in $(unwanted_bios_files); do \
+               rm -f qemu/pc-bios/$$i debian/tmp/usr/share/kvm/$$i; \
+       done
+
        # Add here commands to install the package into debian/kvm.
        dh_install
        mv $(CURDIR)/debian/kvm/usr/bin/$(QEMU_EXE) 
$(CURDIR)/debian/kvm/usr/bin/kvm
@@ -284,4 +294,47 @@
 
 binary: binary-indep binary-arch
 
+# get-orig-source adapted from 
/usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk from the gnome-pkg-tools 
package
+# copied from CDBS' buildvars
+DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut 
-f 2 -d ':'))
+DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' 
')
+DEB_NOEPOCH_VERSION ?= $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION ?= $(shell echo $(DEB_NOEPOCH_VERSION) | sed 
's/+[^-]*-[^-]*$$//')
+
+# where to store the resulting .orig tarball
+DEB_TARBALL_DOWNLOAD_DIR ?= ../tarballs
+TARBALL_EXT ?= tar.gz
+
+SF_PROJECT ?= $(DEB_SOURCE_PACKAGE)
+SF_MODULE ?= $(DEB_SOURCE_PACKAGE)
+SF_TARBALL ?= $(SF_MODULE)-$(DEB_UPSTREAM_VERSION).$(TARBALL_EXT)
+SF_DOWNLOAD_URL ?= 
http://$$sf_mirror.dl.sourceforge.net/$(SF_PROJECT)/$(SF_TARBALL)
+SF_MIRRORS ?= belnet easynews heanet internap jaist kent mesh nchc optusnet 
ovh puzzle superb-east superb-west surfnet switch ufpr umn
+SF_DOWNLOAD_COMMAND ?= for sf_mirror in $(SF_MIRRORS); do wget -N -nv -T10 -t1 
-O 
$(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.$(TARBALL_EXT)
 $(SF_DOWNLOAD_URL) && break; done
+
+get-orig-source:
+       dh_testdir
+       @@echo 'Source package:                      $(DEB_SOURCE_PACKAGE)'
+       @@echo 'Source package:                      $(DEB_VERSION)'
+       @@echo 'Source version without epoch:        $(DEB_NOEPOCH_VERSION)'
+       @@echo 'Upstream version (for orig tarball): $(DEB_UPSTREAM_VERSION)'
+       mkdir -p $(DEB_TARBALL_DOWNLOAD_DIR)
+       $(SF_DOWNLOAD_COMMAND)
+       case "$(TARBALL_EXT)" in \
+       tar.bz2|tbz) \
+         bzcat 
$(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.$(TARBALL_EXT)
 | \
+         gzip -9 
>$(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
 ; \
+         rm -f 
$(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.$(TARBALL_EXT)
 \
+         ;;\
+       esac
+       cd $(DEB_TARBALL_DOWNLOAD_DIR) && \
+         tar xzf $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz && \
+         rm -f $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/bios/VGABIOS* && \
+         rm -f $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/bios/*.bin && \
+         rm -f 
$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/qemu/pc-bios/openbios* && \
+         rm -f 
$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/qemu/pc-bios/*.bin && \
+         tar c $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION) | \
+         gzip -9 
>$(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION)+dfsg.orig.tar.gz
+
+
 .PHONY: build clean binary-indep binary-arch binary install  binary-modules 
kdist kdist_configure kdist_config kdist_image kdist_clean

Reply via email to