diff options
author | Noe Rubinstein <nrubinstein@avencall.com> | 2012-12-03 18:13:46 +0100 |
---|---|---|
committer | Noe Rubinstein <nrubinstein@avencall.com> | 2012-12-03 18:13:46 +0100 |
commit | 267c4c59a508e8ef8b0477725353ecd0e3b18a4a (patch) | |
tree | 3661046b6bdb295305f3f6494143ba8ffd714942 | |
parent | 8692adaf8eb639932a0c0fc04ddaf567d04c080c (diff) |
Revert "Try to use the example from module-assistant"
This reverts commit dd952c2c643205f6f34e6f020ec62976c4c54355.
-rw-r--r-- | debian/README.Debian | 30 | ||||
-rw-r--r-- | debian/changelog | 8 | ||||
-rw-r--r-- | debian/compat | 2 | ||||
-rw-r--r-- | debian/control | 25 | ||||
-rw-r--r-- | debian/control.modules.in | 21 | ||||
-rw-r--r-- | debian/copyright | 18 | ||||
-rwxr-xr-x | debian/rules | 128 |
7 files changed, 51 insertions, 181 deletions
diff --git a/debian/README.Debian b/debian/README.Debian index 0bf2d3d..071a7f7 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,28 +1,6 @@ -someproject for Debian ------------------- +xivo-e1000 for Debian +--------------------- -o How do i build this module the debian way? - -- Building with module-assistant - -$ m-a a-i someproject - -(for kernel source or headers in non-standard directory, add the option --k /path/to/kernel/source with the correct path) - -- Building with make-kpkg - -$ cd /usr/src/ -$ ta jxvf someproject.tar.bz2 -$ cd /usr/src/kernel-source-2.6.9 -$ make-kpkg --added-modules=someproject modules - -- Building without make-kpkg - -$ cd /usr/src/ -$ tar jxvf someproject.tar.bz2 -$ cd modules/someproject -$ fakeroot debian/rules kdist_image - -(no fakeroot needed if you run this as root) +<possible notes regarding this package - if none, delete this file> + -- Noé Rubinstein <nrubinstein@avencall.com> Fri, 14 Sep 2012 08:07:33 +0200 diff --git a/debian/changelog b/debian/changelog index ab19183..d2d4e58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,5 @@ -xivo-e1000 (0.1) UNRELEASED; urgency=low +xivo-e1000 (0.1) squeeze-xivo-skaro-dev; urgency=low - * NOT RELEASED YET - * Initial release - - -- Noé Rubinstein <nrubinstein@avencall.com> Tue, 27 Nov 2012 18:14:44 +0100 + * Initial Release. + -- Noé Rubinstein <nrubinstein@avencall.com> Mon, 26 Nov 2012 16:31:52 +0100 diff --git a/debian/compat b/debian/compat index b8626c4..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +7 diff --git a/debian/control b/debian/control index f62bc28..555d765 100644 --- a/debian/control +++ b/debian/control @@ -1,18 +1,15 @@ Source: xivo-e1000 Section: kernel -Priority: optional +Priority: extra Maintainer: Noé Rubinstein <nrubinstein@avencall.com> -Build-Depends: debhelper (>= 4.0.0), bzip2 -Standards-Version: 3.6.1 - -Package: xivo-e1000-source -Architecture: all -Depends: module-assistant, bzip2, debhelper (>= 5.0.37) -Description: source for the e1000 driver with support for Intel EP80579 - This package provides the e1000 driver with added support for Intel EP80579 - (a.k.a. Tolapai) GbE MAC. It also supports several OEM PHYs and the XiVO IPBX - Open Hardware platform. - . - This package contains the module source. The kernel driver can be built from - it using module-assistant or make-kpkg. +Build-Depends: debhelper (>= 7.0.50~), dkms, linux-headers-2.6-686 | linux-headers-2.6-amd64 | linux-headers-generic | linux-headers +Standards-Version: 3.8.4 +Homepage: http://wiki.xivo.fr +#Vcs-Git: git://git.debian.org/collab-maint/xivo-e1000.git +#Vcs-Browser: http://git.debian.org/?p=collab-maint/xivo-e1000.git;a=summary +Package: xivo-e1000 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: e1000 driver with support for Intel EP80579 + e1000 driver with support for Intel EP80579 diff --git a/debian/control.modules.in b/debian/control.modules.in deleted file mode 100644 index 1d617af..0000000 --- a/debian/control.modules.in +++ /dev/null @@ -1,21 +0,0 @@ -Source: xivo-e1000 -Section: kernel -Priority: optional -Maintainer: Noé Rubinstein <nrubinstein@avencall.com> -Build-Depends: debhelper (>= 4.0.0), bzip2 - -Package: xivo-e1000-modules-_KVERS_ -Architecture: i386 -Recommends: kernel-image-_KVERS_ -Provides: xivo-e1000-modules -Description: e1000 Linux kernel module with support for Intel EP805879 - This package provides the e1000 driver with added support for Intel EP80579 - (a.k.a. Tolapai) GbE MAC. It also supports several OEM PHYs and the XiVO IPBX - Open Hardware platform. - . - This package contains modules for the - kernel-image-_KVERS_ package. - . - If you compiled a custom kernel, you will most likely need to compile a - custom version of this module as well. The someproject-source - package has been provided for this purpose. diff --git a/debian/copyright b/debian/copyright index 5926d63..cbd2dfb 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,6 +2,10 @@ This work was packaged for Debian by: Noé Rubinstein <nrubinstein@avencall.com> on Fri, 14 Sep 2012 08:07:33 +0200 +It was downloaded from: + + <url://example.com> + Upstream Author(s): <put author's name and email here> @@ -14,9 +18,16 @@ Copyright: License: +### SELECT: ### + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. +### OR ### This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation. +########## This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -31,13 +42,12 @@ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". The Debian packaging is: - Copyright (C) 2012 Noé Rubinstein <nrubinstein@avencall.com>, - Nicolas Hicher <nhicher@avencall.com> + Copyright (C) 2012 Noé Rubinstein <nrubinstein@avencall.com> you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. -module-assistant is released under the GPL (see the COPYING file in the -distribution for details, or /usr/share/common-licenses/GPL on Debian systems) +# Please also look if there are files or directories which have a +# different copyright/license attached and list them here. diff --git a/debian/rules b/debian/rules index d8c1f3c..f4ac636 100755 --- a/debian/rules +++ b/debian/rules @@ -1,111 +1,19 @@ #!/usr/bin/make -f - -#export DH_VERBOSE=1 - -PACKAGE_NAME = xivo-e1000 - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -configure: configure-stamp -configure-stamp: - dh_testdir - touch configure-stamp - -build-arch: configure-stamp build-arch-stamp -build-arch-stamp: - dh_testdir - $(MAKE) unionctl uniondbg LINUXSRC=/usr/include - touch build-arch-stamp - -build-indep: configure-stamp build-indep-stamp -build-indep-stamp: - dh_testdir - touch build-indep-stamp - -build: build-arch build-indep - -clean: - dh_testdir - rm -f build-arch-stamp build-indep-stamp configure-stamp - -$(MAKE) clean - dh_clean - -install: DH_OPTIONS= -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs -i usr/src/modules/$(PACKAGE_NAME)/debian - dh_installdirs -a usr/sbin - - # $(MAKE) installbins PREFIX=debian/$(PACKAGE_NAME)-utils/usr - tar -v -c --exclude ".svn" --exclude "CVS" --exclude "debian" . | tar x -C debian/$(PACKAGE_NAME)-source/usr/src/modules/$(PACKAGE_NAME) - cp -a debian/compat debian/*modules.in debian/rules debian/copyright debian/changelog debian/$(PACKAGE_NAME)-source/usr/src/modules/$(PACKAGE_NAME)/debian - cd debian/$(PACKAGE_NAME)-source/usr/src && tar c modules | bzip2 -9 > $(PACKAGE_NAME).tar.bz2 && rm -rf modules - - dh_install - -binary-indep: build install - dh_testdir -i - dh_testroot -i - dh_installchangelogs ChangeLog -i - dh_installdocs -i - dh_link -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_shlibdeps -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - -binary-arch: build install - dh_testdir -s - dh_testroot -s - dh_installdocs -s - dh_installchangelogs ChangeLog -s - dh_strip -s - dh_link -s - dh_compress -s - dh_fixperms -s - dh_installdeb -s - dh_shlibdeps -s - dh_gencontrol -s - dh_md5sums -s - dh_builddeb -s - -# module-assistant stuff -PACKAGE = $(PACKAGE_NAME)-modules -MA_DIR ?= /usr/share/modass --include $(MA_DIR)/include/generic.make --include $(MA_DIR)/include/common-rules.make - -kdist_clean: prep-deb-files - dh_clean - $(MAKE) clean - -kdist_config: prep-deb-files -binary-modules: kdist_config - dh_testdir - dh_testroot - dh_clean -k -# build and install the module - $(MAKE) KVERS=$(KVERS) LINUXSRC=$(KSRC) MODPREFIX=$(CURDIR)/debian/$(PKGNAME)/ installmod - dh_installdocs - dh_installchangelogs - dh_compress - dh_fixperms - dh_installmodules - dh_installdeb - dh_gencontrol -- -v$(VERSION) - dh_md5sums - dh_builddeb --destdir=$(DEB_DESTDIR) - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure binary-modules kdist kdist_config kdist_image kdist_clean +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +export DH_VERBOSE=1 +export KSRC="/usr/src/linux-headers-2.6.32-5-686" + +DESTDIR=$(CURDIR)/debian/tmp + +override_dh_auto_install: + mkdir -p debian/xivo-e1000/lib/modules/`uname -r`/extra + cp $(CURDIR)/e1000.ko debian/xivo-e1000/lib/modules/ +%: + dh $@ |