ff94a98d45
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-07-28 09:42:45 -07:00
30a4bf1894
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-07-28 09:42:40 -07:00
fb937722a8
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-07-28 09:42:37 -07:00
08d315da05
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-07-28 09:42:32 -07:00
e15c32cb3e
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-07-28 09:42:30 -07:00
b2ffea8975
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-07-28 09:42:24 -07:00
f7c966c315
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-07-28 09:42:22 -07:00
4ec24d19ab
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-07-28 09:42:16 -07:00
486d76bab9
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-07-28 09:42:14 -07:00
3d1caebdb5
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-07-28 09:42:09 -07:00
f3c202410c
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-07-28 09:42:06 -07:00
9e12c81c45
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-07-28 09:42:01 -07:00
8768170f0b
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-07-28 09:41:58 -07:00
5bfb977158
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-07-28 09:41:53 -07:00
425a0a201f
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-07-28 09:41:51 -07:00
90b841458b
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-07-28 09:41:45 -07:00
89c512ad68
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-07-28 09:41:43 -07:00
5f38a4fd00
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-07-28 09:41:37 -07:00
3ed4f42120
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-07-28 09:41:35 -07:00
06d509d8a2
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-07-28 09:41:29 -07:00
087522b1d5
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-07-28 09:41:27 -07:00
fc711f34a0
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-07-28 09:41:22 -07:00
7e3ddc649b
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-07-28 09:41:20 -07:00
462708f0a8
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-07-28 09:41:13 -07:00
153adcb1e5
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-07-28 09:41:11 -07:00
09d2b341ce
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-07-28 09:41:05 -07:00
03d01abed2
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-07-28 09:41:03 -07:00
17d3c1b73f
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-07-28 09:40:58 -07:00
4200aee140
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-07-28 09:40:55 -07:00
0f237a4379
Add Debian and Slackware style packaging via alien
...
The long term fix for Debian and Slackware style packaging is
to add native support for building these packages. Unfortunately,
that is a large chunk of work I don't have time for right now.
That said it would be nice to have at least basic packages for
these distributions.
As a quick short/medium term solution I've settled on using alien
to convert the RPM packages to DEB or TGZ style packages. The
build system has been updated with the following build targets
which will first build RPM packages and then convert them as
needed to the target package type:
make rpm: Create .rpm packages
make deb: Create .deb packages
make tgz: Create .tgz packages
make pkg: Create the right package type for your distribution
The solution comes with lot of caveats and your mileage may vary.
But basically the big limitations are that the resulting packages:
1) Will not have the correct dependency information.
2) Will not include the kernel version in the release.
3) Will not handle all differences between distributions.
But the resulting packages should be easy to install and remove
from your system and take care of running 'depmod -a' and such.
As I said at the top this is not the right long term solution.
If any of the upstream distribution maintainers want to jump in
and help do this right for their distribution I'd love the help.
2010-07-28 09:37:04 -07:00
45fab7f26c
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-07-27 09:51:16 -07:00
2a9e09ec68
Export DMU/ZFS symbols required by Lustre
...
The dmu_objset_pool() and dmu_objset_name() symbols are needed
by Lustre and should be exported.
Signed-off-by: Ricardo M. Correia <ricardo.correia@oracle.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2010-07-27 09:46:23 -07:00
b7b4299f8d
Merge branch 'linux-have-mlslabel' into refs/top-bases/linux-zfs-branch
2010-07-23 11:44:46 -07:00
35fee94a3b
Merge commit 'refs/top-bases/linux-have-mlslabel' into linux-have-mlslabel
2010-07-23 11:44:44 -07:00
4809e2ca51
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-07-23 11:44:38 -07:00
52a44811c1
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-07-23 11:44:36 -07:00
e7c67bf7dd
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-07-23 11:44:31 -07:00
43434f31b4
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-07-23 11:44:29 -07:00
ae07f6b274
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-07-23 11:44:23 -07:00
d807ad0467
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-07-23 11:44:21 -07:00
97f4d761eb
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-07-23 11:44:16 -07:00
d7f48baeaf
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-07-23 11:44:14 -07:00
f99575c9aa
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-07-23 11:44:08 -07:00
641bfb323a
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-07-23 11:44:06 -07:00
d58992da9e
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-07-23 11:44:01 -07:00
b1d4ae7d16
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-07-23 11:43:59 -07:00
c7ebc84438
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-07-23 11:43:52 -07:00
0fa271ff04
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-07-23 11:43:50 -07:00
f25f0a2109
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-07-23 11:43:45 -07:00
8c6554d526
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-07-23 11:43:42 -07:00
Brian Behlendorf
Ricardo M. Correia