From e9cd36644fd9b23a0318f1e8457d52756e1209a8 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 16 Oct 2008 13:53:56 -0700 Subject: [PATCH] debian: fix kernel module in source package --- .gitignore | 2 +- debian/rules | 3 +-- src/kernel/Makefile | 5 +---- src/kernel/ceph_fs.h | 1 + 4 files changed, 4 insertions(+), 7 deletions(-) create mode 120000 src/kernel/ceph_fs.h diff --git a/.gitignore b/.gitignore index dfa5f3a18a9fb..28f2c559e63e0 100644 --- 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 e53dac989939f..7fd671358881d 100755 --- 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 74ec2c8a0a3ea..cbebd9cf752d0 100644 --- 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 index 0000000000000..a76401a555dc8 --- /dev/null +++ b/src/kernel/ceph_fs.h @@ -0,0 +1 @@ +../include/ceph_fs.h \ No newline at end of file -- 2.39.5