From 96e0f59f56041e9f3931b7a94330fbd8ab5cc02f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 2 Mar 2009 13:25:00 -0800 Subject: [PATCH] debian: restructure packages Consolidate. Fix dependencies. --- debian/ceph-doc.dirs | 1 - ...h-source.dirs => ceph-kclient-source.dirs} | 0 ...ce.install => ceph-kclient-source.install} | 0 debian/ceph-mds.dirs | 1 - debian/ceph-mds.install | 1 - debian/ceph-misc.dirs | 1 - debian/ceph-misc.install | 2 - debian/ceph-mon.install | 2 - debian/ceph-osd.dirs | 1 - debian/ceph-osd.install | 3 - debian/{ceph-common.dirs => ceph.dirs} | 3 +- debian/{ceph-doc.docs => ceph.docs} | 0 debian/{ceph-common.init => ceph.init} | 0 debian/{ceph-common.install => ceph.install} | 7 +- debian/control | 64 ++----------------- 15 files changed, 12 insertions(+), 74 deletions(-) delete mode 100644 debian/ceph-doc.dirs rename debian/{ceph-source.dirs => ceph-kclient-source.dirs} (100%) rename debian/{ceph-source.install => ceph-kclient-source.install} (100%) delete mode 100644 debian/ceph-mds.dirs delete mode 100644 debian/ceph-mds.install delete mode 100644 debian/ceph-misc.dirs delete mode 100644 debian/ceph-misc.install delete mode 100644 debian/ceph-mon.install delete mode 100644 debian/ceph-osd.dirs delete mode 100644 debian/ceph-osd.install rename debian/{ceph-common.dirs => ceph.dirs} (58%) rename debian/{ceph-doc.docs => ceph.docs} (100%) rename debian/{ceph-common.init => ceph.init} (100%) rename debian/{ceph-common.install => ceph.install} (66%) diff --git a/debian/ceph-doc.dirs b/debian/ceph-doc.dirs deleted file mode 100644 index 480578e9aedb7..0000000000000 --- a/debian/ceph-doc.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/doc/ceph diff --git a/debian/ceph-source.dirs b/debian/ceph-kclient-source.dirs similarity index 100% rename from debian/ceph-source.dirs rename to debian/ceph-kclient-source.dirs diff --git a/debian/ceph-source.install b/debian/ceph-kclient-source.install similarity index 100% rename from debian/ceph-source.install rename to debian/ceph-kclient-source.install diff --git a/debian/ceph-mds.dirs b/debian/ceph-mds.dirs deleted file mode 100644 index e77248175524d..0000000000000 --- a/debian/ceph-mds.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/bin diff --git a/debian/ceph-mds.install b/debian/ceph-mds.install deleted file mode 100644 index 59ecb48d051a6..0000000000000 --- a/debian/ceph-mds.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/cmds diff --git a/debian/ceph-misc.dirs b/debian/ceph-misc.dirs deleted file mode 100644 index e77248175524d..0000000000000 --- a/debian/ceph-misc.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/bin diff --git a/debian/ceph-misc.install b/debian/ceph-misc.install deleted file mode 100644 index 6b3af011fb40f..0000000000000 --- a/debian/ceph-misc.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin/dumpjournal -usr/bin/streamtest diff --git a/debian/ceph-mon.install b/debian/ceph-mon.install deleted file mode 100644 index 402af620932c5..0000000000000 --- a/debian/ceph-mon.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin/cmon -usr/bin/mkmonfs diff --git a/debian/ceph-osd.dirs b/debian/ceph-osd.dirs deleted file mode 100644 index e77248175524d..0000000000000 --- a/debian/ceph-osd.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/bin diff --git a/debian/ceph-osd.install b/debian/ceph-osd.install deleted file mode 100644 index 02667577cd712..0000000000000 --- a/debian/ceph-osd.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin/cosd -usr/bin/dupstore - diff --git a/debian/ceph-common.dirs b/debian/ceph.dirs similarity index 58% rename from debian/ceph-common.dirs rename to debian/ceph.dirs index 3bba1417247fd..aa72f8ab39cc3 100644 --- a/debian/ceph-common.dirs +++ b/debian/ceph.dirs @@ -1,4 +1,5 @@ usr/bin var/log/ceph var/log/ceph/stat -etc/ceph \ No newline at end of file +etc/ceph +usr/share/doc/ceph diff --git a/debian/ceph-doc.docs b/debian/ceph.docs similarity index 100% rename from debian/ceph-doc.docs rename to debian/ceph.docs diff --git a/debian/ceph-common.init b/debian/ceph.init similarity index 100% rename from debian/ceph-common.init rename to debian/ceph.init diff --git a/debian/ceph-common.install b/debian/ceph.install similarity index 66% rename from debian/ceph-common.install rename to debian/ceph.install index f9dd5568b5e67..cc423209085d6 100644 --- a/debian/ceph-common.install +++ b/debian/ceph.install @@ -5,8 +5,13 @@ usr/bin/monmaptool usr/bin/osdmaptool usr/bin/csyn usr/bin/crun +usr/bin/cmon +usr/bin/cmds +usr/bin/cosd +usr/bin/dupstore +usr/bin/mkmonfs usr/sbin/mount.ceph usr/sbin/mkcephfs usr/lib/ceph/ceph_common.sh etc/ceph/sample.ceph.conf -etc/ceph/sample.cluster.conf \ No newline at end of file +etc/ceph/sample.cluster.conf diff --git a/debian/control b/debian/control index 91a412fc6f343..0c56ddf8b2d33 100644 --- a/debian/control +++ b/debian/control @@ -7,52 +7,15 @@ Standards-Version: 3.7.2 Package: ceph Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ceph-mon, ceph-osd, ceph-mds, ceph-fuse, ceph-source, ceph-common -Recommends: fuse-utils +Depends: ${shlibs:Depends}, ${misc:Depends}, libedit, libboost +Recommends: fuse-utils, ceph-fuse, ceph-kclient-source Description: Ceph distributed file system Ceph is a distributed network file system designed to provide excellent performance, reliability, and scalability. -Package: ceph-common -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Ceph distributed file system - Ceph is a distributed network file system designed to provide - excellent performance, reliability, and scalability. - . - This is the common package with shared dependencies. - -Package: ceph-mon -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Ceph distributed file system - Ceph is a distributed network file system designed to provide - excellent performance, reliability, and scalability. - . - This is the monitor package and contains the monitor daemon and associated - utilities. - -Package: ceph-mds -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Ceph distributed file system - Ceph is a distributed network file system designed to provide - excellent performance, reliability, and scalability. - . - This is the meta data server package and contains the meta data server daemon. - -Package: ceph-osd -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Ceph distributed file system - Ceph is a distributed network file system designed to provide - excellent performance, reliability, and scalability. - . - This is the object storage package and contains the object storage daemon. - Package: ceph-fuse Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, libfuse Description: Ceph distributed file system Ceph is a distributed network file system designed to provide excellent performance, reliability, and scalability. @@ -60,7 +23,7 @@ Description: Ceph distributed file system This is the ceph fuse package and contains the ceph fuse for mounting ceph with fuse. -Package: ceph-source +Package: ceph-kclient-source Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Ceph distributed file system @@ -68,22 +31,3 @@ Description: Ceph distributed file system excellent performance, reliability, and scalability. . This is the ceph kernel source package for use with module-assistant. - -Package: ceph-misc -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Ceph distributed file system - Ceph is a distributed network file system designed to provide - excellent performance, reliability, and scalability. - . - This is the ceph misc installed binaries. - -Package: ceph-doc -Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Ceph distributed file system - Ceph is a distributed network file system designed to provide - excellent performance, reliability, and scalability. - . - This is the ceph documentation. - -- 2.39.5