Commit Graph

1849 Commits

Author SHA1 Message Date
Aron Xu
601ccf9c82 Remove sourcing of /etc/init/vars.sh
Since the removal of /etc/init/rw, /etc/init/*.sh are treated as
internal APIs so that should not be sourced. The line is kept for
ease of back porting.
2013-07-05 23:17:18 +08:00
Aron Xu
9d521a01d1 Remove .la files 2013-07-05 22:00:48 +08:00
Aron Xu
cae4768578 -dbg packages should have extra priority. 2013-07-05 17:16:07 +08:00
Aron Xu
4b4e2395ee Move NEWS to README.Debian
Since we are doing initial release, information currently in NEWS is
not that interesting to be treated as something new. However, those
information are useful and should be retained, thus moved to
README.Debian.
2013-07-05 16:59:34 +08:00
Aron Xu
9ead0bc878 Fix provides in init scripts. 2013-07-05 16:56:02 +08:00
Aron Xu
01dd266eff Little update to NEWS 2013-07-04 23:17:23 +08:00
Aron Xu
f7732a51b7 Correct Closes entry 2013-07-04 23:15:48 +08:00
Aron Xu
319219de4d Add Simplified Chinese translation. 2013-07-04 22:45:47 +08:00
Aron Xu
8d1fb6ecb0 Add po-debconf and debconf dependencies 2013-07-04 22:14:02 +08:00
Aron Xu
a74aacc622 Add POTFILES.in, run debconf-updatepo 2013-07-04 22:10:22 +08:00
Aron Xu
1ecf651f64 Use template reviewed by debian-l10n-en 2013-07-04 22:06:57 +08:00
Aron Xu
6496c5225a Remove duplicate Section field in binary:zfs-dkms 2013-07-04 22:05:18 +08:00
Aron Xu
4110344963 Little update to copyright 2013-06-29 02:56:23 +08:00
Aron Xu
75c974e8c1 Disable trigger activation for now
Trigger activation is needed when initramfs support is properly
landing, but we don't have proper support from boot loader so that
initramfs zfs isn't much usable/reliable on user systems currently.
2013-06-29 02:19:43 +08:00
Aron Xu
5eac4c830a Improve debconf templates
Still needs to be sent for review and call for translations.
2013-06-29 02:15:28 +08:00
Aron Xu
182c8a65ab Disable zfs-initramfs, improve descriptions 2013-06-29 01:56:00 +08:00
Aron Xu
6b5b5d6920 Misc update of d/control d/compat 2013-05-31 04:50:26 +08:00
Carlos Alberto Lopez Perez
0c3d8edf7c Forget about .pc files 2013-04-27 21:08:41 +02:00
Carlos Alberto Lopez Perez
f55da974d2 Add spl-timeout-wait-for-header-and-symvers.patch patch
This Ensure that --with-spl-timeout waits for both SPL spl_config.h
  and symvers files

  The previous code was only waiting for the symver file. But the postinst
  target of the DKMS script for SPL will not only create the symvers file,
  but also the header spl_config.h.

  If we are waiting in the configure script of ZFS for the SPL symvers file,
  then we also need to wait for spl_config.h. Otherwise the configure script
  will abort because the spl_config.h is not yet available.

  On top of that, the function ZFS_AC_SPL_MODULE_SYMVERS is moved to the end
  of the function ZFS_AC_SPL to allow both checks share the with-spl-timeout
  parameter.
2013-04-27 20:54:46 +02:00
Carlos Alberto Lopez Perez
fa610acfe6 Add --with-spl-timeout=600 to the configure options when building the module with DKMS
This will make the configure script wait up to 600 seconds for the SPL
  config and symver files to be available.

  This is needed when upgrading the kernel version, because DKMS will start
  the build for SPL and ZFS in parallel. And ZFS to be correctly built needs
  the symvers of SPL. So ZFS can't start building until SPL has finished.

  The proper fix would be implementing dependencies on DKMS. But in the
  meanwhile this will do the trick.
2013-04-27 20:54:24 +02:00
Carlos Alberto Lopez Perez
4f9f0bb539 Fix broken initramfs hooks caused by commit 1123dc4
* The hooks were copying the required files for supporting the
   deprecated zdev.conf syntax.

 * Remove the deleted files from the list.

 * Plus: remove a trailing space.
2013-04-10 05:54:33 +02:00
Carlos Alberto Lopez Perez
2cc7293f72 Trivial commit to reflect that now /etc/hostid is created by spl-dkms 2013-04-10 05:50:55 +02:00
Carlos Alberto Lopez Perez
d2206c3b8e Merge tag 'upstream/0.6.1'
Upstream version 0.6.1
2013-04-10 03:57:12 +02:00
Carlos Alberto Lopez Perez
0e3762cae9 Imported Upstream version 0.6.1 2013-04-10 03:57:11 +02:00
Aron Xu
193acf6460 Remove debuild-ppa.sh
Remove the helper script for uploading to PPA.
2013-04-09 14:11:21 +08:00
Carlos Alberto Lopez Perez
1123dc47e1 Remove patch to support legacy zdev.conf configuration files.
* This complements previous commit dd1eb91

    * zdev.conf syntax is not longer supported by upstream.

  * We aren't interested in shipping a patch with our _first_ _release_
    to support an already deprecated feature by upstream that will only
    make the future maintenance of the package harder in Debian.

  * This was the last patch. So remove also the series file.
2013-04-09 01:43:44 +02:00
Aron Xu
525f11919b Merge branch 'clopez' 2013-04-08 16:37:52 +08:00
Aron Xu
82f5395e27 Merge tag 'upstream/0.6.1'
Upstream version 0.6.1

Conflicts:
	.gitignore
	rpm/fedora/zfs-dkms.spec.in
	rpm/fedora/zfs.spec.in
2013-04-08 14:40:43 +08:00
Aron Xu
90bb749421 Imported Upstream version 0.6.1 2013-04-08 14:40:23 +08:00
Carlos Alberto Lopez Perez
da1f1cc8de Add debconf helpers: Ask the user before building on a 32 bit kernel
* Detect at install time the kernel the user is running

   * If a 64-bit kernel is detected skip any question and just build
     the ZFS kernel module.

   * If a 32-bit kernel is detected, then the user is warned (via debconf)
     about that. And the user is asked to stop the build (the default
     is to stop the build). If the user selects to stop the build then
     we exit with status 0 on postinst before building the module so
     the package gets as installed correctly on the dpkg database but
     the module is not built.

   * If we can't detect if the kernel is 32 or 64 bit we tell the user that
     we couldn't detect that and we tell him that he shouldn't continue
     building ZFS on a 32-bit kernel.
     We also ask him to stop the build and we proceed like in the previous
     case.

  * If the user asks by mistake "no" to build the kernel and later he changes
    his mind and wants to build it, he just needs to reconfigure the package:
    dpkg-reconfigure zfs-dkms

 * TODO: Add translations for the debhelper templates.
2013-04-03 02:22:55 +02:00
Carlos Alberto Lopez Perez
05c5f90120 Call notify-reboot-required after the module was built
* The compilation of the module happens inside the #DEBHELPER# block
   (automatically handled by dh_dkms). So call notify-reboot-required
   after it was built.
2013-04-03 00:03:56 +02:00
Carlos Alberto Lopez Perez
66bbd7ade4 Fix and improve the generation of the stripped kernel source tree
* Commit f3757573 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:46 +02:00
Carlos Alberto Lopez Perez
dd1eb91c9a Remove /etc/zfs/zdev.conf from configuration files and remove zdev.conf examples
* /etc/zfs/zdev.conf should not be a configuration file.
	This is by policy:
	E.2 Fully-featured maintainer script configuration handling
	http://www.debian.org/doc/debian-policy/ap-pkg-conffiles.html

	This kind of site-specific configuration files should not be added
	to the package files.
	You don't want this file to be removed when you purge the package.

  * zdev.conf is not longer supported by upstream. We are carring a patch
    patches/0001-Revert-Retire-zpool_id-infrastructure.patch that I would
    like to remove ASAP.

    * Remove also all the examples related to zdev.conf shipped.
      Users should use vdev_id.conf instead.

 [!] Don't add vdev_id.conf to configuration files.
2013-04-02 03:10:27 +02:00
Carlos Alberto Lopez Perez
c810b9bf8f Update NEWS version and add a reminder on changelog 2013-04-02 02:56:00 +02:00
Carlos Alberto Lopez Perez
aa5d6d1ff9 Refresh 0001-Revert-Retire-zpool_id-infrastructure.patch 2013-04-02 02:29:05 +02:00
Carlos Alberto Lopez Perez
42b1a2ace0 Reset changelog and update maintainer and vcs fields on debian/control
* Add missing homepage field on debian/control
2013-04-02 02:08:10 +02:00
Carlos Alberto Lopez Perez
209db40f45 Lower DKMS version requirements to Squeeze version.
* Squeeze DKMS version is 2.1.1.2-5
2013-04-02 02:04:31 +02:00
Carlos Alberto Lopez Perez
f63be6e269 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/zfs/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:56:56 +02:00
Carlos Alberto Lopez Perez
97b5e46be8 Merge branch 'upstream' 2013-04-02 01:51:59 +02:00
Carlos Alberto Lopez Perez
d5a3733da5 Revert outside debian/ commit 0d9bc69
* Causes merge conflicts with upstream branch
2013-04-02 01:51:24 +02:00
Brian Behlendorf
36c0b62799 Tag zfs-0.6.1
META file and release log updated.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2013-03-26 08:50:29 -07:00
Brian Behlendorf
b7f59425f9 Include init scripts in packages
The distribution specific init scripts where excluded from the
packaging when it was reworked.  The intention is to replace
them with systemd equivilants.  However, that work has not yet
been done and the init scripts are still useful so they have
been added back in to the packaging.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2013-03-26 08:50:09 -07:00
Brian Behlendorf
0df23ca9a1 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:28:19 -07:00
Brian Behlendorf
f6fb7651a0 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>
2013-03-22 14:52:01 -07:00
Darik Horn
09fb1ec48a Fix minor typos and update marketing copy.
Correct spelling mistakes in the AUTHORS and DISCLAIMER files, and
update the README.markdown file to credit Illumos and mention that
the ZPL is finished.

The README.markdown file is also the first impression for a handful
of new users that discover ZoL through a web search because it
doubles as the splash page for the Github repository. The build blurbs
are therefore removed because these people should be encouraged to
visit the regular home page before installing the product.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #1366
2013-03-21 12:51:06 -07:00
Brian Behlendorf
352b557bd6 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-21 12:51:06 -07:00
Brian Behlendorf
ae0f0ba950 Use BUILD_DEPENDS option for dkms builds
Support was added to dkms so build dependencies can be specified.
This allows us to ensure that the spl package will always be built
before the zfs package.  Those patches have not yet been merged
upstream but they are available in the zfsonlinux/dkms repository.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2013-03-21 12:51:06 -07:00
Brian Behlendorf
7865606a6a Remove zfs-dkms conflict with zfs-kmod
Because the zfs-dkms package also provides zfs-kmod for the
zfs user package yum flags this as a conflict.  To avoid the
problem remove the Conflicts tag from zfs-dkms and just rely
on the one in zfs-kmod.

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

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2013-03-21 12:51:06 -07:00
Brian Behlendorf
b967600366 Refresh dracut module setup
60-zpool.rules was retired some time ago in favor of 69-vdev.rules.
Additionally, there is no guarentee a zpool.cache file exists so
only install it conditionally upon its existance.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2013-03-21 12:51:06 -07:00
Brian Behlendorf
68a2e016c8 Add missing dependencies
The spl, zfs-test, and zfs-dracut packages should be pulled in
by the core zfs package.  This allows all the required zfs packages
to be installed from a yum repository by running:

  yum install zfs

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2013-03-21 12:50:19 -07:00