* [PATCH v2 1/2] tools: Use --no-print-directory instead of grep for debball version @ 2014-03-04 13:56 George Dunlap 2014-03-04 13:56 ` [PATCH v2 2/2] Add a "make rpmball" target George Dunlap 2014-03-06 10:34 ` [PATCH v2 1/2] tools: Use --no-print-directory instead of grep for debball version Tim Deegan 0 siblings, 2 replies; 9+ messages in thread From: George Dunlap @ 2014-03-04 13:56 UTC (permalink / raw) To: xen-devel; +Cc: George Dunlap, Ian Jackson, Ian Campbell Save a fork, and also avoid :) being interpreted as a smiley. Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com> --- CC: Ian Jackson <ian.jackson@citrix.com> CC: Ian Campbell <ian.campbell@citrix.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4e48457..4c5d1b6 100644 --- a/Makefile +++ b/Makefile @@ -150,7 +150,7 @@ world: # to be a full featured policy compliant .deb package. .PHONY: debball debball: dist - fakeroot sh ./tools/misc/mkdeb $(XEN_ROOT) $$($(MAKE) -C xen xenversion | grep -v :) + fakeroot sh ./tools/misc/mkdeb $(XEN_ROOT) $$($(MAKE) -C xen xenversion --no-print-directory) # clean doesn't do a kclean .PHONY: clean -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2 2/2] Add a "make rpmball" target 2014-03-04 13:56 [PATCH v2 1/2] tools: Use --no-print-directory instead of grep for debball version George Dunlap @ 2014-03-04 13:56 ` George Dunlap 2014-03-04 20:17 ` Don Slutz 2014-03-04 21:29 ` Don Koch 2014-03-06 10:34 ` [PATCH v2 1/2] tools: Use --no-print-directory instead of grep for debball version Tim Deegan 1 sibling, 2 replies; 9+ messages in thread From: George Dunlap @ 2014-03-04 13:56 UTC (permalink / raw) To: xen-devel Cc: Olaf Hering, Ian Campbell, George Dunlap, Dario Faggioli, Don Slutz, M A Young, Ian Jackson 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 +Summary: Xen development build, version $version +Name: xen +Version: $version +Release: $release +License: GPL +Group: System/Hypervisor +URL: http://xenbits.xenproject.org/xen.git + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +%define __spec_install_post /usr/lib/rpm/brp-compress || : +%define debug_package %{nil} + +%description +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 an .rpm to make it easy to +uninstall. + +%build + +%install +rm -rf \$RPM_BUILD_ROOT +mkdir -p \$RPM_BUILD_ROOT +cd %{_xenroot} +dist/install.sh \$RPM_BUILD_ROOT/ + +cd \$RPM_BUILD_ROOT + +%clean +rm -rf \$RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +/* + +%post +EOF + +# Package it up +rpmbuild --define "_xenroot $xenroot" --define "_topdir $PWD/rpm" -bb rpm/SPEC/xen.spec + +# Tidy up after ourselves +mv rpm/RPMS/*/*.rpm . +rm -rf rpm -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v2 2/2] Add a "make rpmball" target 2014-03-04 13:56 ` [PATCH v2 2/2] Add a "make rpmball" target George Dunlap @ 2014-03-04 20:17 ` Don Slutz 2014-03-04 20:23 ` George Dunlap 2014-03-04 21:29 ` Don Koch 1 sibling, 1 reply; 9+ messages in thread From: Don Slutz @ 2014-03-04 20:17 UTC (permalink / raw) To: George Dunlap, xen-devel Cc: Olaf Hering, Ian Campbell, Dario Faggioli, Don Slutz, M A Young, Ian Jackson 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 <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 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 error: Bad exit status from /var/tmp/rpm-tmp.7024 (%build) RPM build errors: Bad exit status from /var/tmp/rpm-tmp.7024 (%build) make: *** [rpmball] Error 1 Adding: diff --git a/tools/misc/mkrpm b/tools/misc/mkrpm index 88cf13e..a0aa357 100644 --- a/tools/misc/mkrpm +++ b/tools/misc/mkrpm @@ -29,6 +29,8 @@ rm -rf rpm # Fill in the rpm boilerplate mkdir -p rpm/SPEC +mkdir -p rpm/BUILD +mkdir -p rpm/RPMS/x86_64 cat >rpm/SPEC/xen.spec <<EOF Summary: Xen development build, version $version Name: xen Fixes things up for me. (Fedora 17 does not need this.) -Don Slutz > +cat >rpm/SPEC/xen.spec <<EOF > +Summary: Xen development build, version $version > +Name: xen > +Version: $version > +Release: $release > +License: GPL > +Group: System/Hypervisor > +URL: http://xenbits.xenproject.org/xen.git > + > +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root > +%define __spec_install_post /usr/lib/rpm/brp-compress || : > +%define debug_package %{nil} > + > +%description > +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 an .rpm to make it easy to > +uninstall. > + > +%build > + > +%install > +rm -rf \$RPM_BUILD_ROOT > +mkdir -p \$RPM_BUILD_ROOT > +cd %{_xenroot} > +dist/install.sh \$RPM_BUILD_ROOT/ > + > +cd \$RPM_BUILD_ROOT > + > +%clean > +rm -rf \$RPM_BUILD_ROOT > + > +%files > +%defattr(-,root,root,-) > +/* > + > +%post > +EOF > + > +# Package it up > +rpmbuild --define "_xenroot $xenroot" --define "_topdir $PWD/rpm" -bb rpm/SPEC/xen.spec > + > +# Tidy up after ourselves > +mv rpm/RPMS/*/*.rpm . > +rm -rf rpm ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v2 2/2] Add a "make rpmball" target 2014-03-04 20:17 ` Don Slutz @ 2014-03-04 20:23 ` George Dunlap 2014-03-04 20:35 ` Don Slutz 0 siblings, 1 reply; 9+ messages in thread From: George Dunlap @ 2014-03-04 20:23 UTC (permalink / raw) To: Don Slutz, xen-devel Cc: Ian Jackson, Dario Faggioli, Olaf Hering, Ian Campbell, M A Young 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 <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 > > 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 ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 2/2] Add a "make rpmball" target 2014-03-04 20:23 ` George Dunlap @ 2014-03-04 20:35 ` Don Slutz 2014-03-05 10:10 ` George Dunlap 0 siblings, 1 reply; 9+ messages in thread From: Don Slutz @ 2014-03-04 20:35 UTC (permalink / raw) To: George Dunlap, Don Slutz, xen-devel Cc: Ian Jackson, Dario Faggioli, Olaf Hering, Ian Campbell, M A Young On 03/04/14 15:23, George Dunlap wrote: > mkdir -p rpm/{BUILD,RPMS,SOURCES,SPECS,SRPMS} That does not work, but: mkdir -p rpm/{BUILD,RPMS,SOURCES,SPEC,SRPMS} does (SPECS is not what you want.) -Don ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 2/2] Add a "make rpmball" target 2014-03-04 20:35 ` Don Slutz @ 2014-03-05 10:10 ` George Dunlap 2014-03-05 15:27 ` Don Slutz 0 siblings, 1 reply; 9+ messages in thread From: George Dunlap @ 2014-03-05 10:10 UTC (permalink / raw) To: Don Slutz, xen-devel Cc: Ian Jackson, Dario Faggioli, Olaf Hering, Ian Campbell, M A Young On 03/04/2014 08:35 PM, Don Slutz wrote: > On 03/04/14 15:23, George Dunlap wrote: >> mkdir -p rpm/{BUILD,RPMS,SOURCES,SPECS,SRPMS} > > That does not work, but: > > > mkdir -p rpm/{BUILD,RPMS,SOURCES,SPEC,SRPMS} > > does (SPECS is not what you want.) I'm a bit confused now; your colleague said: --- Begin Quote --- s/SPEC/SPECS/ in the above two lines (per the rpm.org site). It also fixes Don's problem. --- End Quote --- Which sounds like the opposite. :-) The command I sent you was copied from a CentOS wiki -- was the problem perhaps that the "cat" command below the mkdir was still using "SPEC" instead of "SPECS" (and thus failing there, rather than in the rpmbuild)? Is your version of rpmbuild happy with just the one directory named "SPECS", or would it be better to make all the directories? I don't have a Centos 5.x system to test it on. Alternately, we could accept this patch as-is, and then you could post a follow-up fixing it on your system. -George ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 2/2] Add a "make rpmball" target 2014-03-05 10:10 ` George Dunlap @ 2014-03-05 15:27 ` Don Slutz 0 siblings, 0 replies; 9+ messages in thread From: Don Slutz @ 2014-03-05 15:27 UTC (permalink / raw) To: George Dunlap, Don Slutz, xen-devel Cc: Ian Jackson, Dario Faggioli, Olaf Hering, Ian Campbell, M A Young On 03/05/14 05:10, George Dunlap wrote: > On 03/04/2014 08:35 PM, Don Slutz wrote: >> On 03/04/14 15:23, George Dunlap wrote: >>> mkdir -p rpm/{BUILD,RPMS,SOURCES,SPECS,SRPMS} >> >> That does not work, but: >> >> >> mkdir -p rpm/{BUILD,RPMS,SOURCES,SPEC,SRPMS} >> >> does (SPECS is not what you want.) > > I'm a bit confused now; your colleague said: > > --- Begin Quote --- > > s/SPEC/SPECS/ in the above two lines (per the rpm.org site). > It also fixes Don's problem. > > --- End Quote --- > > Which sounds like the opposite. :-) > > The command I sent you was copied from a CentOS wiki -- was the problem perhaps that the "cat" command below the mkdir was still using "SPEC" instead of "SPECS" (and thus failing there, rather than in the rpmbuild)? > Yes. > Is your version of rpmbuild happy with just the one directory named "SPECS", or would it be better to make all the directories? > > I don't have a Centos 5.x system to test it on. > > Alternately, we could accept this patch as-is, and then you could post a follow-up fixing it on your system. > This patch on top of yours works for me on CentOS 5.10: diff --git a/tools/misc/mkrpm b/tools/misc/mkrpm index 88cf13e..fb47b6d 100644 --- a/tools/misc/mkrpm +++ b/tools/misc/mkrpm @@ -28,8 +28,8 @@ cd dist rm -rf rpm # Fill in the rpm boilerplate -mkdir -p rpm/SPEC -cat >rpm/SPEC/xen.spec <<EOF +mkdir -p rpm/{BUILD,RPMS,SOURCES,SPECS,SRPMS} +cat >rpm/SPECS/xen.spec <<EOF Summary: Xen development build, version $version Name: xen Version: $version @@ -69,7 +69,7 @@ rm -rf \$RPM_BUILD_ROOT EOF # Package it up -rpmbuild --define "_xenroot $xenroot" --define "_topdir $PWD/rpm" -bb rpm/SPEC/xen.spec +rpmbuild --define "_xenroot $xenroot" --define "_topdir $PWD/rpm" -bb rpm/SPECS/xen.spec # Tidy up after ourselves mv rpm/RPMS/*/*.rpm . -Don Slutz > -George > ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v2 2/2] Add a "make rpmball" target 2014-03-04 13:56 ` [PATCH v2 2/2] Add a "make rpmball" target George Dunlap 2014-03-04 20:17 ` Don Slutz @ 2014-03-04 21:29 ` Don Koch 1 sibling, 0 replies; 9+ messages in thread From: Don Koch @ 2014-03-04 21:29 UTC (permalink / raw) To: George Dunlap Cc: Olaf Hering, Ian Campbell, Dario Faggioli, Don Slutz, xen-devel, M A Young, Ian Jackson 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 ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 1/2] tools: Use --no-print-directory instead of grep for debball version 2014-03-04 13:56 [PATCH v2 1/2] tools: Use --no-print-directory instead of grep for debball version George Dunlap 2014-03-04 13:56 ` [PATCH v2 2/2] Add a "make rpmball" target George Dunlap @ 2014-03-06 10:34 ` Tim Deegan 1 sibling, 0 replies; 9+ messages in thread From: Tim Deegan @ 2014-03-06 10:34 UTC (permalink / raw) To: George Dunlap; +Cc: Ian Jackson, Ian Campbell, xen-devel At 13:56 +0000 on 04 Mar (1393937808), George Dunlap wrote: > Save a fork, and also avoid :) being interpreted as a smiley. > > Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com> Acked-by: Tim Deegan <tim@xen.org> Don't know why I couldn't find this flag originally. Cheers, Tim. > --- > CC: Ian Jackson <ian.jackson@citrix.com> > CC: Ian Campbell <ian.campbell@citrix.com> > --- > Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index 4e48457..4c5d1b6 100644 > --- a/Makefile > +++ b/Makefile > @@ -150,7 +150,7 @@ world: > # to be a full featured policy compliant .deb package. > .PHONY: debball > debball: dist > - fakeroot sh ./tools/misc/mkdeb $(XEN_ROOT) $$($(MAKE) -C xen xenversion | grep -v :) > + fakeroot sh ./tools/misc/mkdeb $(XEN_ROOT) $$($(MAKE) -C xen xenversion --no-print-directory) > > # clean doesn't do a kclean > .PHONY: clean > -- > 1.7.9.5 > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2014-03-06 10:34 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-03-04 13:56 [PATCH v2 1/2] tools: Use --no-print-directory instead of grep for debball version George Dunlap 2014-03-04 13:56 ` [PATCH v2 2/2] Add a "make rpmball" target George Dunlap 2014-03-04 20:17 ` Don Slutz 2014-03-04 20:23 ` George Dunlap 2014-03-04 20:35 ` Don Slutz 2014-03-05 10:10 ` George Dunlap 2014-03-05 15:27 ` Don Slutz 2014-03-04 21:29 ` Don Koch 2014-03-06 10:34 ` [PATCH v2 1/2] tools: Use --no-print-directory instead of grep for debball version Tim Deegan
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).