On Mon, Jan 13, 2014 at 07:02:46PM -0500, Josh Boyer wrote:
> > Note: the variant of the buildid stuff in the fedora spec looks far more
> > complicated than what is in the rhel7 spec. There are only 2 lines of spec
> > goo with buildid on them. I'd certainly endorse a patch that stripped out
> > all the extraneous crap. All I really need is:
> >
> > # % define buildid .local
> >
> > and
> >
> > %define pkg_release %{fedora_build}%{?buildid}%{?dist}
>
> Yeah, I'll look into that.
OK, I think I'll go with the below which is basically what you
suggested.
josh
>From c73ae11479c80014d06c8726b4f1215b03b19fb4 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxx>
Date: Tue, 14 Jan 2014 12:58:43 -0500
Subject: [PATCH] Reduce buildid definition clutter
The buildid mechanism is still used by a nubmer of people, but it's
unnecessarily complicated in the spec. We don't need to do all the
manipulations that are current done just to allow people to easily
mark their builds as different. Just leave the commented out
definition and include it in pkg_release.
---
kernel.spec | 28 ----------------------------
1 file changed, 28 deletions(-)
diff --git a/kernel.spec b/kernel.spec
index 71daa64..6e98cb4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -16,35 +16,7 @@ Summary: The Linux kernel
%global signmodules 0
%endif
-# Save original buildid for later if it's defined
-%if 0%{?buildid:1}
-%global orig_buildid %{buildid}
-%undefine buildid
-%endif
-
-###################################################################
-# Polite request for people who spin their own kernel rpms:
-# please modify the "buildid" define in a way that identifies
-# that the kernel isn't the stock distribution kernel, for example,
-# by setting the define to ".local" or ".bz123456". This will be
-# appended to the full kernel version.
-#
-# (Uncomment the '#' and both spaces below to set the buildid.)
-#
# % define buildid .local
-###################################################################
-
-# The buildid can also be specified on the rpmbuild command line
-# by adding --define="buildid .whatever". If both the specfile and
-# the environment define a buildid they will be concatenated together.
-%if 0%{?orig_buildid:1}
-%if 0%{?buildid:1}
-%global srpm_buildid %{buildid}
-%define buildid %{srpm_buildid}%{orig_buildid}
-%else
-%define buildid %{orig_buildid}
-%endif
-%endif
# baserelease defines which build revision of this kernel version we're
# building. We used to call this fedora_build, but the magical name
--
1.8.4.2
_______________________________________________
kernel mailing list
kernel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/kernel
