[opensuse-kernel] [patch #2 0/5] scripts/sequence-patch.sh: Add some useful options

newer
[opensuse-kernel] Xen Dom0 support

older
[opensuse-kernel] Kernel-defined...

Jeff Mahoney

19 Jan 2011 19 Jan '11

18:40

Hi all - There are a few things I do every time I expand the source tree with sequence-patch.sh. Or, rather, things I should do and forget to do a lot. The first I always remember to do: Copy the config I want to test with to my build directory. The second I forget more often than not: Expand the kABI references into my build directory. One of the things that bites me occasionally is when there are kABI changes that go un-noticed until the automated build checker flags them and sends me an email yelling at me for my carelessness. This patch adds three options to scripts/sequence-patch.sh to take care of these automatically. --build-dir=PATH allows you to specify the build directory you'll be using. It will create the directory if it doesn't exist. It defaults to $PATCH_DIR. --config=ARCH-FLAVOR allows you to specify the config you'll use. It will copy the config to your build directory. It is not a fatal error if the config does not exist. It will just not copy one. --kabi allows you to direct sequence-patch to expand the kABI references into your build directory. Since the references are arch/flavor specific, it depends on --config=ARCH-FLAVOR. It is not a fatal error if the kABI reference doesn't exist since this is always the case in the master branch. The --build-dir PATH is subject to shell expansion. It is expanded late enough in the script that most variables should be available. There are also three new variables available when --config is used: $CONFIG contains the --config contents. $CONFIG_ARCH contains the arch part of the config. $CONFIG_FLAVOR contains the flavor part. For reference, I have this in my .bashrc: export SEQUENCE_PATCH_ARGS="--config=x86_64-desktop --build-dir=~/src/scratch/build/\$CONFIG_ARCH/linux-\$SRCVERSION-\$TAG-\$CONFIG_FLAVOR --kabi" I've also added patches for --ctags and --cscope which will automatically generate the databases for either of those tools in the build directory after the source tree is expanded. - Issues addressed in patchset #2: - Help text is now a here document for easy addition of more documentation - Explanation of which variables are allowed by --build-dir - Missing rpm/modversions script is not an error on older branches - Missing symvers files are not errors - Uses true/false for simple feature flags -Jeff -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kernel+help@opensuse.org

Show replies by date

Jeff Mahoney

19 Jan 19 Jan

18:40

New subject: [opensuse-kernel] [patch #2 1/5] scripts/sequence-patch.sh: Add --build-dir option

I use a separate build directory from the tree in which I expand the source tree. Some files, such as Module.supported are generated automatically and placed in the source tree. This patch adds a --build-dir=PATH option and uses that directory for generated files. If it doesn't exist, it will create it. If it does exist, it will not clean it. Except to re-set the source and patches links it will create. Signed-off-by: Jeff Mahoney --- scripts/sequence-patch.sh | 40 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) --- a/scripts/sequence-patch.sh +++ b/scripts/sequence-patch.sh @@ -37,7 +37,19 @@ sles9* | sles10* | sle10* | 9.* | 10.* | esac usage() { - echo "SYNOPSIS: $0 [-qv] [--symbol=...] [--dir=...] [--combine] [--fast] [last-patch-name] [--vanilla] [--fuzz=NUM]" + cat < $PATCH_DIR/Module.supported + scripts/guards base external < supported.conf > "$SP_BUILD_DIR/Module.supported" fi [ $# -gt 0 ] && exit $status -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kernel+help@opensuse.org

Jan Beulich

20 Jan 20 Jan

09:19

New subject: [opensuse-kernel] [patch #2 1/5] scripts/sequence-patch.sh: Add --build-dir option

...

...
...
On 19.01.11 at 19:40, Jeff Mahoney wrote: I use a separate build directory from the tree in which I expand the source tree. Some files, such as Module.supported are generated automatically and placed in the source tree.

I think it is actually correct to place this in the source tree - instead of putting it in the build tree, I have been carrying this --- head-2011-01-10.orig/scripts/Makefile.modpost +++ head-2011-01-10/scripts/Makefile.modpost @@ -84,7 +84,8 @@ modpost = scripts/mod/modpost $(if $(cross_build),-c) \ $(if $(CONFIG_ENTERPRISE_SUPPORT), \ -N $(firstword $(wildcard $(dir $(MODVERDIR))/Module.supported \ - $(objtree)/Module.supported /dev/null))) + $(objtree)/Module.supported \ + $(srctree)/Module.supported /dev/null))) quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules cmd_modpost = $(modpost) -s (addressing in particular the case where you want to build multiple configs/arches from a single source tree) which obviously could be folded into patches.suse/supported-flag if so desired. Jan -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kernel+help@opensuse.org

Jan Beulich

5 Oct 5 Oct

07:09

New subject: [opensuse-kernel] [patch #2 1/5] scripts/sequence-patch.sh: Add --build-dir option

...

...
...
On 19.01.11 at 19:40, Jeff Mahoney wrote: I use a separate build directory from the tree in which I expand the source tree. Some files, such as Module.supported are generated automatically and placed in the source tree.

Which makes me assume you build only a single config. For obvious(?) reasons I usually build two or three (native, Xen, and on some branches EC2).

...

This patch adds a --build-dir=PATH option and uses that directory for generated files. If it doesn't exist, it will create it. If it does exist, it will not clean it. Except to re-set the source and patches links it will create.

Rather than putting generated files in the build tree, I'd recommend allowing to reference them in the source tree (Modules.supported really is a source file from an expanded-source-tree perspective, i.e. from the pov of the actual kernel build). At the risk of repeating myself, this is what I patch into each end every source snapshot I take (and I would love to see this integrated into patches.suse/supported-flag, but I never received an ack to do so on earlier posts): --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -84,7 +84,8 @@ modpost = scripts/mod/modpost $(if $(cross_build),-c) \ $(if $(CONFIG_ENTERPRISE_SUPPORT), \ -N $(firstword $(wildcard $(dir $(MODVERDIR))/Module.supported \ - $(objtree)/Module.supported /dev/null))) + $(objtree)/Module.supported \ + $(srctree)/Module.supported /dev/null))) quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules cmd_modpost = $(modpost) -s I'm sure something similar ought to be possible for the reference symsets (which, from a kernel build pov again are source files, and could be generated for all active flavors at once, just like the configs used to be). That would eliminate the need for sequence-patch to have to know the build directory (which I don't want to be read as objection to the change you propose - for those building just a single config that's certainly fine, but if above suggestions are taken, then it'll likely end up just creating an empty directory). Jan

...

Signed-off-by: Jeff Mahoney --- scripts/sequence-patch.sh | 40 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-)

--- a/scripts/sequence-patch.sh +++ b/scripts/sequence-patch.sh @@ -37,7 +37,19 @@ sles9* | sles10* | sle10* | 9.* | 10.* | esac

usage() { - echo "SYNOPSIS: $0 [-qv] [--symbol=...] [--dir=...] [--combine] [--fast] [last-patch-name] [--vanilla] [--fuzz=NUM]" + cat <
@@ -49,7 +61,7 @@ if $have_arch_patches; then else arch_opt="" fi -options=`getopt -o qvd:F: --long quilt,no-quilt,$arch_opt,symbol:,dir:,combine,fast,vanilla,fuzz -- "$@"` +options=`getopt -o qvd:F: --long quilt,no-quilt,$arch_opt,symbol:,dir:,combine,fast,vanilla,fuzz,build-dir: -- "$@"`

if [ $? -ne 0 ] then @@ -64,6 +76,7 @@ QUILT=true COMBINE= FAST= VANILLA=false +SP_BUILD_DIR=

while true; do case "$1" in @@ -105,6 +118,10 @@ while true; do fuzz="-F$2" shift ;; + --build-dir) + SP_BUILD_DIR="$2" + shift + ;; --) shift break ;; @@ -217,6 +234,13 @@ EXT=${EXTRA_SYMBOLS// /-} EXT=${EXT//\//} PATCH_DIR=${PATCH_DIR}${EXT:+-}$EXT

+if [ -n "$SP_BUILD_DIR" ]; then + # This allows alias (~) and variable expansion + SP_BUILD_DIR=$(eval echo "$SP_BUILD_DIR") +else + SP_BUILD_DIR="$PATCH_DIR" +fi + echo "Creating tree in $PATCH_DIR"

# Clean up from previous run @@ -434,9 +458,19 @@ fi

echo "[ Tree: $PATCH_DIR ]"

+append= +if test "$SP_BUILD_DIR" != "$PATCH_DIR"; then + mkdir -p "$SP_BUILD_DIR" + echo "[ Build Dir: $SP_BUILD_DIR ]" + rm -f "$SP_BUILD_DIR/source" + rm -f "$SP_BUILD_DIR/patches" + ln -sf "$PATCH_DIR" "$SP_BUILD_DIR/source" + ln -sf "source/patches" "$SP_BUILD_DIR/patches" +fi + if test -e supported.conf; then echo "[ Generating Module.supported ]" - scripts/guards base external < supported.conf > $PATCH_DIR/Module.supported + scripts/guards base external < supported.conf > "$SP_BUILD_DIR/Module.supported" fi

[ $# -gt 0 ] && exit $status

-- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kernel+help@opensuse.org

Michal Marek

09:24

New subject: [opensuse-kernel] [patch #2 1/5] scripts/sequence-patch.sh: Add --build-dir option

On 5.10.2011 09:09, Jan Beulich wrote:

...

...
...
...
On 19.01.11 at 19:40, Jeff Mahoney wrote: I use a separate build directory from the tree in which I expand the source tree. Some files, such as Module.supported are generated automatically and placed in the source tree.

Which makes me assume you build only a single config. For obvious(?) reasons I usually build two or three (native, Xen, and on some branches EC2).

Note that you are replying to an old patch that was wating in some mail spool and now got delivered :). The patch has been merged already.

...

--- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -84,7 +84,8 @@ modpost = scripts/mod/modpost $(if $(cross_build),-c) \ $(if $(CONFIG_ENTERPRISE_SUPPORT), \ -N $(firstword $(wildcard $(dir $(MODVERDIR))/Module.supported \ - $(objtree)/Module.supported /dev/null))) + $(objtree)/Module.supported \ + $(srctree)/Module.supported /dev/null)))

quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules cmd_modpost = $(modpost) -s

This patch makes sense, please commit it. Acked-by: Michal Marek Michal -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kernel+help@opensuse.org

Jan Beulich

10:13

New subject: [opensuse-kernel] [patch #2 1/5] scripts/sequence-patch.sh: Add --build-dir option

...

...
...
...
...
On 19.01.11 at 19:40, Jeff Mahoney wrote: I use a separate build directory from the tree in which I expand the source

On 05.10.11 at 11:24, Michal Marek wrote: On 5.10.2011 09:09, Jan Beulich wrote: tree. Some files, such as Module.supported are generated automatically and placed in the source tree.

Which makes me assume you build only a single config. For obvious(?) reasons I usually build two or three (native, Xen, and on some branches EC2).

Note that you are replying to an old patch that was wating in some mail spool and now got delivered :). The patch has been merged already.

Ooops...

...

...
--- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -84,7 +84,8 @@ modpost = scripts/mod/modpost $(if $(cross_build),-c) \ $(if $(CONFIG_ENTERPRISE_SUPPORT), \ -N $(firstword $(wildcard $(dir $(MODVERDIR))/Module.supported \ - $(objtree)/Module.supported /dev/null))) + $(objtree)/Module.supported \ + $(srctree)/Module.supported /dev/null)))

quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules cmd_modpost = $(modpost) -s

This patch makes sense, please commit it.

Acked-by: Michal Marek

Any objection to also do this for SLE11 SP2? Jan -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org

Michal Marek

10:17

New subject: [opensuse-kernel] [patch #2 1/5] scripts/sequence-patch.sh: Add --build-dir option

On 5.10.2011 12:13, Jan Beulich wrote:

...

...
...
...
On 05.10.11 at 11:24, Michal Marek wrote: --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -84,7 +84,8 @@ modpost = scripts/mod/modpost $(if $(cross_build),-c) \ $(if $(CONFIG_ENTERPRISE_SUPPORT), \ -N $(firstword $(wildcard $(dir $(MODVERDIR))/Module.supported \

+ $(objtree)/Module.supported \ + $(srctree)/Module.supported /dev/null)))

quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules cmd_modpost = $(modpost) -s

This patch makes sense, please commit it.

Acked-by: Michal Marek

Any objection to also do this for SLE11 SP2?

Go ahead. Michal -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org

Jeff Mahoney

13:55

New subject: [opensuse-kernel] [patch #2 1/5] scripts/sequence-patch.sh: Add --build-dir option

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 10/05/2011 05:24 AM, Michal Marek wrote:

...

On 5.10.2011 09:09, Jan Beulich wrote:

...
...
...
...
On 19.01.11 at 19:40, Jeff Mahoney wrote: I use a separate build directory from the tree in which I expand the source tree. Some files, such as Module.supported are generated automatically and placed in the source tree.

Which makes me assume you build only a single config. For obvious(?) reasons I usually build two or three (native, Xen, and on some branches EC2).

Note that you are replying to an old patch that was wating in some mail spool and now got delivered :). The patch has been merged already.

This was my fault. I was sending out my btrfs patch queue and used the wrong mbox file. *embarrassed* - -Jeff

...

...
--- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -84,7 +84,8 @@ modpost = scripts/mod/modpost $(if $(cross_build),-c) \ $(if $(CONFIG_ENTERPRISE_SUPPORT), \ -N $(firstword $(wildcard $(dir $(MODVERDIR))/Module.supported \ - $(objtree)/Module.supported /dev/null))) + $(objtree)/Module.supported \ + $(srctree)/Module.supported /dev/null)))

quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules cmd_modpost = $(modpost) -s

This patch makes sense, please commit it.

Acked-by: Michal Marek

Michal

- -- Jeff Mahoney SUSE Labs -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk6MYeUACgkQLPWxlyuTD7JRJwCdGWyIuNUUJlloDD5cejJhR0uk wN4AoIJd9b46pjZPE2v0OUDjS79D/MRC =4nbQ -----END PGP SIGNATURE----- -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org

Jeff Mahoney

19 Jan 19 Jan