From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from conssluserg-06.nifty.com ([210.131.2.91]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hcmbs-0004ZT-1o for barebox@lists.infradead.org; Mon, 17 Jun 2019 08:03:26 +0000 Received: from mail-vs1-f49.google.com (mail-vs1-f49.google.com [209.85.217.49]) (authenticated) by conssluserg-06.nifty.com with ESMTP id x5H82lTm002297 for ; Mon, 17 Jun 2019 17:02:48 +0900 Received: by mail-vs1-f49.google.com with SMTP id q64so5566144vsd.1 for ; Mon, 17 Jun 2019 01:02:48 -0700 (PDT) MIME-Version: 1.0 References: <20190610084704.8996-1-yamada.masahiro@socionext.com> <20190617070524.bhcpfkv4thpouxax@pengutronix.de> In-Reply-To: <20190617070524.bhcpfkv4thpouxax@pengutronix.de> From: Masahiro Yamada Date: Mon, 17 Jun 2019 17:02:11 +0900 Message-ID: List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH] kconfig: update to Linux 5.2-rc4 To: Sascha Hauer Cc: Barebox List Hi Sascha, On Mon, Jun 17, 2019 at 4:05 PM Sascha Hauer wrote: > > Hi Masahiro, > > On Mon, Jun 10, 2019 at 05:47:04PM +0900, Masahiro Yamada wrote: > > @@ -854,7 +860,7 @@ define symlink-config-h > > fi > > endef > > > > -include/config.h: include/config/auto.conf > > +include/config.h: > > $(Q)$(symlink-config-h) > > I had to revert this change. Without the dependency to > include/config/auto.conf include/config.h won't get updated on Kconfig > changes. Is reverting this change the right thing to do or do we have to > do something else? You are right. Once include/config.h is created, it will never be updated. Reverting this hunk would work in most cases, but I think it is strange to use timestamps to determine whether a symbolic link is re-linked or not. If include/config.h is a symlink, it will end up with comparing the timestamps between $(srctree)/$(BOARD)/config.h and include/config/auto.conf, which is pointless. I do not know why 'touch -a $@' is needed when $(srctree)/$(BOARD)/config.h does not exist. How about this? diff --git a/Makefile b/Makefile index 071b927068c4..196a2a2625c8 100644 --- a/Makefile +++ b/Makefile @@ -827,7 +827,7 @@ endif prepare2: prepare3 outputmakefile prepare1: prepare2 include/generated/version.h include/generated/utsrelease.h \ - include/config.h + symlink-config-h ifneq ($(KBUILD_MODULES),) $(Q)mkdir -p $(MODVERDIR) @@ -849,16 +849,14 @@ export CPPFLAGS_barebox.lds += -C -U$(ARCH) define symlink-config-h if [ -f $(srctree)/$(BOARD)/config.h ]; then \ - $(kecho) ' SYMLINK $@ -> $(BOARD)/config.h'; \ ln -fsn $(srctree)/$(BOARD)/config.h $@; \ else \ - [ -h $@ ] && rm -f $@; \ - $(kecho) ' CREATE $@'; \ - touch -a $@; \ + rm -f $@; \ fi endef -include/config.h: +PHONY += symlink-config-h +symlink-config-h: $(Q)$(symlink-config-h) # Generate some files -- Best Regards Masahiro Yamada _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox