Add ``cloneconfig'' target

Cloneconfig takes the first configuration it finds which appears to belong to the running kernel, and configures the kernel sources to match this configuration as closely as possible.

Signed-off-by Andreas Gruenbacher <[email protected]>

Signed-off-by Jeff Mahoney <[email protected]>

---
 scripts/kconfig/Makefile |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

scripts/kconfig/Makefile +7 -0

@@ -99,6 +99,23 @@ PHONY += allnoconfig allyesconfig allmod
 
 allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf
 	$< --$@ $(Kconfig)
+ 
+UNAME_RELEASE := $(shell uname -r)
+CLONECONFIG := $(firstword $(wildcard /proc/config.gz \
+				      /lib/modules/$(UNAME_RELEASE)/.config \
+				      /etc/kernel-config \
+				      /boot/config-$(UNAME_RELEASE)))
+cloneconfig: $(obj)/conf

 This patch adds type handlers for compressed config files. Initial support provides callouts for gzip and bzip2, but there's no reason others could be added if demand is there.

 This is intended to allow /proc/config.gz be a configuration source for 'make oldconfig' when .config is absent.

Signed-off-by Jeff Mahoney <[email protected]>

---

 scripts/kconfig/zconf.l |   50 ++++++++++++++++++++++++++++++++++++++++++++++--

 1 file changed, 48 insertions(+), 2 deletions(-)

scripts/kconfig/zconf.l +48 -3

@@ -256,6 +256,44 @@ static void zconf_endhelp(void)
        BEGIN(INITIAL);
  }
 
+static const struct type_handler {
+       const char *suffix;
+       const char *command;
+} type_handlers[] = {
+       {
+               .suffix = ".gz",
+               .command = "zcat",
+       },
+       {
+               .suffix = ".bz2",
+               .command = "bzcat",
+       },
+       /* Whatever other algorithms you like */
+       {}
+};
+
+static const struct type_handler *get_type_handler(const char *name)
+{
+       char *p = rindex(name, '.');
+       if (p) {
+               const struct type_handler *ops = type_handlers;
+               for (ops = type_handlers; ops->suffix; ops++) {
+                       if (!strcasecmp(ops->suffix, p))
+                               break;
+               }
+               if (!ops->suffix)
+                       return NULL;
+               return ops;
+       }
+       return NULL;
+}
+
+static FILE *zconf_popen(const char *command, const char *name)
+{
+       char cmdbuf[PATH_MAX + strlen(command) + 2];
+       snprintf(cmdbuf, sizeof(cmdbuf), "%s %s", command, name);
+       return popen(cmdbuf, "r");
+}
 
  /*
  * Try to open specified file with following names:

@@ -267,15 +305,23 @@ static void zconf_endhelp(void)
  */
  FILE *zconf_fopen(const char *name)
  {
+       const struct type_handler *handler = get_type_handler(name);
        char *env, fullname[PATH_MAX+1];
        FILE *f;
 
-       f = fopen(name, "r");
+       if (handler)
+               f = zconf_popen(handler->command, name);
+       else
+               f = fopen(name, "r");
+
        if (!f && name != NULL && name[0] != '/') {
                env = getenv(SRCTREE);
                if (env) {
                        sprintf(fullname, "%s/%s", env, name);
-                       f = fopen(fullname, "r");
+                       if (handler)
+                               f = zconf_popen(handler->command, fullname);
+                       else
+                               f = fopen(fullname, "r");
                }
        }
        return f;
 
--

Jeff Mahoney
SUSE Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Hi,

Quoted 7 lines · Jeff Mahoney

This patch adds type handlers for compressed config files. Initial support provides callouts for gzip and bzip2, but there's no reason others could be added if demand is there.

This is intended to allow /proc/config.gz be a configuration source for 'make oldconfig' when .config is absent.

this can be trivially scripted, any reason it _has_ to be done within kconfig ?

Quoted 80 lines

Signed-off-by Jeff Mahoney <[email protected]>

---

 scripts/kconfig/zconf.l |   50 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 2 deletions(-)

scripts/kconfig/zconf.l +48 -2

@@ -256,6 +256,44 @@ static void zconf_endhelp(void)
       BEGIN(INITIAL);
 }
 
+static const struct type_handler {
+       const char *suffix;
+       const char *command;
+} type_handlers[] = {
+       {
+               .suffix = ".gz",
+               .command = "zcat",
+       },
+       {
+               .suffix = ".bz2",
+               .command = "bzcat",
+       },
+       /* Whatever other algorithms you like */
+       {}
+};
+
+static const struct type_handler *get_type_handler(const char *name)
+{
+       char *p = rindex(name, '.');
+       if (p) {
+               const struct type_handler *ops = type_handlers;
+               for (ops = type_handlers; ops->suffix; ops++) {
+                       if (!strcasecmp(ops->suffix, p))
+                               break;
+               }
+               if (!ops->suffix)
+                       return NULL;
+               return ops;
+       }
+       return NULL;
+}
+
+static FILE *zconf_popen(const char *command, const char *name)
+{
+       char cmdbuf[PATH_MAX + strlen(command) + 2];
+       snprintf(cmdbuf, sizeof(cmdbuf), "%s %s", command, name);
+       return popen(cmdbuf, "r");
+}
 
 /*
 * Try to open specified file with following names:

@@ -267,15 +305,23 @@ static void zconf_endhelp(void)
 */
 FILE *zconf_fopen(const char *name)
 {
+       const struct type_handler *handler = get_type_handler(name);
       char *env, fullname[PATH_MAX+1];
       FILE *f;
 
-       f = fopen(name, "r");
+       if (handler)
+               f = zconf_popen(handler->command, name);
+       else
+               f = fopen(name, "r");
+
       if (!f && name != NULL && name[0] != '/') {
               env = getenv(SRCTREE);
               if (env) {
                       sprintf(fullname, "%s/%s", env, name);
-                       f = fopen(fullname, "r");
+                       if (handler)
+                               f = zconf_popen(handler->command, fullname);
+                       else
+                               f = fopen(fullname, "r");
               }
       }
       return f;

Quoted 8 lines

--
Jeff Mahoney
SUSE Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

We already have something remotely similar in kconfig. We use the following list:
config DEFCONFIG_LIST
       string
       depends on !UML
       option defconfig_list
       default "/lib/modules/$UNAME_RELEASE/.config" default "/etc/kernel-config"
       default "/boot/config-$UNAME_RELEASE" default "$ARCH_DEFCONFIG"
       default "arch/$ARCH/defconfig"

It would be better to teach kconfig to read /proc/config.gz and then add it to the list above.

This list is used if you just type "make enuconfig" without any configuration.

       Sam
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Cloneconfig takes the first configuration it finds which appears to belong to the running kernel, and configures the kernel sources to match this configuration as closely as possible.

Signed-off-by Andreas Gruenbacher <[email protected]>

Signed-off-by Jeff Mahoney <[email protected]>

---
 scripts/kconfig/Makefile |   17 +++++++++++++++++

 1 file changed, 17 insertions(+)

scripts/kconfig/Makefile +0 -0

@@ -99,6 +99,23 @@ PHONY += allnoconfig allyesconfig allmod
 

 allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf $< --$@ $(Kconfig)

+               false ;;                                        \
+       *.gz)   gzip -cd $(CLONECONFIG) > .config.running ;;    \
+       *)      cat $(CLONECONFIG) > .config.running ;;         \
+       esac &&                                                 \
+       echo -e "Cloning configuration file $(CLONECONFIG)\n"

+       $(Q)$< -D .config.running arch/$(SRCARCH)/Kconfig +

 PHONY += listnewconfig oldnoconfig savedefconfig defconfig

--
Jeff Mahoney
SUSE Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Hi,

Quoted 12 lines · Sam Ravnborg

We already have something remotely similar in kconfig. We use the following list:
config DEFCONFIG_LIST
       string
       depends on !UML
       option defconfig_list
       default "/lib/modules/$UNAME_RELEASE/.config" default "/etc/kernel-config"
       default "/boot/config-$UNAME_RELEASE" default "$ARCH_DEFCONFIG"
       default "arch/$ARCH/defconfig"

I may argue that anything within the Linux tree which point _by_default_ to something outside the tree itself is broken.

Hi,

Quoted 12 lines · Sam Ravnborg

We already have something remotely similar in kconfig. We use the following list:
config DEFCONFIG_LIST
       string
       depends on !UML
       option defconfig_list
       default "/lib/modules/$UNAME_RELEASE/.config" default "/etc/kernel-config"
       default "/boot/config-$UNAME_RELEASE" default "$ARCH_DEFCONFIG"
       default "arch/$ARCH/defconfig"

I may argue that anything within the Linux tree which point _by_default_ to something outside the tree itself is broken. Say I try to build a Linux kernel on a system with has its own non-kconfig `/etc/kernel-config', I guess this would make the configuration fail.

Quoted 4 lines

It would be better to teach kconfig to read /proc/config.gz and then add it to the list above.

Why ? Thing should be kept simple. kconfig's job is not to know about the trillion file format which exist in the world, even more if the implementation is made by building a command[0], executing it in a separate process and reading the output. This is the shell's job. What may be useful in the contrary would be to eventually teach kconfig to read from <stdin>.

 - Arnaud

[0]: which is built depending on an extension, which is even more awful ...

Quoted 9 lines

This list is used if you just type "make enuconfig" without any configuration.

       Sam
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Quoted 6 lines · Arnaud Lacombe

Why ? Thing should be kept simple. kconfig's job is not to know about the trillion file format which exist in the world, even more if the implementation is made by building a command[0], executing it in a separate process and reading the output. This is the shell's job. What may be useful in the contrary would be to eventually teach kconfig to read from <stdin>.

/proc/config.gz is provided by the kernel and its format is defined by kconfig itself which is, as well, part of the kernel (it is not one random format from a pool of a trillion), so it will be nice if kconfig learns how to read its own configuration from there.

kconfig only knows about config files (one format). The fact that it's gzipped its irrelevant, any reasonable machine capable of building the kernel has gzip installed.

Quoted 15 lines · Arnaud Lacombe

Hi,

Quoted 12 lines · Sam Ravnborg

We already have something remotely similar in kconfig. We use the following list:
config DEFCONFIG_LIST
       string
       depends on !UML
       option defconfig_list
       default "/lib/modules/$UNAME_RELEASE/.config" default "/etc/kernel-config"
       default "/boot/config-$UNAME_RELEASE" default "$ARCH_DEFCONFIG"
       default "arch/$ARCH/defconfig"

Quoted 2 lines

I may argue that anything within the Linux tree which point _by_default_ to something outside the tree itself is broken.

The above allows the average user to just type "make menuconfig" and then the configuration of the current kernel is presented to the user.

This is convinient in many cases.

We know the /proc/config.gz is an incresingly popular way to gain access to the configuration of the running kernel. So extending the already know and working way to obtaing the configuration of the running kernel to suppport /proc/config.gz is logical.

The fact that the configuration is gzipped does not warrant a new option to deal with this that almost duplicate the existing functionality.

Hi,

Quoted 8 lines · Miguel Ojeda

Quoted 6 lines · Arnaud Lacombe

Why ? Thing should be kept simple. kconfig's job is not to know about the trillion file format which exist in the world, even more if the implementation is made by building a command[0], executing it in a separate process and reading the output. This is the shell's job. What may be useful in the contrary would be to eventually teach kconfig to read from <stdin>.

Quoted 5 lines

/proc/config.gz is provided by the kernel and its format is defined by kconfig itself which is, as well, part of the kernel (it is not one random format from a pool of a trillion), so it will be nice if kconfig learns how to read its own configuration from there.

your point being ? kconfig is not only used by the Linux kernel, and you cannot expect the feature to only be used in the cozy Linux kernel environment.

Quoted 5 lines

kconfig only knows about config files (one format). The fact that it's gzipped its irrelevant, any reasonable machine capable of building the kernel has gzip installed.

again, the average user has no interaction with kconfig directly, (s)he uses the top level Makefile target at best. The original patch of Jeff is way better than any hack to read a gzip file from kconfig. KISS and please don't reinvert the wheel.

 - Arnaud

Quoted 7 lines · Arnaud Lacombe

Quoted 5 lines · Miguel Ojeda

/proc/config.gz is provided by the kernel and its format is defined by kconfig itself which is, as well, part of the kernel (it is not one random format from a pool of a trillion), so it will be nice if kconfig learns how to read its own configuration from there.

Quoted 3 lines

your point being ? kconfig is not only used by the Linux kernel, and you cannot expect the feature to only be used in the cozy Linux kernel environment.

My point was that supporting reading from a .gz file is not anywhere near "knowing about the trillion file format which exist in the world"

Quoted 4 lines

The fact that the configuration is gzipped does not warrant a new option to deal with this that almost duplicate the existing functionality.

agree.

Hi,

Quoted 8 lines · Miguel Ojeda

Quoted 6 lines · Arnaud Lacombe

Why ? Thing should be kept simple. kconfig's job is not to know about the trillion file format which exist in the world, even more if the implementation is made by building a command[0], executing it in a separate process and reading the output. This is the shell's job. What may be useful in the contrary would be to eventually teach kconfig to read from <stdin>.

Quoted 5 lines

/proc/config.gz is provided by the kernel and its format is defined by kconfig itself which is, as well, part of the kernel (it is not one random format from a pool of a trillion), so it will be nice if kconfig learns how to read its own configuration from there.

your point being ? kconfig is not only used by the Linux kernel, and you cannot expect the feature to only be used in the cozy Linux kernel environment.

Hi,

Quoted 12 lines · Miguel Ojeda

Quoted 10 lines · Arnaud Lacombe

Quoted 5 lines · Miguel Ojeda

/proc/config.gz is provided by the kernel and its format is defined by kconfig itself which is, as well, part of the kernel (it is not one random format from a pool of a trillion), so it will be nice if kconfig learns how to read its own configuration from there.

your point being ? kconfig is not only used by the Linux kernel, and you cannot expect the feature to only be used in the cozy Linux kernel environment.

Quoted 3 lines

My point was that supporting reading from a .gz file is not anywhere near "knowing about the trillion file format which exist in the world"

Well, Jeff's patch is already about gzip and bzip2. Soon it will be compress, xz, zip, rar, then rzip, lzma, 7z ...

I added bzip2 as an exercise. But realistically, what would be wrong with distributors deciding to ship /boot/config-$UNAME_RELEASE.bz2 and saving a bit of valuable /boot disk space?

Even if people /do/ submit patches do do all of those formats, your argument is based on the premise that having that ability is necessarily bad. I don't think we need them, but I don't think it's a good argument against this patch either.

But this argument isn't really relevant. As with all of the other files listed in the defconfig_list, if it's missing (or can't be read), it will move on to the next one. Decompressing it first just makes things /more/ confusing since the initial message of 'defaults read from...' will read the name of the decompressed temporary file, not the source. It makes more sense to see it as "reading defaults from /proc/config.gz since that's obvious to anyone with kernel experience.

Quoted 13 lines · Arnaud Lacombe

Quoted 12 lines · Sam Ravnborg

We already have something remotely similar in kconfig. We use the following list:
config DEFCONFIG_LIST
       string
       depends on !UML
       option defconfig_list
       default "/lib/modules/$UNAME_RELEASE/.config" default "/etc/kernel-config"
       default "/boot/config-$UNAME_RELEASE" default "$ARCH_DEFCONFIG"
       default "arch/$ARCH/defconfig"

Quoted 2 lines

I may argue that anything within the Linux tree which point _by_default_ to something outside the tree itself is broken.

The above allows the average user to just type "make menuconfig" and then the configuration of the current kernel is presented to the user. This is convinient in many cases.
We know the /proc/config.gz is an incresingly popular way to gain access to the configuration of the running kernel. So extending the already know and working way to obtaing the configuration of the running kernel to suppport /proc/config.gz is logical.

Quoted 16 lines · Sam Ravnborg

Quoted 13 lines · Arnaud Lacombe

Quoted 12 lines · Sam Ravnborg

We already have something remotely similar in kconfig. We use the following list:
config DEFCONFIG_LIST
       string
       depends on !UML
       option defconfig_list
       default "/lib/modules/$UNAME_RELEASE/.config" default "/etc/kernel-config"
       default "/boot/config-$UNAME_RELEASE" default "$ARCH_DEFCONFIG"
       default "arch/$ARCH/defconfig"

Quoted 2 lines

I may argue that anything within the Linux tree which point _by_default_ to something outside the tree itself is broken.

Quoted 7 lines

The above allows the average user to just type "make menuconfig" and then the configuration of the current kernel is presented to the user. This is convinient in many cases.
We know the /proc/config.gz is an incresingly popular way to gain access to the configuration of the running kernel. So extending the already know and working way to obtaing the configuration of the running kernel to suppport /proc/config.gz is logical.

Does this detect cross-compiling?

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds

Quoted 16 lines · Sam Ravnborg

Quoted 13 lines · Arnaud Lacombe

Quoted 12 lines · Sam Ravnborg

We already have something remotely similar in kconfig. We use the following list:
config DEFCONFIG_LIST
string
depends on !UML
option defconfig_list
default "/lib/modules/$UNAME_RELEASE/.config" default "/etc/kernel-config"
default "/boot/config-$UNAME_RELEASE" default "$ARCH_DEFCONFIG"
default "arch/$ARCH/defconfig"

Quoted 2 lines

I may argue that anything within the Linux tree which point _by_default_ to something outside the tree itself is broken.

Quoted 7 lines

The above allows the average user to just type "make menuconfig" and then the configuration of the current kernel is presented to the user. This is convinient in many cases.
We know the /proc/config.gz is an incresingly popular way to gain access to the configuration of the running kernel. So extending the already know and working way to obtaing the configuration of the running kernel to suppport /proc/config.gz is logical.

Does this detect cross-compiling? The 'depends on !UML' triggered me...

Hi,

Quoted 4 lines · Arnaud Lacombe

Quoted 4 lines

The fact that the configuration is gzipped does not warrant a new option to deal with this that almost duplicate the existing functionality.

Quoted 2 lines

agree.

Let me precise, as there may be confusion. I agree about the new target issue, but definitively think this kconfig "option" (more a hack, which required a special option within kconfig) should be handled by Kbuild, not Kconfig, ie. I'd discard "option defconfig_list". File decompression (and eventually which config to pick) should be done prior to the invocation of Kconfig.