debian: fix kernel module in source package

diff --git a/.gitignore b/.gitignore
index dfa5f3a18a9fb58f4a9ede9af166c16316dea00d..28f2c559e63e054644bf4e06eea4b61961c157cd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@ web/*.html
 gmon.out
 core.*
 vgcore.*
-Makefile
+src/Makefile
 Makefile.in
 aclocal.m4
 autom4te.cache

diff --git a/debian/rules b/debian/rules
index e53dac989939f9f21ffd9cfdfebaf232e872385a..7fd671358881d36e3937bf2b7a45f33ea9ab313d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -15,8 +15,7 @@ common-install-arch::
        mkdir -p $(DEB_DH_INSTALL_SOURCEDIR)/usr/share/doc/ceph
        cp debian/README.ceph $(DEB_DH_INSTALL_SOURCEDIR)/usr/share/doc/ceph/
        mkdir -p $(DEB_DH_INSTALL_SOURCEDIR)/usr/src/modules/ceph
-       (cd src/kernel ; tar -cf - * ) | ( cd $(DEB_DH_INSTALL_SOURCEDIR)/usr/src/modules/ceph ; tar -xf - )
-       cp src/include/ceph_fs.h $(DEB_DH_INSTALL_SOURCEDIR)/usr/src/modules/ceph/ceph_fs.h
+       (cd src/kernel ; tar -hcf - * ) | ( cd $(DEB_DH_INSTALL_SOURCEDIR)/usr/src/modules/ceph ; tar -xf - )
        mkdir -p $(DEB_DH_INSTALL_SOURCEDIR)/usr/src/modules/ceph/debian
        -cp debian/* $(DEB_DH_INSTALL_SOURCEDIR)/usr/src/modules/ceph/debian
        mv $(DEB_DH_INSTALL_SOURCEDIR)/usr/src/modules/ceph/debian/rules.modules.in $(DEB_DH_INSTALL_SOURCEDIR)/usr/src/modules/ceph/debian/rules

diff --git a/src/kernel/Makefile b/src/kernel/Makefile
index 74ec2c8a0a3ea52e2b39a86f6e8a847c3eed2170..cbebd9cf752d0b3616bcca88dfd3285854ba5429 100644 (file)
--- a/src/kernel/Makefile
+++ b/src/kernel/Makefile
@@ -23,7 +23,7 @@ PWD := $(shell pwd)
 
 default: all
 
-all: ceph_fs.h 
+all:
        $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_CEPH_FS=m modules
 
 modules_install:
@@ -32,7 +32,4 @@ modules_install:
 clean:
        $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
 
-ceph_fs.h:
-       ln -s ../include/ceph_fs.h ceph_fs.h
-
 endif

diff --git a/src/kernel/ceph_fs.h b/src/kernel/ceph_fs.h
new file mode 120000 (symlink)
index 0000000..a76401a
--- /dev/null
+++ b/src/kernel/ceph_fs.h
@@ -0,0 +1 @@
+../include/ceph_fs.h
\ No newline at end of file