lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 4 Mar 2020 15:04:43 -0800 From: Randy Dunlap <rdunlap@...radead.org> To: Masami Hiramatsu <mhiramat@...nel.org>, Steven Rostedt <rostedt@...dmis.org> Cc: Geert Uytterhoeven <geert@...ux-m68k.org>, Borislav Petkov <bp@...en8.de>, LKML <linux-kernel@...r.kernel.org>, Ingo Molnar <mingo@...nel.org>, Andrew Morton <akpm@...ux-foundation.org>, Peter Zijlstra <peterz@...radead.org> Subject: Re: [PATCH 1/2] bootconfig: Support O=<builddir> option On 3/3/20 3:24 AM, Masami Hiramatsu wrote: > Support O=<builddir> option to build bootconfig tool in > the other directory. As same as other tools, if you specify > O=<builddir>, bootconfig command is build under <builddir>. Hm. If I use $ make O=~/tmp -C tools/bootconfig that works: it builds bootconfig in ~/tmp. OTOH, if I sit at the top of the kernel source tree and I enter $ mkdir builddir $ make O=builddir -C tools/bootconfig I get this: make: Entering directory '/home/rdunlap/lnx/next/linux-next-20200304/tools/bootconfig' ../scripts/Makefile.include:4: *** O=builddir does not exist. Stop. make: Leaving directory '/home/rdunlap/lnx/next/linux-next-20200304/tools/bootconfig' so it looks like tools/scripts/Makefile.include doesn't handle this case correctly (which is how I do all of my builds). > Reported-by: Randy Dunlap <rdunlap@...radead.org> > Signed-off-by: Masami Hiramatsu <mhiramat@...nel.org> > --- > tools/bootconfig/Makefile | 27 +++++++++++++++++---------- > tools/bootconfig/test-bootconfig.sh | 14 ++++++++++---- > 2 files changed, 27 insertions(+), 14 deletions(-) > > diff --git a/tools/bootconfig/Makefile b/tools/bootconfig/Makefile > index a6146ac64458..da5975775337 100644 > --- a/tools/bootconfig/Makefile > +++ b/tools/bootconfig/Makefile > @@ -1,23 +1,30 @@ > # SPDX-License-Identifier: GPL-2.0 > # Makefile for bootconfig command > +include ../scripts/Makefile.include > > bindir ?= /usr/bin > > -HEADER = include/linux/bootconfig.h > -CFLAGS = -Wall -g -I./include > +ifeq ($(srctree),) > +srctree := $(patsubst %/,%,$(dir $(CURDIR))) > +srctree := $(patsubst %/,%,$(dir $(srctree))) > +endif > > -PROGS = bootconfig > +LIBSRC = $(srctree)/lib/bootconfig.c $(srctree)/include/linux/bootconfig.h > +CFLAGS = -Wall -g -I$(CURDIR)/include > > -all: $(PROGS) > +ALL_TARGETS := bootconfig > +ALL_PROGRAMS := $(patsubst %,$(OUTPUT)%,$(ALL_TARGETS)) > > -bootconfig: ../../lib/bootconfig.c main.c $(HEADER) > +all: $(ALL_PROGRAMS) > + > +$(OUTPUT)bootconfig: main.c $(LIBSRC) > $(CC) $(filter %.c,$^) $(CFLAGS) -o $@ > > -install: $(PROGS) > - install bootconfig $(DESTDIR)$(bindir) > +test: $(ALL_PROGRAMS) test-bootconfig.sh > + ./test-bootconfig.sh $(OUTPUT) > > -test: bootconfig > - ./test-bootconfig.sh > +install: $(ALL_PROGRAMS) > + install $(OUTPUT)bootconfig $(DESTDIR)$(bindir) > > clean: > - $(RM) -f *.o bootconfig > + $(RM) -f $(OUTPUT)*.o $(ALL_PROGRAMS) > diff --git a/tools/bootconfig/test-bootconfig.sh b/tools/bootconfig/test-bootconfig.sh > index 1411f4c3454f..81b350ffd03f 100755 > --- a/tools/bootconfig/test-bootconfig.sh > +++ b/tools/bootconfig/test-bootconfig.sh > @@ -3,9 +3,16 @@ > > echo "Boot config test script" > > -BOOTCONF=./bootconfig > -INITRD=`mktemp initrd-XXXX` > -TEMPCONF=`mktemp temp-XXXX.bconf` > +if [ -d "$1" ]; then > + TESTDIR=$1 > +else > + TESTDIR=. > +fi > +BOOTCONF=${TESTDIR}/bootconfig > + > +INITRD=`mktemp ${TESTDIR}/initrd-XXXX` > +TEMPCONF=`mktemp ${TESTDIR}/temp-XXXX.bconf` > +OUTFILE=`mktemp ${TESTDIR}/tempout-XXXX` > NG=0 > > cleanup() { > @@ -65,7 +72,6 @@ new_size=$(stat -c %s $INITRD) > xpass test $new_size -eq $initrd_size > > echo "No error messge while applying" > -OUTFILE=`mktemp tempout-XXXX` > dd if=/dev/zero of=$INITRD bs=4096 count=1 > printf " \0\0\0 \0\0\0" >> $INITRD > $BOOTCONF -a $TEMPCONF $INITRD > $OUTFILE 2>&1 > -- ~Randy Reported-by: Randy Dunlap <rdunlap@...radead.org>
Powered by blists - more mailing lists