From mboxrd@z Thu Jan 1 00:00:00 1970 From: George Dunlap Subject: Re: [PATCH v2 2/2] Add a "make rpmball" target Date: Tue, 4 Mar 2014 20:23:14 +0000 Message-ID: <53163632.3040201@eu.citrix.com> References: <1393941409-9105-1-git-send-email-george.dunlap@eu.citrix.com> <1393941409-9105-2-git-send-email-george.dunlap@eu.citrix.com> <531634E7.3050103@terremark.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <531634E7.3050103@terremark.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Don Slutz , xen-devel@lists.xen.org Cc: Ian Jackson , Dario Faggioli , Olaf Hering , Ian Campbell , M A Young List-Id: xen-devel@lists.xenproject.org On 03/04/2014 08:17 PM, Don Slutz wrote: > On 03/04/14 08:56, George Dunlap wrote: >> Build a simplistic dummy package, similar to "make debball", for >> developers on rpm-based systems. >> >> Signed-off-by: George Dunlap >> --- >> 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 >> CC: Ian Campbell >> CC: Dario Faggioli >> CC: Olaf Hering >> CC: Don Slutz >> CC: M A Young >> --- >> 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 > > On CentOS 5.10 I get: > > bash ./tools/misc/mkrpm /home/don/xen-4.4.0-rc6 $(make -C xen xenversion > --no-print-directory) > Executing(%build): /bin/sh -e /var/tmp/rpm-tmp.7024 > + umask 022 > + cd /home/don/xen-4.4.0-rc6/dist/rpm/BUILD > /var/tmp/rpm-tmp.7024: line 23: cd: > /home/don/xen-4.4.0-rc6/dist/rpm/BUILD: No such file or directory Hrm, looks like maybe your version or rpmbuild doesn't automatically create the directories under %topdir? You could try changing the "mkdir" to something like this? mkdir -p rpm/{BUILD,RPMS,SOURCES,SPECS,SRPMS} -George