From mboxrd@z Thu Jan  1 00:00:00 1970
From: Don Koch <dkoch@verizon.com>
Subject: Re: [PATCH v2 2/2] Add a "make rpmball" target
Date: Tue, 4 Mar 2014 16:29:41 -0500
Message-ID: <531645C5.1040000@terremark.com>
References: <1393941409-9105-1-git-send-email-george.dunlap@eu.citrix.com>
	<1393941409-9105-2-git-send-email-george.dunlap@eu.citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1393941409-9105-2-git-send-email-george.dunlap@eu.citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: George Dunlap <george.dunlap@eu.citrix.com>
Cc: Olaf Hering <olaf@aepfle.de>, Ian Campbell <ian.campbell@citrix.com>, Dario Faggioli <dario.faggioli@citrix.com>, Don Slutz <dslutz@verizon.com>, xen-devel@lists.xen.org, M A Young <m.a.young@durham.ac.uk>, Ian Jackson <ian.jackson@citrix.com>
List-Id: xen-devel@lists.xenproject.org

On 03/04/2014 08:56 AM, George Dunlap wrote:
> Build a simplistic dummy package, similar to "make debball", for
> developers on rpm-based systems.
> 
> Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>
> ---
> v2:
>  - use --no-print-directory rather than '| grep -v :'
>  - use find boot/ -type l -delete rather
>  - bash-ify the script, so that we can...
>  - use string manipulation to break down version and release numbers
>  - Don't delete xen-syms, xen-*.gz links
> 
> CC: Ian Jackson <ian.jackson@citrix.com>
> CC: Ian Campbell <ian.campbell@citrix.com>
> CC: Dario Faggioli <dario.faggioli@citrix.com>
> CC: Olaf Hering <olaf@aepfle.de>
> CC: Don Slutz <dslutz@verizon.com>
> CC: M A Young <m.a.young@durham.ac.uk>
> ---
>  Makefile         |    7 +++++
>  tools/misc/mkrpm |   76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 83 insertions(+)
>  create mode 100644 tools/misc/mkrpm
> 
> diff --git a/Makefile b/Makefile
> index 4c5d1b6..91ca280 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -152,6 +152,13 @@ world:
>  debball: dist
>  	fakeroot sh ./tools/misc/mkdeb $(XEN_ROOT) $$($(MAKE) -C xen xenversion --no-print-directory)
>  
> +# Package a build in an rpmball file, that is inside a .rpm format
> +# container to allow for easy and clean removal. This is not intended
> +# to be a full featured policy compliant .rpm package.
> +.PHONY: rpmball
> +rpmball: dist
> +	bash ./tools/misc/mkrpm $(XEN_ROOT) $$($(MAKE) -C xen xenversion --no-print-directory)
> +
>  # clean doesn't do a kclean
>  .PHONY: clean
>  clean::
> diff --git a/tools/misc/mkrpm b/tools/misc/mkrpm
> new file mode 100644
> index 0000000..88cf13e
> --- /dev/null
> +++ b/tools/misc/mkrpm
> @@ -0,0 +1,76 @@
> +#!/bin/bash
> +#
> +# mkrpm: package the dist/install output of a Xen build in an .rpm
> +#
> +# Takes 2 arguments, the path to the dist directory and the version
> +
> +set -e
> +
> +if [[ -z "$1" || -z "$2" ]] ; then 
> +  echo "usage: $0 path-to-XEN_ROOT xen-version"
> +  exit 1
> +fi 
> +
> +xenroot="$1"
> +
> +# rpmbuild doesn't like dashes in the version; break it down into 
> +# version and release.  Default to "0" if there isn't a release.
> +v=(${2/-/ })
> +version=${v[0]}
> +release=${v[1]}
> +
> +[[ -n "$release" ]] || release="0"
> +
> +cd $xenroot
> +
> +# Prepare the directory to package
> +cd dist
> +rm -rf rpm
> +
> +# Fill in the rpm boilerplate
> +mkdir -p rpm/SPEC
> +cat >rpm/SPEC/xen.spec <<EOF

s/SPEC/SPECS/ in the above two lines (per the rpm.org site).
It also fixes Don's problem.

-d