mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 3/5] move utsrelease.h to include/generated/ instead of include/linux
Date: Fri, 17 Sep 2010 06:40:34 +0200	[thread overview]
Message-ID: <1284698436-1097-3-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <1284698436-1097-1-git-send-email-plagnioj@jcrosoft.com>

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 .gitignore                  |    1 -
 Makefile                    |    6 +++---
 common/command.c            |    2 +-
 scripts/setupmbr/setupmbr.c |    2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2179251..2c580c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,7 +46,6 @@ include/asm
 include/asm-*/asm-offsets.h
 include/config
 include/linux/compile.h
-include/linux/utsrelease.h
 include/generated
 
 # stgit generated dirs
diff --git a/Makefile b/Makefile
index 838d6ed..c990005 100644
--- a/Makefile
+++ b/Makefile
@@ -796,7 +796,7 @@ endif
 # prepare2 creates a makefile if using a separate output directory
 prepare2: prepare3 outputmakefile
 
-prepare1: prepare2 include/generated/version.h include/linux/utsrelease.h \
+prepare1: prepare2 include/generated/version.h include/generated/utsrelease.h \
                    include/asm include/config.h include/config/auto.conf
 
 ifneq ($(KBUILD_MODULES),)
@@ -882,7 +882,7 @@ endef
 include/generated/version.h: $(srctree)/Makefile FORCE
 	$(call filechk,version.h)
 
-include/linux/utsrelease.h: include/config/kernel.release FORCE
+include/generated/utsrelease.h: include/config/kernel.release FORCE
 	$(call filechk,utsrelease.h)
 
 # ---------------------------------------------------------------------------
@@ -979,7 +979,7 @@ CLEAN_FILES +=	barebox System.map include/barebox_default_env.h \
 MRPROPER_DIRS  += include/config include2 usr/include
 MRPROPER_FILES += .config .config.old include/asm .version .old_version \
                   include/generated/autoconf.h include/generated/version.h      \
-                  include/linux/utsrelease.h include/config.h           \
+                  include/generated/utsrelease.h include/config.h           \
 		  Module.symvers tags TAGS cscope*
 
 # clean - Delete most, but leave enough to build external modules
diff --git a/common/command.c b/common/command.c
index 8ed1072..f1aeeb9 100644
--- a/common/command.c
+++ b/common/command.c
@@ -33,7 +33,7 @@
 #include <linux/list.h>
 #include <init.h>
 #include <complete.h>
-#include <linux/utsrelease.h>
+#include <generated/utsrelease.h>
 #include <getopt.h>
 
 const char version_string[] =
diff --git a/scripts/setupmbr/setupmbr.c b/scripts/setupmbr/setupmbr.c
index 01e8c64..3cfec97 100644
--- a/scripts/setupmbr/setupmbr.c
+++ b/scripts/setupmbr/setupmbr.c
@@ -42,7 +42,7 @@
 #include <assert.h>
 
 /* include the info from this barebox release */
-#include "include/linux/utsrelease.h"
+#include "include/generated/utsrelease.h"
 #include "arch/x86/include/asm/barebox.lds.h"
 
 /** define to disable integrity tests and debug messages */
-- 
1.7.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2010-09-17  4:41 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-17  4:40 [PATCH 1/5] gitignore: update generated link and file Jean-Christophe PLAGNIOL-VILLARD
2010-09-17  4:40 ` [PATCH 2/5] move version.h to include/generated/ instead of include/linux Jean-Christophe PLAGNIOL-VILLARD
2010-09-17  4:40 ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2010-09-17  4:40 ` [PATCH 4/5] arm: move mach-types.h to include/generated/ Jean-Christophe PLAGNIOL-VILLARD
2010-09-17  4:40 ` [PATCH 5/5] move barebox_default_env.h " Jean-Christophe PLAGNIOL-VILLARD

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=1284698436-1097-3-git-send-email-plagnioj@jcrosoft.com \
    --to=plagnioj@jcrosoft.com \
    --cc=barebox@lists.infradead.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