mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Keith Owens <kaos@ocs.com.au>
To: Albert Cranford <ac9410@bellsouth.net>
Cc: linux-kernel@vger.kernel.org
Subject: Re: [patch] 2.5.25 remove unnecessary recompiles when changing EXTRAVERSION
Date: Sun, 07 Jul 2002 11:54:40 +1000	[thread overview]
Message-ID: <6291.1026006880@ocs3.intra.ocs.com.au> (raw)
In-Reply-To: Your message of "Sat, 06 Jul 2002 16:47:21 -0400." <3D275759.A0B105A8@bellsouth.net>

On Sat, 06 Jul 2002 16:47:21 -0400, 
Albert Cranford <ac9410@bellsouth.net> wrote:
>What do the changes to Makefile-2.5 look like for
>Kbuild-3.1 ?

This has had two minutes of testing.  Apply after core-21, it should
auto detect if the uts_release patch has been applied or not.  This
will be included in kbuild 2.5 once the uts_release.h patch is included
in 2.5.x, I am holding off in case the uts_release patch has to change.

Index: 18.99/Makefile-2.5
--- 18.99/Makefile-2.5 Fri, 05 Jul 2002 17:16:39 +1000 kaos (linux-2.4/E/d/40_Makefile-2 1.32.2.27.1.8 644)
+++ 18.99(w)/Makefile-2.5 Sun, 07 Jul 2002 11:52:02 +1000 kaos (linux-2.4/E/d/40_Makefile-2 1.32.2.27.1.8 644)
@@ -588,13 +588,24 @@ endif
 
 export KERNELRELEASE VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION USERVERSION
 
+# This code has to work on kernels with and without a separate uts_release.h.
+# If module.h still uses UTS_RELEASE then then assume that version.h must
+# include uts_release.h.
+
+ifneq ($(shell grep UTS_RELEASE $(KBUILD_SRCTREE_000)include/linux/module.h),)
+  include_uts_release	:= \#include <linux/uts_release.h>
+else
+  include_uts_release	:= /* uts_release.h is now handled separately */
+endif
+
 $(KBUILD_OBJTREE)include/linux/version.h: $(KBUILD_OBJTREE)A_version FORCE_BUILD
 	@cd $(KBUILD_OBJTREE)
 ifeq ($(KBUILD_WRITABLE),y)
 	@mkdir -p $(KBUILD_OBJTREE)include/linux
-	@(echo \#include \<linux/uts_release.h\> && \
+	@(echo '$(include_uts_release)' && \
 	  echo \#define LINUX_VERSION_CODE `expr $(VERSION) \\* 65536 + $(PATCHLEVEL) \\* 256 + $(SUBLEVEL)` && \
-	  echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))' \
+	  echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))' && \
+	  echo '#define KERNEL_VERSION_STRING "$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)"' \
 	 ) > $(KBUILD_OBJTREE).tmp_version.h && \
 	 (cmp -s $(KBUILD_OBJTREE).tmp_version.h $@ || mv -f $(KBUILD_OBJTREE).tmp_version.h $@)
 endif


       reply	other threads:[~2002-07-07  1:52 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <3D275759.A0B105A8@bellsouth.net>
2002-07-07  1:54 ` Keith Owens [this message]
2002-07-06 11:53 Keith Owens
2002-07-22  0:20 ` Kai Germaschewski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6291.1026006880@ocs3.intra.ocs.com.au \
    --to=kaos@ocs.com.au \
    --cc=ac9410@bellsouth.net \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®