Re: [PATCH] Add a "make rpmball" target

[George Dunlap <george.dunlap@eu.citrix.com>]

On 03/03/2014 11:52 PM, M A Young wrote:
>
>
> On Mon, 3 Mar 2014, Don Slutz wrote:
>
>> On 03/03/14 18:37, M A Young wrote:
>>> On Mon, 3 Mar 2014, Don Slutz wrote:
>>>
>>>> On 03/03/14 17:34, Don Slutz wrote:
>>>>> On 03/03/14 11:07, George Dunlap wrote:
>>>>>> On 03/03/2014 02:59 PM, 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>
>>>>>>
>>>>>> I meant to add, I've tested this running as root, but not as a
>>>>>> normal user -- I'd appreciate it if someone could give it a try...
>>>>>>
>>>>>
>>>>> As a user I get:
>>>>> ...
>>>>> sh ./tools/misc/mkrpm /home/don/xen $(make -C xen xenversion | grep
>>>>> -v :)
>>>>> error: line 3: Illegal char '-' in: Version: 4.5-unstable
>>>>> make: *** [rpmball] Error 1
>>>>>
>>>>>    -Don Slutz
>>>>>
>>>>>
>>>>
>>>> And applying a version "fix":
>>>>
>>>>
>>>>
>>>> From 40c6b19abf44aaf7496b4c77536677fc0d463931 Mon Sep 17 00:00:00 2001
>>>> From: Don Slutz <dslutz@verizon.com>
>>>> Date: Mon, 3 Mar 2014 17:59:17 -0500
>>>> Subject: [PATCH] Adjust version
>>>>
>>>> Signed-off-by: Don Slutz <dslutz@verizon.com>
>>>> ---
>>>> Makefile | 2 +-
>>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/Makefile b/Makefile
>>>> index 75e845b..6def25d 100644
>>>> --- a/Makefile
>>>> +++ b/Makefile
>>>> @@ -157,7 +157,7 @@ debball: dist
>>>> # to be a full featured policy compliant .rpm package.
>>>> .PHONY: rpmball
>>>> rpmball: dist
>>>> -       sh ./tools/misc/mkrpm $(XEN_ROOT) $$($(MAKE) -C xen
>>>> xenversion | grep -v :)
>>>> +       sh ./tools/misc/mkrpm $(XEN_ROOT) $$(git describe --long
>>>> --dirty | tr - _)
>>>
>>> You can't assume git will work; it doesn't for the tarball releases.
>>>
>>>     Michael Young
>>
>> How about "| cut -d- -f1":
>>
>> dcs-xen-54:~/xen>make -C xen xenversion | grep -v : | cut -d- -f1
>> 4.5
>
> or you could do
> make -C xen xenversion XEN_EXTRAVERSION="" | grep -v :
> or even
> make --no-print-directory -C xen xenversion XEN_EXTRAVERSION=""

Yes, sorry about that -- I tested "make rpmball", then changed 
something, then tested calling "mkrpm" directly without testing the 
whole thing.  :-/

What I did instead was modify the mkrpm script to parse "xxxx-yy" as 
"version-release".  (And if there's no "-yy", to just make it "0".)  New 
iteration coming.

  -George