Commit Graph

1059 Commits

Author SHA1 Message Date
Aron Xu
8f629c24a9 Remove patches merged upstream 2013-08-24 14:30:03 +08:00
Aron Xu
80093b6f72 Imported Upstream version 0.6.2 2013-08-24 13:16:01 +08:00
Aron Xu
7190d90dca Merge tag 'upstream/0.6.2'
Upstream version 0.6.2
2013-08-24 13:16:01 +08:00
Aron Xu
9d447e8726 Add upstream patch to fix delay() 2013-07-29 17:33:37 +08:00
Aron Xu
819565fc23 Update changelog 2013-07-29 16:06:10 +08:00
Aron Xu
88bead7cc9 Add linux 3.10 compatibility patch from upstream. (Closes: #717565) 2013-07-29 16:02:53 +08:00
Aron Xu
1036314515 Add license info for scripts/kmodtool 2013-07-15 01:46:57 +08:00
Aron Xu
e8007a1d07 Add README.Source for binary module package generation 2013-07-14 04:14:14 +08:00
Aron Xu
9436c4b578 Allow setting KVERS 2013-07-14 02:38:05 +08:00
Aron Xu
8779fc7aa6 Use correct debian revison for pkg version 2013-07-13 04:39:39 +08:00
Aron Xu
afe81338fd Add essential maintainer scripts 2013-07-13 03:48:21 +08:00
Aron Xu
a1291bf008 Recommend spl-moudles first 2013-07-13 03:35:36 +08:00
Aron Xu
1b3abdac4a Add kernel package dependency 2013-07-13 03:35:06 +08:00
Aron Xu
51caf98506 Remove redundant destdir parameter 2013-07-13 03:26:50 +08:00
Aron Xu
833595243c Remove redundant ARCH 2013-07-13 03:26:50 +08:00
Aron Xu
01d50ac880 Add KVERS 2013-07-13 03:14:40 +08:00
Aron Xu
c168c73c0a Restore control file on clean 2013-07-13 02:50:07 +08:00
Aron Xu
c3ea64f7f6 Replace dh_clean -k with dh_prep 2013-07-13 02:25:29 +08:00
Turbo Fredriksson
2f30af71fb Retrieve the arch from 'dpkg', don't hardcode it to 'amd64'.
+ Also install modules to '/lib/modules/<VERSION>-<ARCH>/'.
2013-07-13 02:20:38 +08:00
Turbo Fredriksson
05d9813864 * linux-headers-_KVERS_ is a virtual package. Instead, depend on
linux-headers-_KVERS_-common AND linux-headers-_KVERS_-amd64.
* find kernel source in $KSRC and kernel objects in $KOBJ.
2013-07-13 02:20:38 +08:00
Aron Xu
3d3fd67f31 * Build udebs and optionally modules package(s) - both .deb and .udeb.
* The spl-modules-udeb must depend on zlib-modules-udeb for zlib_deflate module.
* Files for the 'normal' module to install in the correct place.

Conflicts:
	debian/changelog
2013-07-13 02:20:29 +08:00
Aron Xu
a2d06baac8 Release to experimental 2013-07-04 15:59:18 +08:00
Aron Xu
3e9e3c0311 Add lintian overrides 2013-07-04 15:42:44 +08:00
Aron Xu
771c5fcdb9 Correct Closes entry 2013-07-01 22:06:17 +08:00
Aron Xu
b70ebad3aa Correct bracket 2013-07-01 22:05:48 +08:00
Aron Xu
aad7edc3da Be more detailed for GPL-2+ 2013-06-29 01:44:43 +08:00
Aron Xu
1944bb37ed Correct upstream URL. 2013-06-29 01:35:50 +08:00
Aron Xu
7f4ae0c7eb Use /usr/bin/printf directly
We need printf from coreutils to make sure it supports byte format,
however there are shells that have which a builtin command, returning
something not as expected. There is no problem to use the path directly
since coreutils is the Priority:required so we can assume its presence.
2013-05-31 03:41:45 +08:00
Aron Xu
61716cbcb7 Various small improvements to d/control d/compat
* Std-ver: 3.9.4
 * Add Uploaders field.
 * Increase compatible level of dh to 9, to take the advantage of
   hardening, etc.
 * Enhance the Recommends version of spl.
 * Improve long descriptions.
2013-05-31 03:13:22 +08:00
Carlos Alberto Lopez Perez
5af840bfb1 Forget about .pc files 2013-05-01 17:01:25 +02:00
Carlos Alberto Lopez Perez
76f2001fec Imported Upstream version 0.6.1 2013-04-10 03:07:06 +02:00
Carlos Alberto Lopez Perez
7080f6be51 Merge tag 'upstream/0.6.1'
Upstream version 0.6.1
2013-04-10 03:07:06 +02:00
Carlos Alberto Lopez Perez
4334280e37 Remove debuild-ppa.sh
* Remove the helper script for uploading to PPA.
2013-04-09 12:22:49 +02:00
Aron Xu
49cd3a7c99 Merge branch 'clopez' 2013-04-08 16:36:44 +08:00
Aron Xu
7289309f6c Merge tag 'upstream/0.6.1'
Upstream version 0.6.1

Conflicts:
	.gitignore
	README.markdown
	rpm/fedora/spl-dkms.spec.in
	rpm/fedora/spl.spec.in
2013-04-08 14:23:22 +08:00
Aron Xu
d956cfacce Imported Upstream version 0.6.1 2013-04-08 14:22:35 +08:00
Carlos Alberto Lopez Perez
d05a66dad6 Fix and improve the generation of the stripped kernel source tree
* Commit 493972c8 broke the rules used for the generation of the
    stripped kernel source tree because of the requirement of the
    rpm directory to be present for CONFIG_KERNEL
    (which is clearly not required for us).

  * Add a new rule to sed Makefile.am and manually set "SUBDIRS" to
    "module include" for CONFIG_KERNEL and remove it for the other
    configs.

    * This has the benefit that now running ./configure --with-config=user
    && make in the DKMS source tree is a nop while before it gave
    an error.

  * Improve the robustness of the rules by ensuring that they will
    abort if something is not as expected.
2013-04-02 23:10:35 +02:00
Carlos Alberto Lopez Perez
3cd0bf1b52 Reset changelog and update maintainer and vcs fields on debian/control 2013-04-02 02:03:38 +02:00
Carlos Alberto Lopez Perez
b1b5a49c30 Lower DKMS version requirements to Squeeze version.
* Squeeze DKMS version is 2.1.1.2-5
2013-04-02 01:40:05 +02:00
Carlos Alberto Lopez Perez
8050e22266 Fix debian/watch (another time)
* Upstream is not longer using github to distribute tarballs
   * 0.6.1 tarballs were not added (as the time of writing this) to
     https://github.com/zfsonlinux/spl/downloads
 * Update the url to http://zfsonlinux.org/
 * uscan --report-status now says:
   Newest version on remote site is 0.6.1, local version is 0.6.1
   => Package is up to date
2013-04-02 01:36:42 +02:00
Carlos Alberto Lopez Perez
63dc177621 Merge branch 'upstream' 2013-04-02 01:00:20 +02:00
Brian Behlendorf
6385874dbf Tag spl-0.6.1
META file and release log updated.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2013-03-25 13:46:47 -07:00
Brian Behlendorf
8636968f9a Provide ${kmodname}-devel-kmod for yum-builddep
In order to ensure that yum-builddep pulls in all the build
requirements a generic ${kmodname}-devel-kmod provides line is
added.  This allows a version of the development headers to be
included without requiring knowledge of the kernel version.

This is important because unlike rpmbuild which does correctly
expand the source rpm spec file, yum-builddep does not.  Without
this generic provides line mock which relies on yum-builddep is
unable to automatically satisfy the dependency.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2013-03-25 13:30:22 -07:00
Brian Behlendorf
c14183adca Use 'git describe' for working builds
When building from an arbitrary commit in the git tree it's useful
for the resulting packages to be uniquely identifiable.  Therefore,
the build system has been updated to detect if your compiling in
git tree.

If you are building in a git tree, and there are commits after the
last annotated tag.  Then the <id>-<hash> component of 'git describe'
will be used to overwrite the 'Release:' field in the META file.

The only tricky part is that to ensure the 'make dist' tarball is
built using the correct release.  A dist-hook was added to the top
level make file to rewrite the META file using the correct release.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #195
Issue #111
2013-03-22 15:00:55 -07:00
Richard Yao
feaf1e321d Do not call cond_resched() in spl_slab_reclaim()
Calling cond_resched() after each object is freed and then after each
slab is freed can cause slabs of objects to live for excessive periods
of time following reclaimation. This interferes with the kernel's own
memory management when called from kswapd and can cause direct reclaim
to occur in response to memory pressure that should have been resolved.

Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
2013-03-21 12:58:44 -07:00
Brian Behlendorf
bef14fbc8c Use requested kernel for dkms builds
The --with-linux and --with-linux-obj options must be specified
as part of the dkms build otherwise the package will be built
against the running kernel.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2013-03-20 16:01:29 -07:00
Brian Behlendorf
19e9d8fd61 Remove spl-dkms conflict with spl-kmod
Because the spl-dkms package also provides spl-kmod for the
spl user package yum flags this as a conflict.  To avoid the
problem remove the Conflicts tag from spl-dkms and just rely
on the one in spl-kmod.

  spl-dkms-0.6.0-rc14.fc18.noarch has installed conflicts
    spl-kmod: spl-dkms-0.6.0-rc14.fc18.noarch

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2013-03-20 11:33:15 -07:00
Darik Horn
4074820904 Create splat man page
The automake templates have been updated to install this man
page and the existing packaging was updated to include it.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2013-03-19 13:47:12 -07:00
Brian Behlendorf
493972c896 Refresh RPM packaging
Refresh the existing RPM packaging to conform to the 'Fedora
Packaging Guidelines'.  This includes adopting the kmods2
packaging standard which is used fod kmods distributed by
rpmfusion for Fedora/RHEL.

  http://fedoraproject.org/wiki/Packaging:Guidelines
  http://rpmfusion.org/Packaging/KernelModules/Kmods2

While the spec files have been entirely rewritten from a
user perspective the only major changes are:

* The Fedora packages now have a build dependency on the
  rpmfusion repositories.  The generic kmod packages also
  have a new dependency on kmodtool-1.22 but it is bundled
  with the source rpm so no additional packages are needed.

* The kernel binary module packages have been renamed from
  spl-modules-* to kmod-spl-* as specificed by kmods2.

* The is now a common kmod-spl-devel-* package in addition
  to the per-kernel devel packages.  The common package
  contains the development headers while the per-kernel
  package contains kernel specific build products.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #222
2013-03-18 15:31:54 -07:00
Carlos Alberto Lopez Perez
74f8c656ca Fix debian/watch
* Only report non-rc versions.
  * uscan --report-status now says:
      Newest version on remote site is 0.5.2
2013-03-16 23:52:23 +01:00