[PATCH v5] tools: Fix and improve make debball

[PATCH v5] tools: Fix and improve make debball

[Fabio Fantoni]

- Remove version from installed package name for correct update
- Add conffiles to manage main config files on package update
- Added on description that this make a build for testing only.

Signed-off-by: Fabio Fantoni <fabio.fantoni@m2r.biz>

---

Changes in v5:
- Removed maintanance scripts
- automatic find all /etc files and add them to conffiles instead
  only some static ones

Changes in v4:
- Removed xend config file to avoid error if xend is disabled.

Changes in v3:
- Improved description.
- Improved add/remove of main service and added the stop.
---
 tools/misc/mkdeb |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/tools/misc/mkdeb b/tools/misc/mkdeb
index 2e40747..3bbf881 100644
--- a/tools/misc/mkdeb
+++ b/tools/misc/mkdeb
@@ -33,7 +33,7 @@ fi
 # Fill in the debian boilerplate
 mkdir -p deb/DEBIAN
 cat >deb/DEBIAN/control <<EOF
-Package: xen-upstream-$version
+Package: xen-upstream
 Source: xen-upstream
 Version: $version
 Architecture: $arch
@@ -41,12 +41,15 @@ Maintainer: Unmaintained snapshot
 Section: admin
 Priority: optional
 Installed-Size: $(du -ks deb | cut -f1)
-Description: Xen hypervisor and tools, version $version
- This package contains the Xen hypervisor and associated tools, built
- from a source tree.  It is not a fully packaged and supported Xen, just
- the output of a xen "make dist" wrapped in a .deb to make it easy to
- uninstall.
+Description: Xen upstream testing build snapshot
+ Warning: This is a custom testing build of Xen; it is not an
+ officially supported Debian package. Please not distribute.
+ It is just the output of a xen "make dist" wrapped in a .deb
+ to make it easy to update and uninstall.
 EOF
+# Find all /etc files and add them to conffiles
+find deb/etc -type f -printf /etc/%P\\n >deb/DEBIAN/conffiles
+
 
 # Package it up
 chown -R root:root deb
-- 
1.7.9.5

Re: [PATCH v5] tools: Fix and improve make debball

[Ian Jackson]

Fabio Fantoni writes ("[PATCH v5] tools: Fix and improve make debball"):
> - Remove version from installed package name for correct update
> - Add conffiles to manage main config files on package update
> - Added on description that this make a build for testing only.
> 
> Signed-off-by: Fabio Fantoni <fabio.fantoni@m2r.biz>

I haven't tested this but it looks like an improvement to me.

Ian/George, do you object to this change ?

The effects of marking the files in /etc/ as conffiles are that
 - when installing this .deb, it won't unconditionally overwrite
   any existing configuration without prompting
 - when removing it, if you want to remove the config files, you
   need to use --purge rather than just --remove
I think this is a useful improvement and makes the debball less
hazardous.

If you don't object to the principle then I will test this and inspect
the .deb to make sure it has the desired contents.

Ian.

Re: [PATCH v5] tools: Fix and improve make debball

[George Dunlap]

On Fri, Apr 11, 2014 at 1:11 PM, Ian Jackson <Ian.Jackson@eu.citrix.com> wrote:
> Fabio Fantoni writes ("[PATCH v5] tools: Fix and improve make debball"):
>> - Remove version from installed package name for correct update
>> - Add conffiles to manage main config files on package update
>> - Added on description that this make a build for testing only.
>>
>> Signed-off-by: Fabio Fantoni <fabio.fantoni@m2r.biz>
>
> I haven't tested this but it looks like an improvement to me.
>
> Ian/George, do you object to this change ?
>
> The effects of marking the files in /etc/ as conffiles are that
>  - when installing this .deb, it won't unconditionally overwrite
>    any existing configuration without prompting
>  - when removing it, if you want to remove the config files, you
>    need to use --purge rather than just --remove
> I think this is a useful improvement and makes the debball less
> hazardous.
>
> If you don't object to the principle then I will test this and inspect
> the .deb to make sure it has the desired contents.

There's a part of me that wonders whether it's a good idea to have
everything in /etc considered a conf file; but I can see how that's a
much more maintainable option going forward than having to keep and
update a whitelist.

Which then brings us to the question about whether a lot of the
scripts and such should be in /etc at all; but perhaps that's a
question for another time.

Regarding the general intent:

Acked-by: George Dunlap <george.dunlap@eu.citrix.com>

Thanks for pursuing this, Fabio.

 -George

Re: [PATCH v5] tools: Fix and improve make debball

[Ian Jackson]

George Dunlap writes ("Re: [Xen-devel] [PATCH v5] tools: Fix and improve make debball"):
> On Fri, Apr 11, 2014 at 1:11 PM, Ian Jackson <Ian.Jackson@eu.citrix.com> wrote:
> > If you don't object to the principle then I will test this and inspect
> > the .deb to make sure it has the desired contents.
> 
> There's a part of me that wonders whether it's a good idea to have
> everything in /etc considered a conf file; but I can see how that's a
> much more maintainable option going forward than having to keep and
> update a whitelist.

Of course the Debian policy isn't necessarily definitive here, but in
ordinary Debian packages it is definitely a bug for a file to be
shipped in /etc in the package filesystem archive but not declared a
conffile.

I definitely think we should either mark everything in /etc as a
conffile, or nothing at all.  Listing only a subset would be madness.

> Which then brings us to the question about whether a lot of the
> scripts and such should be in /etc at all; but perhaps that's a
> question for another time.

Indeed.

> Regarding the general intent:
> 
> Acked-by: George Dunlap <george.dunlap@eu.citrix.com>

Thanks.

Ian.

Re: [PATCH v5] tools: Fix and improve make debball

[Ian Jackson]

George Dunlap writes ("Re: [Xen-devel] [PATCH v5] tools: Fix and improve make debball"):
> Regarding the general intent:
> 
> Acked-by: George Dunlap <george.dunlap@eu.citrix.com>

Thanks.  I have tested this and it seems to DTRT so:

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>

Ian.