Re: [PATCHv2 2/2] scripts/kernel-doc: check that non-void fcts describe their return value
On 27.11.2012 02:43, Randy Dunlap wrote: > On 11/26/2012 01:22 PM, Yacine Belkadi wrote: > >> If a function has a return value, but its kernel-doc comment doesn't contain >> a >> "Return" section, then emit the following warning: >> >>Warning(file.h:129): No description found for return value of 'fct' >> >> Note: This check emits a lot of warnings at the moment, because many >> functions >> don't have a 'Return' doc section. So until the number of warnings goes >> sufficiently down, the check is only performed in verbose mode. >> >> Signed-off-by: Yacine Belkadi > > > Both patches: > Acked-by: Randy Dunlap > > Michal, please merge patches 1 and 2. Thanks for the review and for adding me to CC. Yacine, could you please resend the patches? I got unsubscribed from lkml yesterday, because my @suse mail was bouncing :(. Thanks, Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-3.9.0-rc1+: Output from "make kernelrelease"contains incorrect data
On 1.4.2013 11:28, Chris Clayton wrote: > Ping! > > This is still happening with 3.9-rc5. > > [chris:~/kernel/linux]$ make bzImage > ... > Kernel: arch/x86/boot/bzImage is ready (#14) > [chris:~/kernel/linux]$ make kernelrelease > scripts/kconfig/conf --silentoldconfig Kconfig > 3.9.0-rc5 > [chris:~/kernel/linux]$ make kernelrelease > 3.9.0-rc5 You need to run make -s kernelrelease. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH V7 REPOST] kbuild: create a rule to run the pre-processor on *.dts files
On 29.1.2013 01:33, Stephen Warren wrote: > From: Stephen Warren > > Create cmd_dtc_cpp to run the C pre-processor on *.dts file before > passing them to dtc for final compilation. This allows the use of #define > and #include within the .dts file. > > Signed-off-by: Stephen Warren > Acked-by: Simon Glass > Acked-by: Jean-Christophe PLAGNIOL-VILLARD > --- > Grant, back in mid-November, you said you'd make a decision on this in > the next couple of days, but I think this got overlooked. You can add Acked-by: Michal Marek . Or I can add it to the kbuild tree if Grant is OK with the patch. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] scripts: kconfig: qconf.cc: fix a compiliation error when using make xconfig
On Thu, Jan 24, 2013 at 04:20:39PM +, Tiana Rakotovao Andriamahefa wrote: > Le jeudi 24 janvier 2013 à 11:36:31, Michal Marek a écrit : > > On 16.1.2013 13:26, Tiana Rakotovao Andriamahefa wrote: > > > I have checked it and found that the error was effectively fixed in the > > > last > > > maintained upload of Qt3 in 2011. However, the correction is not yet in > > > Wheezy > > > (Debian testing) which I have used for more than a year. It might be > > > included there one day! > > > This is the case of Debian, but not all distros. > > > > OK. And it is dead upstream. So I'll apply your patch. Could you please > > resend it? I deleted the email already. > > Here is the patch. > > When using make xconfig, the following compilation error appears : >/usr/include/qt3/qvaluelist.h:427:13: error: ‘ptrdiff_t’ does not name a > type > Including stddef.h in scripts/kconfig/qconf.cc permits to avoid this error. > > Signed-off-by: Tiana Rakotovao Andriamahefa Thanks, applied to kbuild.git#kconfig. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 1/1] depmod: pass -P $CONFIG_SYMBOL_PREFIX
On 31.1.2013 10:41, James Hogan wrote: > On architectures which have symbol prefixes, depmod emits lots of false > warnings like this: > > WARNING: $module.ko needs unknown symbol $symbol > > This is because depmod isn't being passed the -P > arguments to specify the symbol prefix to ignore. This option is > included since the 3.13 release of module-init-tools. > > Update scripts/depmod.sh to take extra arguments which are passed > through directly to depmod, and update the main Makefile to pass > -P $(CONFIG_SYMBOL_PREFIX to scripts/depmod.sh, but only if > CONFIG_SYMBOL_PREFIX is set and non-empty. OK. > scripts/depmod.sh also drops the -P arguments if depmod --version > reports module-init-tools with a version number < 3.13. You can replace the test with a simple "$DEPMOD" -P _ --help 2>/dev/null >/dev/null Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 1/1] depmod: pass -P $CONFIG_SYMBOL_PREFIX
On 31.1.2013 11:50, James Hogan wrote: > Hi Michal, > > On 31/01/13 10:37, Michal Marek wrote: >> On 31.1.2013 10:41, James Hogan wrote: >>> On architectures which have symbol prefixes, depmod emits lots of false >>> warnings like this: >>> >>> WARNING: $module.ko needs unknown symbol $symbol >>> >>> This is because depmod isn't being passed the -P >>> arguments to specify the symbol prefix to ignore. This option is >>> included since the 3.13 release of module-init-tools. >>> >>> Update scripts/depmod.sh to take extra arguments which are passed >>> through directly to depmod, and update the main Makefile to pass >>> -P $(CONFIG_SYMBOL_PREFIX to scripts/depmod.sh, but only if >>> CONFIG_SYMBOL_PREFIX is set and non-empty. >> >> OK. >> >> >>> scripts/depmod.sh also drops the -P arguments if depmod --version >>> reports module-init-tools with a version number < 3.13. >> >> You can replace the test with a simple >> >> "$DEPMOD" -P _ --help 2>/dev/null >/dev/null > > Thanks for the suggestion. It would be much cleaner, but unfortunately I > tried this on module-init-tools 3.3-pre2 and module-init-tools 3.9 and > both still return success. Indeed, depmod had the modutils fallback, so it did not fail on unknown options immediately. So the version parsing is inevitable. Thanks for checking. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: qt3 and ptrdiff_t build error
On 16.1.2013 13:26, Tiana Rakotovao Andriamahefa wrote: > I have checked it and found that the error was effectively fixed in the last > maintained upload of Qt3 in 2011. However, the correction is not yet in Wheezy > (Debian testing) which I have used for more than a year. It might be > included there one day! > This is the case of Debian, but not all distros. OK. And it is dead upstream. So I'll apply your patch. Could you please resend it? I deleted the email already. Thanks, Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] Add Intel Ivy bridge CPU flags
On Wed, Jan 23, 2013 at 06:43:17PM +0100, Alec Bickerton wrote: > Hi, > > I'd like to submit the attached patch to add Ivy Bridge processor support to > the > processor type menu in menuconfig. Setting this configures the appropriate > CFLAGS (core-avx-i) for ivy bridge. > > As this is my first kbuild patch, could somebody review it and let me know > what > I've done wrong. ;-) You sent it to linux-kbuild instead of x...@kernel.org. The kbuild maintainer is not really knowledgeable about gcc optimisation options ;). Nevertheless, some random comments are below. Note that I am not saying if the config option is useful or not. > > Thanks > Alec. > From 2eaf7717da5b7f753c66e2158d29744aafbc2a0c Mon Sep 17 00:00:00 2001 > From: Alec Bickerton > Date: Mon, 1 Oct 2012 21:12:55 +0200 > Subject: [PATCH] Added Ivy bridge to menu > > --- > arch/x86/Kconfig.cpu |5 + > arch/x86/Makefile |5 - > arch/x86/Makefile_32.cpu |1 + > arch/x86/include/asm/module.h |2 ++ > 4 files changed, 12 insertions(+), 1 deletion(-) > > diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu > index f3b86d0..e7834c0 100644 > --- a/arch/x86/Kconfig.cpu > +++ b/arch/x86/Kconfig.cpu > @@ -267,6 +267,11 @@ config MCORE2 > 53xx) CPUs. You can distinguish newer from older Xeons by the CPU > family in /proc/cpuinfo. Newer ones have 6 and older ones 15 > (not a typo) > +config MIVYBRIDGE Keep the options separate by blank lines. > +bool "Intel Ivy Bridge" > +--help-- > + > + Select this foe Intel 3770K family processors. > > config MATOM > bool "Intel Atom" > diff --git a/arch/x86/Makefile b/arch/x86/Makefile > index 474ca35..e945e58 100644 > --- a/arch/x86/Makefile > +++ b/arch/x86/Makefile > @@ -61,7 +61,10 @@ else > cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona) > > cflags-$(CONFIG_MCORE2) += \ > -$(call cc-option,-march=core2,$(call > cc-option,-mtune=generic)) > +$(call cc-option,-march=core2,$(call > cc-option,-mtune=generic) > + ) No need to touch this? > +cflags-$(CONFIG_MIVYBRIDGE) += \ > +$(call cc-option,-march=core-avx-i,$(call > cc-option,-mtune=generic)) > cflags-$(CONFIG_MATOM) += $(call cc-option,-march=atom) \ > $(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic)) > cflags-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=generic) > diff --git a/arch/x86/Makefile_32.cpu b/arch/x86/Makefile_32.cpu > index 86cee7b..f5194ff 100644 > --- a/arch/x86/Makefile_32.cpu > +++ b/arch/x86/Makefile_32.cpu > @@ -33,6 +33,7 @@ cflags-$(CONFIG_MCYRIXIII) += $(call > cc-option,-march=c3,-march=i486) $(align)-f > cflags-$(CONFIG_MVIAC3_2)+= $(call cc-option,-march=c3-2,-march=i686) > cflags-$(CONFIG_MVIAC7) += -march=i686 > cflags-$(CONFIG_MCORE2) += -march=i686 $(call tune,core2) > +cflags-$(CONFIG_MIVYBRIDGE) += -march=i686 $(call tune,core-avx-i) > cflags-$(CONFIG_MATOM) += $(call cc-option,-march=atom,$(call > cc-option,-march=core2,-march=i686)) \ > $(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic)) > > diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h > index 9eae775..758a438 100644 > --- a/arch/x86/include/asm/module.h > +++ b/arch/x86/include/asm/module.h > @@ -17,6 +17,8 @@ > #define MODULE_PROC_FAMILY "586MMX " > #elif defined CONFIG_MCORE2 > #define MODULE_PROC_FAMILY "CORE2 " > +#elif defined CONFIG_MIVYBRIDGE > +#define MODULE_PROC_FAMILY "IVYBRIDGE" Missing trailing space. > #elif defined CONFIG_MATOM > #define MODULE_PROC_FAMILY "ATOM " > #elif defined CONFIG_M686 > -- > 1.7.10.4 > Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] scripts/coccinelle/misc/semicolon.cocci: Add unneeded semicolon test
On 23.1.2013 22:41, Peter Senna Tschudin wrote: > ping pong I added the patch to kbuild.git#misc now, sorry for the delay. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 2/4] MODSIGN: Specify the hash algorithm on sign-file command line
Dne 24.1.2013 16:17, David Howells napsal(a): > Michal Marek wrote: > >> +our ($opt_v, $opt_a); > > Should this be 'our' or 'my'? These are global variables set by getopts(), so they need to be declared 'our'. But I can change it to use the two-argument version of getopts, that does not use global variables. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v2 2/4] MODSIGN: Specify the hash algorithm on sign-file command line
Make the script usable without a .config file.
Signed-off-by: Michal Marek
---
v2: Add the hash algorithm as the first positional argument
---
Makefile |2 +-
scripts/sign-file | 53 -
2 files changed, 17 insertions(+), 38 deletions(-)
diff --git a/Makefile b/Makefile
index 51a9bda..0e7e736 100644
--- a/Makefile
+++ b/Makefile
@@ -723,7 +723,7 @@ ifeq ($(CONFIG_MODULE_SIG),y)
MODSECKEY = ./signing_key.priv
MODPUBKEY = ./signing_key.x509
export MODPUBKEY
-mod_sign_cmd = perl $(srctree)/scripts/sign-file $(MODSECKEY) $(MODPUBKEY)
+mod_sign_cmd = perl $(srctree)/scripts/sign-file $(CONFIG_MODULE_SIG_HASH)
$(MODSECKEY) $(MODPUBKEY)
else
mod_sign_cmd = true
endif
diff --git a/scripts/sign-file b/scripts/sign-file
index 974a20b..2c2bbd1 100755
--- a/scripts/sign-file
+++ b/scripts/sign-file
@@ -4,7 +4,7 @@
#
# Format:
#
-# ./scripts/sign-file [-v][]
+# ./scripts/sign-file [-v] []
#
#
use strict;
@@ -17,36 +17,20 @@ if ($#ARGV >= 0 && $ARGV[0] eq "-v") {
shift;
}
-die "Format: ./scripts/sign-file [-v][]\n"
-if ($#ARGV != 2 && $#ARGV != 3);
+die "Format: ./scripts/sign-file [-v]
[]\n"
+if ($#ARGV != 3 && $#ARGV != 4);
-my $private_key = $ARGV[0];
-my $x509 = $ARGV[1];
-my $module = $ARGV[2];
-my $dest = ($#ARGV == 3) ? $ARGV[3] : $ARGV[2] . "~";
+my $dgst = $ARGV[0];
+my $private_key = $ARGV[1];
+my $x509 = $ARGV[2];
+my $module = $ARGV[3];
+my $dest = ($#ARGV == 4) ? $ARGV[4] : $ARGV[3] . "~";
die "Can't read private key\n" unless (-r $private_key);
die "Can't read X.509 certificate\n" unless (-r $x509);
die "Can't read module\n" unless (-r $module);
#
-# Read the kernel configuration
-#
-my %config = (
-CONFIG_MODULE_SIG_SHA512 => 1
-);
-
-if (-r ".config") {
-open(FD, "<.config") || die ".config";
-while () {
- if ($_ =~ /^(CONFIG_.*)=[ym]/) {
- $config{$1} = 1;
- }
-}
-close(FD);
-}
-
-#
# Function to read the contents of a file into a variable.
#
sub read_file($)
@@ -321,51 +305,46 @@ my $id_type = 1; # Identifier type: X.509
#
# Digest the data
#
-my ($dgst, $prologue) = ();
-if (exists $config{"CONFIG_MODULE_SIG_SHA1"}) {
+my $prologue;
+if ($dgst eq "sha1") {
$prologue = pack("C*",
0x30, 0x21, 0x30, 0x09, 0x06, 0x05,
0x2B, 0x0E, 0x03, 0x02, 0x1A,
0x05, 0x00, 0x04, 0x14);
-$dgst = "-sha1";
$hash = 2;
-} elsif (exists $config{"CONFIG_MODULE_SIG_SHA224"}) {
+} elsif ($dgst eq "sha224") {
$prologue = pack("C*",
0x30, 0x2d, 0x30, 0x0d, 0x06, 0x09,
0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x04,
0x05, 0x00, 0x04, 0x1C);
-$dgst = "-sha224";
$hash = 7;
-} elsif (exists $config{"CONFIG_MODULE_SIG_SHA256"}) {
+} elsif ($dgst eq "sha256") {
$prologue = pack("C*",
0x30, 0x31, 0x30, 0x0d, 0x06, 0x09,
0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01,
0x05, 0x00, 0x04, 0x20);
-$dgst = "-sha256";
$hash = 4;
-} elsif (exists $config{"CONFIG_MODULE_SIG_SHA384"}) {
+} elsif ($dgst eq "sha384") {
$prologue = pack("C*",
0x30, 0x41, 0x30, 0x0d, 0x06, 0x09,
0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02,
0x05, 0x00, 0x04, 0x30);
-$dgst = "-sha384";
$hash = 5;
-} elsif (exists $config{"CONFIG_MODULE_SIG_SHA512"}) {
+} elsif ($dgst eq "sha512") {
$prologue = pack("C*",
0x30, 0x51, 0x30, 0x0d, 0x06, 0x09,
0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03,
0x05, 0x00, 0x04, 0x40);
-$dgst = "-sha512";
$hash = 6;
} else {
-die "Can't determine hash algorithm";
+die "Unknown hash algorithm: $dgst\n";
}
#
# Generate the digest and read from openssl's stdout
#
my $digest;
-$digest = readpipe("openssl dgst $dgst -binary $module") || die "openssl dgst";
+$digest = readpipe("openssl dgst -$dgst -binary $module") || die "openssl
dgst";
#
# Generate the binary signature, which will be just the integer that comprises
--
1.7.8.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH v2 4/4] MODSIGN: Add option to not sign modules during modules_install
To allow the builder to sign only a subset of modules, or to sign the modules using a key that is not available on the build machine, add CONFIG_MODULE_SIG_ALL. If this option is unset, no modules will be signed during build. The default is 'y', to preserve the current behavior. Signed-off-by: Michal Marek --- No changes in v2 --- Makefile |2 +- init/Kconfig | 11 +++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 0e7e736..e2027b2 100644 --- a/Makefile +++ b/Makefile @@ -719,7 +719,7 @@ endif # INSTALL_MOD_STRIP export mod_strip_cmd -ifeq ($(CONFIG_MODULE_SIG),y) +ifdef CONFIG_MODULE_SIG_ALL MODSECKEY = ./signing_key.priv MODPUBKEY = ./signing_key.x509 export MODPUBKEY diff --git a/init/Kconfig b/init/Kconfig index ba7d1c1..d2db2e7 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1602,6 +1602,17 @@ config MODULE_SIG_FORCE Reject unsigned modules or signed modules for which we don't have a key. Without this, such modules will simply taint the kernel. +config MODULE_SIG_ALL + bool "Automatically sign all modules" + default y + depends on MODULE_SIG + help + Sign all modules during make modules_install. Without this option, + modules must be signed manually, using the scripts/sign-file tool. + +comment "Do not forget to sign required modules with scripts/sign-file" + depends on MODULE_SIG_FORCE && !MODULE_SIG_ALL + choice prompt "Which hash algorithm should modules be signed with?" depends on MODULE_SIG -- 1.7.8.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v2 3/4] MODSIGN: Add -s option to sign-file
This option allows to append an externally computed singature to the
module. This is needed in setups, where the private key is not directly
available, but a service exists that returns signatures for given files.
Signed-off-by: Michal Marek
---
v2: Use two-argument version of getopts to avoid global variables
Use parentheses in EXPR if (...) constructs
---
scripts/sign-file | 99 ++---
1 files changed, 56 insertions(+), 43 deletions(-)
diff --git a/scripts/sign-file b/scripts/sign-file
index 2c2bbd1..2b7c448 100755
--- a/scripts/sign-file
+++ b/scripts/sign-file
@@ -2,31 +2,41 @@
#
# Sign a module file using the given key.
#
-# Format:
-#
-# ./scripts/sign-file [-v] []
-#
-#
+
+my $USAGE =
+"Usage: scripts/sign-file [-v] []\n" .
+" scripts/sign-file [-v] -s
[]\n";
+
use strict;
use FileHandle;
use IPC::Open2;
+use Getopt::Std;
-my $verbose = 0;
-if ($#ARGV >= 0 && $ARGV[0] eq "-v") {
-$verbose = 1;
-shift;
-}
+my %opts;
+getopts('vs:', \%opts) or die $USAGE;
+my $verbose = $opts{'v'};
+my $signature_file = $opts{'s'};
-die "Format: ./scripts/sign-file [-v]
[]\n"
-if ($#ARGV != 3 && $#ARGV != 4);
+die $USAGE if ($#ARGV > 4);
+die $USAGE if (!$signature_file && $#ARGV < 3 || $signature_file && $#ARGV <
2);
-my $dgst = $ARGV[0];
-my $private_key = $ARGV[1];
-my $x509 = $ARGV[2];
-my $module = $ARGV[3];
-my $dest = ($#ARGV == 4) ? $ARGV[4] : $ARGV[3] . "~";
+my $dgst = shift @ARGV;
+my $private_key;
+if (!$signature_file) {
+ $private_key = shift @ARGV;
+}
+my $x509 = shift @ARGV;
+my $module = shift @ARGV;
+my ($dest, $keep_orig);
+if (@ARGV) {
+ $dest = $ARGV[0];
+ $keep_orig = 1;
+} else {
+ $dest = $module . "~";
+}
-die "Can't read private key\n" unless (-r $private_key);
+die "Can't read private key\n" if (!$signature_file && !-r $private_key);
+die "Can't read signature file\n" if ($signature_file && !-r $signature_file);
die "Can't read X.509 certificate\n" unless (-r $x509);
die "Can't read module\n" unless (-r $module);
@@ -340,33 +350,36 @@ if ($dgst eq "sha1") {
die "Unknown hash algorithm: $dgst\n";
}
-#
-# Generate the digest and read from openssl's stdout
-#
-my $digest;
-$digest = readpipe("openssl dgst -$dgst -binary $module") || die "openssl
dgst";
-
-#
-# Generate the binary signature, which will be just the integer that comprises
-# the signature with no metadata attached.
-#
-my $pid;
-$pid = open2(*read_from, *write_to,
-"openssl rsautl -sign -inkey $private_key -keyform PEM") ||
-die "openssl rsautl";
-binmode write_to;
-print write_to $prologue . $digest || die "pipe to openssl rsautl";
-close(write_to) || die "pipe to openssl rsautl";
-
-binmode read_from;
my $signature;
-read(read_from, $signature, 4096) || die "pipe from openssl rsautl";
-close(read_from) || die "pipe from openssl rsautl";
+if ($signature_file) {
+ $signature = read_file($signature_file);
+} else {
+ #
+ # Generate the digest and read from openssl's stdout
+ #
+ my $digest;
+ $digest = readpipe("openssl dgst -$dgst -binary $module") || die
"openssl dgst";
+
+ #
+ # Generate the binary signature, which will be just the integer that
+ # comprises the signature with no metadata attached.
+ #
+ my $pid;
+ $pid = open2(*read_from, *write_to,
+"openssl rsautl -sign -inkey $private_key -keyform PEM") ||
+ die "openssl rsautl";
+ binmode write_to;
+ print write_to $prologue . $digest || die "pipe to openssl rsautl";
+ close(write_to) || die "pipe to openssl rsautl";
+
+ binmode read_from;
+ read(read_from, $signature, 4096) || die "pipe from openssl rsautl";
+ close(read_from) || die "pipe from openssl rsautl";
+ waitpid($pid, 0) || die;
+ die "openssl rsautl died: $?" if ($? >> 8);
+}
$signature = pack("n", length($signature)) . $signature,
-waitpid($pid, 0) || die;
-die "openssl rsautl died: $?" if ($? >> 8);
-
#
# Build the signed binary
#
@@ -403,6 +416,6 @@ print FD
;
close FD || die $dest;
-if ($#ARGV != 3) {
+if (!$keep_orig) {
rename($dest, $module) || die $module;
}
--
1.7.8.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH v2 1/4] MODSIGN: Simplify Makefile with a Kconfig helper
Signed-off-by: Michal Marek --- v2: Check in kernel/Makefile that CONFIG_MODULE_SIG_HASH is set --- init/Kconfig|9 + kernel/Makefile | 22 +++--- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/init/Kconfig b/init/Kconfig index 6fdd6e3..ba7d1c1 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1634,6 +1634,15 @@ config MODULE_SIG_SHA512 endchoice +config MODULE_SIG_HASH + string + depends on MODULE_SIG + default "sha1" if MODULE_SIG_SHA1 + default "sha224" if MODULE_SIG_SHA224 + default "sha256" if MODULE_SIG_SHA256 + default "sha384" if MODULE_SIG_SHA384 + default "sha512" if MODULE_SIG_SHA512 + endif # MODULES config INIT_ALL_POSSIBLE diff --git a/kernel/Makefile b/kernel/Makefile index 86e3285..fe5dfb0 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -148,23 +148,7 @@ kernel/modsign_pubkey.o: signing_key.x509 extra_certificates # fail and that the kernel may be used afterwards. # ### -sign_key_with_hash := -ifeq ($(CONFIG_MODULE_SIG_SHA1),y) -sign_key_with_hash := -sha1 -endif -ifeq ($(CONFIG_MODULE_SIG_SHA224),y) -sign_key_with_hash := -sha224 -endif -ifeq ($(CONFIG_MODULE_SIG_SHA256),y) -sign_key_with_hash := -sha256 -endif -ifeq ($(CONFIG_MODULE_SIG_SHA384),y) -sign_key_with_hash := -sha384 -endif -ifeq ($(CONFIG_MODULE_SIG_SHA512),y) -sign_key_with_hash := -sha512 -endif -ifeq ($(sign_key_with_hash),) +ifndef CONFIG_MODULE_SIG_HASH $(error Could not determine digest type to use from kernel config) endif @@ -177,8 +161,8 @@ signing_key.priv signing_key.x509: x509.genkey @echo "### needs to be run as root, and uses a hardware random" @echo "### number generator if one is available." @echo "###" - openssl req -new -nodes -utf8 $(sign_key_with_hash) -days 36500 -batch \ - -x509 -config x509.genkey \ + openssl req -new -nodes -utf8 -$(CONFIG_MODULE_SIG_HASH) -days 36500 \ + -batch -x509 -config x509.genkey \ -outform DER -out signing_key.x509 \ -keyout signing_key.priv @echo "###" -- 1.7.8.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] mod/file2alias: make modalias generation safe for cross compiling
Dne 20.1.2013 17:58, Andreas Schwab napsal(a): > Use the target compiler to compute the offsets for the fields of the > device_id structures, so that it won't be broken by different alignments > between the host and target ABIs. > > This also fixes missing endian corrections for some modaliases. > > Signed-off-by: Andreas Schwab > --- > This has been tested with an allmodconfig cross build of the m68k > kernel. This is the difference in the generated module aliases before > and after the patch: Nice! I merged your patch to kbuild.git#kbuild. Thanks, Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2 3/4] MODSIGN: Add -s option to sign-file
David Howells wrote: >Michal Marek wrote: > >> This option allows to append an externally computed singature to the >> module. This is needed in setups, where the private key is not >directly >> available, but a service exists that returns signatures for given >files. >> >> Signed-off-by: Michal Marek >> --- >> v2: Use two-argument version of getopts to avoid global variables >> Use parentheses in EXPR if (...) constructs > >Feel free to add: > >Acked-by: David Howells > >to your patches. Thanks for your review. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 3/3] convert headers_install.pl->headers_install.sh
On Mon, Dec 17, 2012 at 05:12:51PM -0800, r...@landley.net wrote: > From: Rob Landley > > Remove perl from make headers_install by replacing a perl script (doing > a simple regex search and replace) with a smaller, faster, simpler, > POSIX-2008 shell script implementation. The new shell script is a single > for loop calling sed and piping its output through unifdef to produce the > target file. > > Signed-off-by: Rob Landley > --- > > scripts/Makefile.headersinst |4 +- > scripts/headers_install.pl | 63 - > scripts/headers_install.sh | 43 ++ > 3 files changed, 45 insertions(+), 65 deletions(-) Hi Rob, sorry for the long delay. In general, the patch looks OK, I only have two remarks: > + -e 's/(^|[ \t])(inline|asm|volatile)([ \t(]|$)/\1__\2__\3/g' \ This regexp does not match the 'volatile' in #define XVMCLOCKPTR(saPriv,lockNo) \ ((volatile struct drm_hw_lock *)(unsigned long) (saPriv)->XvMCLockArea) + \ (VIA_MAX_CACHELINE_SIZE - 1)) & \ ~(VIA_MAX_CACHELINE_SIZE - 1)) + \ VIA_MAX_CACHELINE_SIZE*(lockNo))) in include/uapi/drm/via_drm.h. > --- a/scripts/headers_install.pl > +++ /dev/null > @@ -1,63 +0,0 @@ > -#!/usr/bin/perl -w > -# > -# headers_install prepare the listed header files for use in > -# user space and copy the files to their destination. > -# > -# Usage: headers_install.pl readdir installdir arch [files...] > -# installdir: dir to install the files to > -# arch: current architecture > -# arch is used to force a reinstallation when the arch > -# changes because kbuild then detect a command line change. You are not passing $(SRCARCH) to the shell script. This seems OK, as the list of files changes if needed, but the change should be mentioned in the changelog. Thanks, Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the kbuild tree
On 25.2.2013 00:56, Stephen Rothwell wrote:
> Hi Michal,
>
> After merging the kbuild tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> scripts/link-vmlinux.sh: line 135: .: .config: file not found
>
> Presumably caused by commit 03b25b47e0f4 ("scripts/link-vmlinux.sh:
> source variables from KCONFIG_CONFIG").
Strange, I did a couple of testbuilds before pushing the new branch.
Wild guess: what version of what shell are you using on the
buildmachine? It is probably the missing ./ that makes the difference.
Thanks,
Michal
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the kbuild tree
On 25.2.2013 11:58, Stephen Rothwell wrote: > -- > $ ls -l /bin/sh > lrwxrwxrwx 1 root root 4 Jul 7 2010 /bin/sh -> bash > $ bash --version > GNU bash, version 4.2.20(1)-release (x86_64-pc-linux-gnu) [...] > But bash in sh mode does not work: > > $ cat xtst.sh > #!/bin/sh > > cd /scratch/sfr/powerpc_ppc64_defconfig > > . .config > > exit 0 > $ ./xtst.sh > ./xtst.sh: line 5: .: .config: file not found Ah, so it's a too new bash that causes this. I can also reproduce it now. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] kbuild: Fix reading of .config in link-vmlinux.sh
The shell '.' command is not required to search the current directory as
a fallback and in fact newer versions of bash in sh-mode do not do this.
Force reading the file from the current directory if $KCONFIG_CONFIG
contains no '/'.
Reported-by: Stephen Rothwell
Signed-off-by: Michal Marek
---
scripts/link-vmlinux.sh |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index e62f1e0..3d569d6 100644
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -132,7 +132,14 @@ if [ "$1" = "clean" ]; then
fi
# We need access to CONFIG_ symbols
-. ${KCONFIG_CONFIG}
+case "${KCONFIG_CONFIG}" in
+*/*)
+ . "${KCONFIG_CONFIG}"
+ ;;
+*)
+ # Force using a file from the current directory
+ . "./${KCONFIG_CONFIG}"
+esac
#link vmlinux.o
info LD vmlinux.o
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] kbuild: Fix reading of .config in link-vmlinux.sh
On 25.2.2013 13:54, Michal Marek wrote: > The shell '.' command is not required to search the current directory as > a fallback and in fact newer versions of bash in sh-mode do not do this. > Force reading the file from the current directory if $KCONFIG_CONFIG > contains no '/'. > > Reported-by: Stephen Rothwell > Signed-off-by: Michal Marek > --- > scripts/link-vmlinux.sh |9 - > 1 file changed, 8 insertions(+), 1 deletion(-) I was able to reproduce the failure and this patch fixed it. So I am going to push this in a couple of hours, so that tomorrow's linux-next can include the latest kbuild changes. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 1/1] scripts/package/builddeb: build perftools package.
Added Maximilian to CC.
Michal
On 26.2.2013 02:30, Gary Lowell wrote:
> This will build a linux-tools-$version package for each build that includes
> perf. We've been using this for internal builds and other folks might find
> it helpful.
>
> Signed-off-by: Gary Lowell
> ---
> scripts/package/builddeb | 95
> +-
> 1 file changed, 94 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> index acb8650..f57d33c 100644
> --- a/scripts/package/builddeb
> +++ b/scripts/package/builddeb
> @@ -78,17 +78,20 @@ tmpdir="$objtree/debian/tmp"
> fwdir="$objtree/debian/fwtmp"
> kernel_headers_dir="$objtree/debian/hdrtmp"
> libc_headers_dir="$objtree/debian/headertmp"
> +tools_dir="$objtree/debian/toolstmp"
> +tmp_build_dir="$objtree/debian/toolsbuild"
> packagename=linux-image-$version
> fwpackagename=linux-firmware-image
> kernel_headers_packagename=linux-headers-$version
> libc_headers_packagename=linux-libc-dev
> +tools_packagename=linux-tools-$version
>
> if [ "$ARCH" = "um" ] ; then
> packagename=user-mode-linux-$version
> fi
>
> # Setup the directory structure
> -rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir"
> +rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir"
> "$tools_dir" "$tmp_build_dir"
> mkdir -m 755 -p "$tmpdir/DEBIAN"
> mkdir -p "$tmpdir/lib" "$tmpdir/boot" "$tmpdir/usr/share/doc/$packagename"
> mkdir -m 755 -p "$fwdir/DEBIAN"
> @@ -98,6 +101,10 @@ mkdir -p
> "$libc_headers_dir/usr/share/doc/$libc_headers_packagename"
> mkdir -m 755 -p "$kernel_headers_dir/DEBIAN"
> mkdir -p "$kernel_headers_dir/usr/share/doc/$kernel_headers_packagename"
> mkdir -p "$kernel_headers_dir/lib/modules/$version/"
> +mkdir -m 755 -p "$tools_dir/DEBIAN"
> +mkdir -p "$tools_dir/usr/share/doc/$tools_packagename"
> +mkdir -p "$tools_dir/usr/bin/"
> +mkdir -p "$tmp_build_dir"
> if [ "$ARCH" = "um" ] ; then
> mkdir -p "$tmpdir/usr/lib/uml/modules/$version" "$tmpdir/usr/bin"
> fi
> @@ -120,6 +127,77 @@ else
> fi
> fi
>
> +# Build the tools
> +num_tools="0"
> +tools_flavour_abi=${version#*-}
> +tools_flavour=${tools_flavour_abi#*-}
> +tools_version=${version%-$tools_flavour}
> +debian_tools_version="${version%%-*}"
> +debian_tools_version="${version%.*}"
> +if grep -q '^CONFIG_PERF_EVENTS=y' .config ; then
> + # Build and install perf
> + (
> + unset MAKEFLAGS
> + unset MFLAGS
> + unset MAKEOVERRIDES
> +
> + mkdir -p $objtree/tools/perf
> + cd "$srctree/tools/perf"
> + $MAKE DESTDIR="$tools_dir/usr/" LDFLAGS= O=$objtree/tools/perf/ install
> + mv "$tools_dir/usr/bin/perf"
> "$tools_dir/usr/bin/perf_$debian_tools_version"
> + ln -s "/usr/bin/perf_$debian_tools_version"
> "$tools_dir/usr/bin/perf_$tools_version"
> + mv "$tools_dir/usr/libexec/perf-core"
> "$tools_dir/usr/share/perf_$debian_tools_version-core"
> + rmdir "$tools_dir/usr/libexec"
> +
> + # Documentation can't be built out-of-tree so copy source
> + # over to objtree and build man pages there
> + mkdir -p $tmp_build_dir/perf
> + cp -a "$srctree/tools/perf/Documentation" "$tmp_build_dir/perf/"
> + cp -a "$srctree/tools/perf/config" "$tmp_build_dir/perf/"
> + cd "$tmp_build_dir/perf/Documentation"
> + $MAKE man
> + $MAKE DESTDIR="$tools_dir/usr/" install
> + for manpage in `find $tools_dir/usr/share/man/ -type f`; do
> + mv $manpage ${manpage/perf/perf_$debian_tools_version}
> + gzip -9 ${manpage/perf/perf_$debian_tools_version}
> + done
> + )
> + num_tools=$(($num_tools+1))
> +fi
> +
> +if [[ "$ARCH" = "i386" || "$ARCH" = "x86_64" ]]; then
> + # Build turbostat
> + (
> + cp -a $srctree/tools/power/x86/turbostat "$tmp_build_dir"
> + ln -s $srctree/arch "$tmp_build_dir/../../../arch"
> + cd "$tmp_build_dir/turbostat/"
> + unset MAKEFLAGS
> + unset MFLAGS
> + unset MAKEOVERRIDES
> + $MAKE LDFLAGS=
> + cp turbostat "$tools_dir/usr/bin/turbostat_$debian_tools_version"
> + ln -s "/usr/bin/turbostat_$debian_tools_version"
> "$tools_dir/usr/bin/turbostat_$tools_version"
> + mkdir -p "$tools_dir/usr/share/man/man8"
> + cp turbostat.8
> "$tools_dir/usr/share/man/man8/turbotstat_${debian_tools_version}.8"
> + gzip -9
> "$tools_dir/usr/share/man/man8/turbotstat_${debian_tools_version}.8"
> + )
> +
> + # Build x86_energy_perf_policy
> + (
> + cp -a $srctree/tools/power/x86/x86_energy_perf_policy "$tmp_build_dir"
> + cd "$tmp_build_dir/x86_energy_perf_policy"
> + unset MAKEFLAGS
> + unset MFLAGS
> + unset MAKEOVERRIDES
> + $MAKE LDFLAGS=
> + cp x86_energy_perf_policy
> "$tools_dir/usr/bin/x86_energy_perf_policy_$debian_tools_version"
> + ln -s "/usr/bin/x86_energy_perf_policy_$debian_tools_version"
> "$tools_dir/usr/bin/x86_energy_perf_policy_$to
[GIT] kbuild changes for v3.9-rc1
Hi Linus, please pull these kbuild changes for v3.9-rc1: * Alias generation in modpost is cross-compile safe. * kernel/timeconst.h is now generated using a bc script instead of perl. * scripts/link-vmlinux.sh now works with an alternative $KCONFIG_CONFIG. * destination-y for exported headers is supported in Kbuild files again. * depmod is called with -P $CONFIG_SYMBOL_PREFIX on architectures that need it. * CONFIG_DEBUG_INFO_REDUCED disables var-tracking * scripts/setlocalversion works with too much translated locales ;) Michal The following changes since commit a49f0d1ea3ec94fc7cf33a7c36a16343b74bd565: Linux 3.8-rc1 (2012-12-21 17:19:00 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git kbuild for you to fetch changes up to 423a8155facf23719078ff63911c1e85ba40970b: kbuild: Fix reading of .config in link-vmlinux.sh (2013-02-25 16:14:48 +0100) Andi Kleen (1): Kbuild: Disable var tracking with CONFIG_DEBUG_INFO_REDUCED Andreas Schwab (1): mod/file2alias: make modalias generation safe for cross compiling Christophe Leroy (1): kbuild: Unset language specific variables in setlocalversion script H. Peter Anvin (1): kernel: Replace timeconst.pl with a bc script James Hogan (1): depmod: pass -P $CONFIG_SYMBOL_PREFIX Jesper Nilsson (1): kbuild: Fix destination-y for installed headers Michael Grzeschik (1): scripts/link-vmlinux.sh: source variables from KCONFIG_CONFIG Michal Marek (1): kbuild: Fix reading of .config in link-vmlinux.sh Makefile |6 +- include/linux/mod_devicetable.h | 58 +--- kernel/Makefile | 16 +- kernel/timeconst.bc | 108 ++ kernel/timeconst.pl | 378 - scripts/Makefile.headersinst |6 +- scripts/Makefile.modpost |7 +- scripts/depmod.sh | 26 +- scripts/link-vmlinux.sh |9 +- scripts/mod/.gitignore|1 + scripts/mod/Makefile | 35 ++ scripts/mod/devicetable-offsets.c | 178 ++ scripts/mod/file2alias.c | 674 - scripts/mod/modpost.c |5 +- scripts/setlocalversion |2 +- 15 files changed, 749 insertions(+), 760 deletions(-) create mode 100644 kernel/timeconst.bc delete mode 100644 kernel/timeconst.pl create mode 100644 scripts/mod/devicetable-offsets.c -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT] kbuild misc changes for v3.9-rc1
Hi Linus, these are the non-critical kbuild changes for v3.9-rc1: * Fix for make TAGS * Fix for make rpm * Some new coccinelle semantic patches Please pull, thanks. Michal The following changes since commit a49f0d1ea3ec94fc7cf33a7c36a16343b74bd565: Linux 3.8-rc1 (2012-12-21 17:19:00 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git misc for you to fetch changes up to 24f0c2d6ff859fbca45fd765f0d241528bdb4365: scripts/coccinelle: find constant additions that could be bit ors (2013-02-22 14:26:00 +0100) Andreas Schwab (1): scripts/tags.sh: Fix regex syntax for etags Bernd Schubert (2): coccicheck: Allow the user to give a V= (verbose) argument coccicheck: Allow to show the executed command line David R. Bild (1): kbuild: clear KBUILD_SRC when calling 'make' in RPM spec Julia Lawall (1): scripts/coccinelle: find constant additions that could be bit ors Peter Senna Tschudin (2): scripts/coccinelle/misc/semicolon.cocci: Add unneeded semicolon test scripts/coccinelle/misc/memcpy-assign.cocci: Replace memcpy with struct assignment Documentation/coccinelle.txt|4 ++ scripts/coccicheck | 39 +++--- scripts/coccinelle/misc/memcpy-assign.cocci | 103 +++ scripts/coccinelle/misc/orplus.cocci| 55 ++ scripts/coccinelle/misc/semicolon.cocci | 83 + scripts/package/mkspec |2 +- scripts/tags.sh | 50 ++--- 7 files changed, 302 insertions(+), 34 deletions(-) create mode 100644 scripts/coccinelle/misc/memcpy-assign.cocci create mode 100644 scripts/coccinelle/misc/orplus.cocci create mode 100644 scripts/coccinelle/misc/semicolon.cocci -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT] kconfig changes for v3.9-rc1
Hi Linus, please pull these kconfig changes for v3.9-rc1. I forgot to send a pull request in time for the v3.8-rc1 merge window, so the list is a bit longer this time: * menuconfig enables extended colors in ncurses if the wide-character version is used. * CONFIG_ prefix can be specified in the environment to make life easier for people using kconfig multiple times in a single tree (no functional change in the kernel kconfig usage). * kconfig aborts on OOM. * inputboxes in menuconfig allow to move the cursor. * menuconfig has Save/Load buttons now. * xconfig build fix with new g++ and Qt3. * nconfig color scheme fix and help text update. * make oldconfig prints newlines when output is redirected. * some other minor fixes. The following changes since commit a49f0d1ea3ec94fc7cf33a7c36a16343b74bd565: Linux 3.8-rc1 (2012-12-21 17:19:00 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git kconfig for you to fetch changes up to e3900e74f26fc924c8e9e2a922bd40369b0bb517: Merge branch 'kbuild/rc-fixes' into kbuild/kconfig (2013-02-25 21:51:57 +0100) Alan Cox (1): kconfig: Fix malloc handling in conf tools Ben Hutchings (1): kbuild: Fix missing '\n' for NEW symbols in yes "" | make oldconfig >conf.new Krzysztof Mazur (1): menuconfig: fix extended colors ncurses support Michal Marek (3): kconfig: Regenerate lexer Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/rc-fixes Merge branch 'kbuild/rc-fixes' into kbuild/kconfig Roland Eggner (3): nconf: function keys line, change background color for better readability kconfig: nconf: rewrite help texts kconfig: nconf: rewrite labels of function keys line Tiana Rakotovao Andriamahefa (1): kconfig: fix a compiliation error when using make xconfig Wang YanQing (4): menuconfig:inputbox: support navigate input position kconfig:lxdialog: remove duplicate code menuconfig: Add Save/Load buttons menuconfig: Get rid of the top-level entries for "Load an Alternate/Save an Alternate" Yann E. MORIN (6): kconfig: remove CONFIG_ from string constants kconfig: add a function to get the CONFIG_ prefix kconfig: get CONFIG_ prefix from the environment Revert "kconfig-language: add to hints" scripts/kconfig: ensure we use proper CONFIG_ prefix kconfig: document use of CONFIG_ environment variable Zhangfei Gao (1): merge_config.sh: Add option to specify output dir Documentation/kbuild/kconfig-language.txt | 23 -- Documentation/kbuild/kconfig.txt |6 + scripts/kconfig/Makefile |3 + scripts/kconfig/conf.c |7 +- scripts/kconfig/expr.c | 10 +- scripts/kconfig/gconf.c|2 +- scripts/kconfig/lkc.h |8 + scripts/kconfig/lxdialog/check-lxdialog.sh |1 + scripts/kconfig/lxdialog/dialog.h |1 - scripts/kconfig/lxdialog/inputbox.c| 121 +++--- scripts/kconfig/lxdialog/menubox.c | 20 +- scripts/kconfig/mconf.c| 54 +++-- scripts/kconfig/menu.c |4 +- scripts/kconfig/merge_config.sh| 20 +- scripts/kconfig/nconf.c| 340 ++-- scripts/kconfig/nconf.gui.c|2 +- scripts/kconfig/qconf.cc |1 + scripts/kconfig/symbol.c | 12 +- scripts/kconfig/util.c | 23 +- scripts/kconfig/zconf.l|8 +- scripts/kconfig/zconf.lex.c_shipped|8 +- 21 files changed, 391 insertions(+), 283 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 1/3] kbuild, deb-pkg: Try to determine distribution
Sorry I missed this series. Max, can you have a look? I don't know the policies for debian package changelogs. The full series is at http://lkml.indiana.edu/hypermail/linux/kernel/1204.2/index.html#04252, but the remaining two patches are obvious. Michal On 24.4.2012 00:16, Sedat Dilek wrote: > Signed-off-by: Sedat Dilek > --- > scripts/package/builddeb | 15 ++- > 1 file changed, 14 insertions(+), 1 deletion(-) > > diff --git a/scripts/package/builddeb b/scripts/package/builddeb > index eee5f8e..f5b56ac 100644 > --- a/scripts/package/builddeb > +++ b/scripts/package/builddeb > @@ -172,9 +172,22 @@ else > fi > maintainer="$name <$email>" > > +# Try to determine distribution > +if [ -e $(which lsb_release) ]; then > + codename=$(lsb_release --codename --short) > + if [ "$codename" != "" ]; then > + distribution=$codename > + else > + distribution="UNRELEASED" > + echo "WARNING: The distribution could NOT be determined!" > + fi > +else > + echo "HINT: Install lsb_release binary, this helps to identify your > distribution!" > +fi > + > # Generate a simple changelog template > cat < debian/changelog > -linux-upstream ($packageversion) unstable; urgency=low > +linux-upstream ($packageversion) $distribution; urgency=low > >* Custom built Linux kernel. > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 3/3] convert headers_install.pl to headers_install.sh
On 27.2.2013 06:58, Rob Landley wrote: > From: Rob Landley > > Remove perl from make headers_install by replacing a perl script (doing > a simple regex search and replace) with a smaller, faster, simpler, > POSIX-2008 shell script implementation. The new shell script is a single > for loop calling sed and piping its output through unifdef to produce the > target file. > > Same as last time except for minor tweak to deal with code review from here: > http://lkml.indiana.edu/hypermail/linux/kernel/1302.3/00078.html > > (Note that this drops the "arch" argument, which isn't used. Kbuild > already points to the right input files on the command line.) > > Signed-off-by: Rob Landley Looks good, I will apply it after v3.9-rc1 is out. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 0/3] build linux-next without perl
On 27.2.2013 22:51, Andrew Morton wrote: > It'll need to be reasonably good motivation, too. Because not only do > we need to patch the kernel, we also need to *maintain* its > perl-freeness and fix up perlisms as they later get added by others. > > (Perhaps one way of doing this would be to disable perl in regular > builds, so even if a developer has perl installed on his machine, his > build will still fail when he invokes it. Add "PERL=/dev/null" to some > build targets in some manner.) I don't think we need to go this far. Apparently, there are people who want to be able to build the kernel without perl, so let's rely on them to report if perl appears again as a hard build dependency. If these people lose interest, then after some time we might end up with perl being required again, but then this by definition won't be a problem for anyone who cares. It is like bashisms in shell scripts and Makefile commands. They should be avoided, but it wasn't until Debian and Ubuntu switched to /bin/sh -> dash when we started to fix them. Nowadays, the kernel should build file with a minimal POSIX shell, but we did not need any SHELL=$(objtree)/scripts/dash to achieve this. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [patch 1/2] kcmp: Make it to depend on CONFIG_KCMP
On 19.2.2013 07:48, Cyrill Gorcunov wrote: > --- linux-2.6.git.orig/init/Kconfig > +++ linux-2.6.git/init/Kconfig > @@ -279,6 +279,15 @@ config FHANDLE > get renamed. Enables open_by_handle_at(2) and name_to_handle_at(2) > syscalls. > > +config KCMP > + bool "kcmp syscall" > + default n Previously, kcmp was enabled with CONFIG_CHECKPOINT_RESTORE. Maybe change it to 'default CHECKPOINT_RESTORE', so that make oldconfig does the right thing? Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] Unset LANG in setlocalversion script
Dne 21.2.2013 13:49, Christophe Leroy napsal(a): > This patch allows the use of setlocalversion script regardless of the LANG > parameter. Otherwise, the `svn info 2>/dev/null | grep '^Last Changed Rev'` > returns nothing because for instance, in French the text 'Last Changed Rev' > is replaced by 'Révision de la derničre modification' Unsetting LANG might not be enough. You should unset LC_ALL and set LC_MESSAGES=C. But - is this a problem for other commands in the script? >From a quick look, we only parse English output of svn, so I suggest to only set the env var for the svn command. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] scripts/link-vmlinux.sh: source variables from KCONFIG_CONFIG
On Tue, Jan 08, 2013 at 07:05:26PM +0100, Michael Grzeschik wrote: > Its possible to superseed the config file with KCONFIG_CONFIG and have > completely no .config in the tree. The current script is sourcing > .config in every case, so the kernel will never build succesfully. This > patch fixes that issue by sourcing KCONFIG_CONFIG instead. > > Signed-off-by: Michael Grzeschik Applied to kbuild.git#kbuild, thanks. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] kbuild: clear KBUILD_SRC when calling 'make' in RPM spec
On Sat, Jan 12, 2013 at 10:19:19AM -0500, David R. Bild wrote: > From: "David R. Bild" > > 'make rpm-pkg' and 'make binrpm-pkg' fail when the kernel source is > read-only. Specifically, when the RPM spec generated by > scripts/package/mkspec is run, KBUILD_SRC happens to be set to the > source location and thus the invocation of 'make headers_install' > fails when an internal call to 'filechk' tries to write a file into > the source tree. > > The fix is to clear KBUILD_SRC for the 'make headers_install' > invocation in the spec file, as is already done for the 'make > modules_install' invocation. > > Signed-off-by: David R. Bild Applied to kbuild.git#misc, thanks. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 1/1] scripts/package/Makefile: remove useless KBUILD_OUTPUT test
On Mon, Jan 21, 2013 at 03:28:05PM +0800, Bin Wang wrote: > The test of KBUILD_OUTPUT in "rpm-pkg rpm" target is useless. > KBUILD_OUTPUT is always empty here. Right, but the error message is valid, make rpm-pkg does not work with O=. So I suggest to either fix make O=... rpm-pkg, or fix the test to compare $(srctree) and $(objtree) instead. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH V2] scripts/coccinelle/misc/memcpy-assign.cocci: Replace memcpy with struct assignment
On Wed, Jan 23, 2013 at 08:06:30PM -0200, Peter Senna Tschudin wrote: > There are error-prone memcpy() that can be replaced by struct > assignment that are type-safe and much easier to read. This semantic > patch looks for memcpy() that can be replaced by struct assignment. > > Inspired by patches sent by Ezequiel Garcia > > Signed-off-by: Peter Senna Tschudin > --- > Changes from V1: > Updated commit message > Changed Confidence comment to High on the semantic patch Applied to kbuild.git#misc, thanks. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 2 1/2] coccicheck: Allow the user to give a V= (verbose) argument
On Tue, Jan 29, 2013 at 05:03:37PM +0100, Bernd Schubert wrote:
> Do not run with verbosity on/off depending on the ONLINE variable,
> which gets set with C=1 or C=2, but allow the user to set the
> verbosity using kernel default make V= paramemter.
> Verbosity is off by default now.
On Tue, Jan 29, 2013 at 05:03:42PM +0100, Bernd Schubert wrote:
> On my system one of the tests failed with
> "Fatal error: exception Failure("No OCaml compiler found! Install either
> ocamlopt or ocamlopt.opt")".
>
> Investigating such issues is easier if the executed command line is being
> shown.
I applied both patches to kbuild.git#misc, thanks.
Michal
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] scripts/coccinelle: find constant additions that could be bit ors
On Sat, Feb 02, 2013 at 05:19:55PM +0100, Julia Lawall wrote: > From: Julia Lawall > > Semantic patch (http://coccinelle.lip6.fr/) to check for constants that are > added but are used elsewhere as bitmasks. > > Signed-off-by: Julia Lawall Applied to kbuild.git#misc. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] kbuild: Fix destination-y for installed headers
On Sat, Feb 02, 2013 at 11:18:35AM +0100, Jesper Nilsson wrote: > Commit 10b63956fce7f369cc37fd4d994f09bd5203efe4 which plumbed in UAPI > broke the destination-y functionality of scripts/Makefile.headersinst. > > The variable destination-y is used in a := assignment and so is expanded at > declaration time, and the include of the Kbuild fragments that set > destination-y to something is after this time, so it now always expands empty. > > There are no in-tree users of destination-y, but it allows any > Kbuild-fragment to redirect where headers are installed. > > Just move the assignment of the variable that uses it below the include > of the Kbuild fragment. > > Signed-off-by: Jesper Nilsson > Cc: Michal Marek > Cc: David Howells > --- > Makefile.headersinst |6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git scripts/Makefile.headersinst scripts/Makefile.headersinst I applied your patch to kbuild.git#kbuild, but please send -p1 patches next time. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2 1/1] depmod: pass -P $CONFIG_SYMBOL_PREFIX
On Wed, Feb 06, 2013 at 12:56:59PM +, James Hogan wrote: > On architectures which have symbol prefixes, depmod emits lots of > warnings like this: > > WARNING: $module.ko needs unknown symbol $symbol > > This is because depmod isn't being passed the -P > arguments to specify the symbol prefix to ignore. This option is > included since the 3.13 release of module-init-tools. > > Update scripts/depmod.sh to take extra arguments for the symbol prefix > (required but may be empty), and update the main Makefile to always pass > "$(CONFIG_SYMBOL_PREFIX)" to scripts/depmod.sh. > > If the provided symbol prefix is non-empty, scripts/depmod.sh checks if > depmod --version reports module-init-tools with a version number < 3.13 > otherwise it appends -P $SYMBOL_PREFIX to the depmod command line. > > Signed-off-by: James Hogan > Cc: Michal Marek > Cc: linux-kbu...@vger.kernel.org > Cc: Mike Frysinger > Cc: Yoshinori Sato > Cc: uclinux-dist-de...@blackfin.uclinux.org > --- > changes since v1: clean up with assistance from Mike Frysinger (thanks!) > * always pass prefix to depmod.sh to simplify the logic > * use printf instead of ugly echos in version check Applied to kbuild.git#kbuild, thanks. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] Kbuild: Disable var tracking with CONFIG_DEBUG_INFO_REDUCED
On Thu, Feb 07, 2013 at 01:58:40PM -0800, Andi Kleen wrote: > From: Andi Kleen > > Newer gcc enables the var-tracking pass with -g to keep track which > registers contain which variables. This is one of the slower passes in gcc. > > With reduced debug info (aimed at objdump -S, but not using a full debugger) > we don't need this fine grained tracking. But it was still enabled > because -g was enabled. Disable it explicitely for DEBUG_INFO_REDUCED. Applied to kbuild.git#kbuild, thanks. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2] Unset langage specific variables in setlocalversion script
On Fri, Feb 22, 2013 at 09:59:18AM +0100, Christophe Leroy wrote: > This patch allows the use of setlocalversion script regardless of the language > parameters. Otherwise, the `svn info 2>/dev/null | grep '^Last Changed Rev'` > returns nothing because for instance, in French the text 'Last Changed Rev' > is replaced by 'R�vision de la derni�re modification' > > Signed-off-by: Christophe Leroy Thanks, applied to kbuild.git#kbuild. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [RFC] kconfig/mconf.c: revision of curses initialization.
On Mon, Aug 06, 2012 at 05:19:43PM +0200, Dirk Gouders wrote: > Hello, > > I noticed that in mconf, initscr() is called twice -- as far as I found > out since commit d0e1e09568. > > In case you see a need to fix that: > > I first thought about simply removing the call in init_dialog() in > util.c but then had the feeling that saving of initial cursor positions > also perhaps is better done in that function... > > Dirk > > > From 1a4022eedbee6032dea16f67bbe4028a8d3d07a0 Mon Sep 17 00:00:00 2001 > From: Dirk Gouders > Date: Mon, 6 Aug 2012 16:48:23 +0200 > Subject: [PATCH] kconfig/mconf.c: revision of curses initialization. > > Since commit d0e1e09568 initscr() is called twice in mconf. > > Do it only in init_dialog() in util.c and there also save the > cursor position for the signal handler in mconf.c. > > Signed-off-by: Dirk Gouders Applied to kbuild.git#kconfig, thanks. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] firmware: fix directory creation rule matching with make 3.82
On Wed, Aug 08, 2012 at 01:14:36PM -0400, Mark Asselstine wrote: > Attempting to run 'firmware_install' with CONFIG_USB_SERIAL_TI=y when > using make 3.82 results in an error > > make[2]: *** No rule to make target `/lib/firmware/./', needed by > `/lib/firmware/ti_3410.fw'. Stop. > > It turns out make 3.82 is picky when matching directory names with > trailing slashes as a result, where make 3.81 would handle this > correctly make 3.82 does not find the rule needed to create the > directory. > > The './' seen in the error is added by $(dir) for firmware which > resides in the base firmware src directory, such as > ti_3410.fw.ihex. By performing $(dir) after we prepend the > $(INSTALL_FW_PATH) we can ensure we don't end up with a './' in the > middle of the path and the directory will be properly created. > > This change works with make 3.81 and should work with previous > versions as well. > > Signed-off-by: Mark Asselstine Thanks a lot and sorry for the delay. I applied the patch to kbuild.git#rc-fixes. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: Failure while make modules_install if kmod was compiled with --with-rootprefix set
On 10.8.2012 23:50, Arokux B. wrote: > Dear Mr. Marek, dear all, > > I have detected a hidden failure while building the kernel. If > --with-rootprefix is set for kmod, then depmod will look for modules > installed at the location $ROOTPREFIX/lib/modules/. The > kernel build system does not know anything about $ROOTPREFIX, and so > the wrong directory is created for the test if the hack is needed for > an older versin of depmod at scripts/depmod.sh:19 mkdir -p > "$tmp_dir/lib/modules/$KERNELRELEASE". That is why "$DEPMOD" -b > "$tmp_dir" $KERNELRELEASE will always fail I think we can revert the hack, because the three-digit version number will stay for foreseeable future and depmod is not the only tool that used to rely on this. However, what you describe looks like a bug in kmod's depmod. -b sets the basedir, depmod should not prepend it with any compiled-in string. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] Add mach-specific includes
Adding Max. On 12.8.2012 11:47, Tzafrir Cohen wrote: > When building a deb package, the linux-headers package should also > add arch/$ARCH/mach-*/include Required for arm and probably some > other architectures: avr32 and blackfin. > > This is needed to allow building modules using the headers package. > > Signed-off-by: Tzafrir Cohen > --- > scripts/package/builddeb |3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/scripts/package/builddeb b/scripts/package/builddeb > index acb8650..16f8c1a 100644 > --- a/scripts/package/builddeb > +++ b/scripts/package/builddeb > @@ -245,6 +245,9 @@ fi > # Build header package > (cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > > "$objtree/debian/hdrsrcfiles") > (cd $srctree; find arch/$SRCARCH/include include scripts -type f >> > "$objtree/debian/hdrsrcfiles") > +if echo arch/$SRCARCH/mach-*/include | grep q -v '*'; then This should probably be grep -q, but it's quite ugly anyway. You can simply run the find command and redirect it's stderr to /dev/null. Michal > + (cd $srctree; find arch/$SRCARCH/mach-*/include -type f >> > "$objtree/debian/hdrsrcfiles") > +fi > (cd $objtree; find arch/$SRCARCH/include .config Module.symvers include > scripts -type f >> "$objtree/debian/hdrobjfiles") > destdir=$kernel_headers_dir/usr/src/linux-headers-$version > mkdir -p "$destdir" > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] builddeb: remove unneeded explicit Architecture
Adding Max to CC. On 14.8.2012 12:44, Tzafrir Cohen wrote: > Architecture was set explicitly in debian/control for one of the three > packages (linux-libc-dev) but not for the other two. When cross-building > it gives me an error: > > dpkg-gencontrol: error: current host architecture 'armhf' does not > appear in package's architecture list (amd64) > > Also note that if used, dpkg --print-architecture should have been > replaced with dpkg-architecture. > > Signed-off-by: Tzafrir Cohen > --- > scripts/package/builddeb |3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/scripts/package/builddeb b/scripts/package/builddeb > index acb8650..d9c71a6 100644 > --- a/scripts/package/builddeb > +++ b/scripts/package/builddeb > @@ -252,13 +252,12 @@ mkdir -p "$destdir" > (cd $objtree; tar -c -f - -T "$objtree/debian/hdrobjfiles") | (cd $destdir; > tar -xf -) > ln -sf "/usr/src/linux-headers-$version" > "$kernel_headers_dir/lib/modules/$version/build" > rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles" > -arch=$(dpkg --print-architecture) > > cat <> debian/control > > Package: $kernel_headers_packagename > Provides: linux-headers, linux-headers-2.6 > -Architecture: $arch > +Architecture: any > Description: Linux kernel headers for $KERNELRELEASE on $arch > This package provides kernel header files for $KERNELRELEASE on $arch > . As the package contains files from arch/$SRCARCH/include, I doubt that this is a valid change. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] kbuild: Remove useless warning while appending KCFLAGS
On Tue, Aug 14, 2012 at 07:00:54PM +0300, Ozan Çağlayan wrote: > This is a respin of an older patch sent by Sam Ravnborg: > http://www.gossamer-threads.com/lists/linux/kernel/1530602 > > This patch removes the annoying warning: > > Makefile:708: "WARNING: Appending $KCFLAGS (-Wno-sign-compare) from command > line to kernel $CFLAGS" > > which is printed every time I use KCFLAFS. The commit which introduced the > warning: > > 69ee0b3 kbuild: do not pick up CFLAGS from the environment > > tells about the problems when people have CFLAGS in their environment, > then switches to KCFLAFS which should be enough to solve the issue, but > it anyway introduces a warning. Drop this warning. > > Signed-off-by: Ozan Çağlayan Thanks, applied to kbuild.git#kbuild. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 20/25] MODSIGN: Provide module signing public keys to the kernel
On 16.8.2012 03:37, David Howells wrote:
> +asm(".section .init.data,\"aw\"\n"
> +"modsign_public_keys:\n"
> +".incbin \"modsign.pub\"\n"
> +"modsign_public_keys_end:"
> +);
> +
> +/*
> + * We need to make sure ccache doesn't cache the .o file as it doesn't notice
> + * if modsign.pub changes.
> + */
> +static __initdata const char annoy_ccache[] = __TIME__ "foo";
This results in a different object file after each build, even if
modsign.pub is the same :(. How about generating a modsign-hash.c with
the following content
static __initdata const char annoy_ccache[] = "";
and including it in modsign-pubkey.c with the preprocessor? When
changing the public key, modsign.hash.c would change as well and ccache
would notice it. But when doing a rebuild from the same source with the
same public key, the resulting object file would not change.
Thanks,
Michal
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [Cocci] [PATCH] scripts/coccinelle: ptr_ret: Add ternary operator version
On Tue, Aug 21, 2012 at 11:06:35AM +0200, Julia Lawall wrote: > > > On Tue, 21 Aug 2012, Lars-Peter Clausen wrote: > > > Add a ternary operator version of the open-coded PTR_RET(). > > > > Signed-off-by: Lars-Peter Clausen > > Signed-off-by: Julia Lawall Applied to kbuild.git#misc, thanks. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] [Signed-off] kconfig: document oldnoconfig to what it really does in conf.c
On Wed, Aug 22, 2012 at 09:45:19PM +0800, Adam Lee wrote: > On Fri, Aug 17, 2012 at 02:57:28PM +0800, Adam Lee wrote: > > As 67d34a6a391369269a2e5dba8a5f42cc4cd50231 said, the make target > > 'oldnoconfig' is a misnomer. It doesn't set new symbols to 'n', but > > instead sets it to their default values. > > > > This patch fixes the document in conf.c, and will submit another patch > > to replace 'oldnoconfig' to 'olddefconfig' > > > > Signed-off-by: Adam Lee > > --- > > scripts/kconfig/conf.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > Hi, > > I think we should apply this patch, any comment? Sorry for the delay. I applied it to kbuild.git#kconfig now. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: scripts/tags.sh: Add magic for pci access functions
On Fri, Aug 24, 2012 at 01:50:28PM +0400, Kirill Tkhai wrote: > scripts/tags.sh: Add magic for pci access functions > > Make [ce]tags find the pci_bus_read_config_* and pci_bus_write_config_* > definitions > > Signed-off-by: Kirill Tkhai Applied to kbuild.git#misc, thanks. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] scripts/Makefile.modpost: error in finding modules from .mod files.
On Wed, Aug 29, 2012 at 10:58:12PM +0900, 이건호 wrote: > This error may happen when the user's id or path includes .ko string. > For example, user's id is xxx.ko and building test.ko module, > the test.mod file lists ko name and all object files. >/home/xxx.ko/kernel_dev/device/drivers/test.ko >/home/xxx.ko/kernel_dev/device/drivers/test_main.o > /home/xxx.ko/kernel_dev/device/drivers/test_io.o ... > Current Makefile.modpost and Makefile.modinst find and list up not > only test.ko but also other object files. > because all of object file's path includes .ko string. > This is a patch to fix it. > > Signed-off-by: Gunho Lee Good catch, applied to kbuild.git#kbuild. BTW, your mailer (gmail?) broke the log lines into two. I fixed it manually, but it makes the recipient's life easier if you send your patches either using git-send-email or a mailer that does not mangle the message (see Documentation/email-clients.txt). Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 20/74] x86, lto: Change dotraplinkage into __visible on 32bit
Dne 19.8.2012 04:56, Andi Kleen napsal(a): > From: Andi Kleen > > Mark 32bit dotraplinkage functions as __visible for LTO. > 64bit already is using asmlinkage which includes it. You can make it __visible on both 32bit and 64bit, the result is the same. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 44/74] lto: Mark functions used by the vsyscall init code visible
Dne 19.8.2012 04:56, Andi Kleen napsal(a): > From: Andi Kleen > > The vsyscall code is compiled without LTO. This also includes > its init function. The function which are called by it have > to be visible, otherwise they could be optimized away > > Signed-off-by: Andi Kleen > --- > drivers/char/random.c |2 +- > include/linux/mm.h|1 + > mm/vmalloc.c |2 +- > 3 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/char/random.c b/drivers/char/random.c > index b86eae9..33c8fe5 100644 > --- a/drivers/char/random.c > +++ b/drivers/char/random.c > @@ -1450,7 +1450,7 @@ late_initcall(random_int_secret_init); > * depleting entropy is too high > */ > static DEFINE_PER_CPU(__u32 [MD5_DIGEST_WORDS], get_random_int_hash); > -unsigned int get_random_int(void) > +__visible unsigned int get_random_int(void) I think that there should be a comment why the symbol needs to be visible (just copy the reasoning from the changelog). Otherwise someone might attempt to do a cleanup a few years later, noticing that there is no assembler code calling get_random_int(). Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT] kbuild rc fixes for v3.6
Hi Linus, there are two fixes that should go into 3.6. The link-vmlinux.sh one is obvious. The other one fixes make firmware_install with certain configurations, where a file in the toplevel firmware tree gets installed first, and $(INSTALL_FW_PATH)/$$(dir ) results in /lib/firmware/./, which confuses make 3.82 for some reason. Thanks, Michal The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee: Linux 3.6-rc1 (2012-08-02 16:38:10 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git ..BRANCH.NOT.VERIFIED.. Mark Asselstine (1): firmware: fix directory creation rule matching with make 3.82 Michal Marek (1): link-vmlinux.sh: Fix stray "echo" in error message scripts/Makefile.fwinst |2 +- scripts/link-vmlinux.sh |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 01/10] Makefile: Add option CONFIG_DISABLE_GCC_AUTOMATIC_INLINING
Dne 13.9.2012 02:30, Ezequiel Garcia napsal(a): > Hi, > > On Sun, Sep 9, 2012 at 6:25 PM, David Rientjes wrote: >> On Sat, 8 Sep 2012, Ezequiel Garcia wrote: >> >>> diff --git a/Makefile b/Makefile >>> index ddf5be9..df6045a 100644 >>> --- a/Makefile >>> +++ b/Makefile >>> @@ -561,6 +561,10 @@ else >>> KBUILD_CFLAGS+= -O2 >>> endif >>> >>> +ifdef CONFIG_DISABLE_GCC_AUTOMATIC_INLINING >>> +KBUILD_CFLAGS+= -fno-inline-small-functions >> >> This isn't the only option that controls automatic inlining of functions, >> see indirect-inlining, inline-functions, and inline-functions-called-once. >> > > I'll check about this gcc options and re-send, renamed as: > CONFIG_DISABLE_CC_AUTOMATIC_INLINING Please name it CONFIG_CC_ Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v3] kbuild: Fix gcc -x syntax
On 2.10.2012 16:42, Jean Delvare wrote: > The correct syntax for gcc -x is "gcc -x assembler", not > "gcc -xassembler". Even though the latter happens to work, the former > is what is documented in the manual page and thus what gcc wrappers > such as icecream do expect. > > This isn't a cosmetic change. The missing space prevents icecream from > recognizing compilation tasks it can't handle, leading to silent kernel > miscompilations. > > Besides me, credits go to Michael Matz and Dirk Mueller for > investigating the miscompilation issue and tracking it down to this > incorrect -x parameter syntax. Applied to kbuild.git#rc-fixes. Thanks to everyone involved. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2] menuconfig: Replace CIRCLEQ by list_head-style lists.
On 22.10.2012 21:38, Yann E. MORIN wrote: > Benjamin, Michal, All, > > On Sunday 21 October 2012 Benjamin Poirier wrote: >> From: Benjamin Poirier >> >> sys/queue.h and CIRCLEQ in particular have proven to cause portability >> problems (reported on Debian Sarge, Cygwin and FreeBSD) > > Benjamin, > > Thank you for working on this! :-) Yeah, thanks! >> >> Changes v1-v2: >> * integrate the patch/suggestion from Yann to fix problems related to the >> usage of list.h with xconfig/c++ >> * "new" keyword >> * offsetof redefinition >> * silly #endif placement mistake > > Michal, > > Any more comments on this patch? > > If not, then I would suggest to push it for inclusion before 3.7 is released > (I believe it can go in, as it is a bugfix, not a new feature). I pushed it to kbuild.git#rc-fixes now and will send it to Linus for 3.7 inclusion later. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] kbuild: fix xargs error on make distclean
On 23.10.2012 03:32, Fengguang Wu wrote: > /usr/bin/xargs: unmatched single quote; by default quotes are special to > xargs unless you use the -0 option > > Signed-off-by: Fengguang Wu > --- > Makefile |2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index bb9fff2..e5a64cc 100644 > --- a/Makefile > +++ b/Makefile > @@ -1033,7 +1033,7 @@ distclean: mrproper > -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ > -o -name '.*.rej' \ > -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \ > - -type f -print | xargs rm -f > + -type f -print0 | xargs -0 rm -f As much as I like the find -print0 | xargs -0 construct, it is not portable unfortunately. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] scripts/patch-kernel fix
On 19.7.2012 23:49, Daniel Wisehart wrote: > diff --git a/scripts/patch-kernel b/scripts/patch-kernel > index d000ea3..a7672eb 100755 > --- a/scripts/patch-kernel > +++ b/scripts/patch-kernel > @@ -226,7 +226,7 @@ fi > > # This all assumes a 2.6.x[.y] kernel tree. > # Don't allow backwards/reverse patching. > -if [ $STOPSUBLEVEL -lt $SUBLEVEL ]; then > +if [ "$STOPSUBLEVEL"0 -lt "$SUBLEVEL"0 ]; then Hi Daniel, While this is correct, it is not obvious at first sight why you need to multiply the numbers by 10. Or at least it was not obvious to me :). Could you use the more common idiom 0$NUMBER? The shell interprets the numbers as decimal, so it's works fine. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2 2/2] nconf: add u, d command keys in scroll windows
On Tue, Jul 24, 2012 at 04:12:03PM -0400, Benjamin Poirier wrote: > They function just like they do in less(1). > Also correct some discrepancy between the help text and the code wrt > function keys. > > Signed-off-by: Benjamin Poirier Applied to kbuild.git#kconfig, thanks. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2 5/5] scripts/tags.sh: Teach [ce]tags about libtraceeevent error codes
On Mon, Jun 18, 2012 at 11:50:51AM +0900, Namhyung Kim wrote: > From: Namhyung Kim > > As we use a macro trick to sync each error codes with its > description string, teach [ce]tags to process them properly. > > Suggested-by: Steven Rostedt > Cc: Frederic Weisbecker > Cc: Michal Marek > Link: http://lkml.kernel.org/n/tip-qt5fv4pzigr2nnl27ydim...@git.kernel.org > Signed-off-by: Namhyung Kim > --- > scripts/tags.sh |6 -- > 1 file changed, 4 insertions(+), 2 deletions(-) Applied to kbuild.git#misc, thanks. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: kbuild: Document oldnoconfig to what it really does
On Fri, Jun 15, 2012 at 07:24:59PM -0400, Steven Rostedt wrote: > The make target 'oldnoconfig' is a misnomer. It doesn't set new symbols > to 'n', but instead sets it to their default values. > > Unfortunately, assuming that it actually did this, broke ktest in some > of its tests. For example, the tests to create a minimum config and even > a config bisect, depends on removing various configs and using > oldnoconfig to get rid of other configs that may have depended on it. > > But because some configs that it was trying to disable, were in fact > default enabled, this caused those configs to re-enable and corrupt the > test. > > I thought about fixing oldnoconfig, but I'm afraid that people are > already dependent on its current behavior. Instead, I'm just updating > the documentation to state that it sets the new symbols to their default > values and not to 'n'. > > Ideally, this would be called, 'olddefconfig' and we have an > 'oldnoconfig' that actually disables the new symbols. But it's useless > for me now. If it changed, ktest would need to be consistent between > each version, and that would be to difficult to detect. I'll handle this > issue with ktest with other means. > > Signed-off-by: Steven Rostedt Applied to kbuild.git#kconfig, thanks. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] Bluetooth: Another vendor specific ID for BCM20702A0 [0a5c:21f1]
Bus 002 Device 003: ID 0a5c:21f1 Broadcom Corp.
Device Descriptor:
bLength18
bDescriptorType 1
bcdUSB 2.00
bDeviceClass 255 Vendor Specific Class
bDeviceSubClass 1
bDeviceProtocol 1
bMaxPacketSize064
idVendor 0x0a5c Broadcom Corp.
idProduct 0x21f1
bcdDevice1.12
iManufacturer 1 Broadcom Corp
iProduct2 BCM20702A0
iSerial 3 9CB70DCFF833
bNumConfigurations 1
Signed-off-by: Michal Marek
---
drivers/bluetooth/btusb.c |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index e272214..5748b15 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -97,6 +97,7 @@ static struct usb_device_id btusb_table[] = {
{ USB_DEVICE(0x0a5c, 0x21e3) },
{ USB_DEVICE(0x0a5c, 0x21e6) },
{ USB_DEVICE(0x0a5c, 0x21e8) },
+ { USB_DEVICE(0x0a5c, 0x21f1) },
{ USB_DEVICE(0x0a5c, 0x21f3) },
{ USB_DEVICE(0x413c, 0x8197) },
--
1.7.3.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[GIT] kbuild fix for v3.6-rc1
Hi Linus, the main kbuild branch ended up with a single commit this time, a fix to send errors to stderr. Please pull from the below repository. Thanks, Michal The following changes since commit f8f5701bdaf9134b1f90e5044a82c66324d2073f: Linux 3.5-rc1 (2012-06-02 18:29:26 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git kbuild Michal Marek (1): kbuild: Print errors to stderr Makefile| 24 scripts/link-vmlinux.sh |4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT] kconfig changes for 3.6-rc1
Hi Linus, Please pull following kconfig changes for v3.6-rc1: * kconfig Makefile portability fixes * menuconfig/nconfig help pager usability fix * .gitignore cleanup * quoting fix in scripts/config * Makefile prints errors to stderr * support for arbitrarily log lines in .config * fix oldnoconfig description in 'make help' Thanks, Michal The following changes since commit f8f5701bdaf9134b1f90e5044a82c66324d2073f: Linux 3.5-rc1 (2012-06-02 18:29:26 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git kconfig Benjamin Poirier (2): menuconfig: add u, d, q command keys in text boxes nconf: add u, d command keys in scroll windows Cody Schafer (1): kconfig: allow long lines in config file Michal Marek (1): kconfig: Print errors to stderr in the Makefile Paul Bolle (1): kconfig: remove lkc_defs.h from .gitignore and dontdiff Steven Rostedt (1): kconfig: Document oldnoconfig to what it really does Yaakov Selkowitz (5): kconfig/nconf: fix compile with ncurses reentrant API kconfig: check ncursesw headers first in check-lxdialog kconfig: fix check-lxdialog for DLL platforms xconfig: use pkgconfig to find moc xconfig: add quiet rule for moc Yann E. MORIN (1): scripts/config: fix double-quotes un-escaping Documentation/dontdiff |1 - scripts/config |2 +- scripts/kconfig/.gitignore |1 - scripts/kconfig/Makefile | 41 ++- scripts/kconfig/confdata.c | 61 +++- scripts/kconfig/lxdialog/check-lxdialog.sh |8 ++-- scripts/kconfig/lxdialog/textbox.c |3 + scripts/kconfig/mconf.c|6 +- scripts/kconfig/nconf.c| 10 +++- scripts/kconfig/nconf.gui.c|8 ++- 10 files changed, 104 insertions(+), 37 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT] kbuild misc changes for v3.6-rc1
Hi Linus, this is the non-critical part of kbuild for v3.6-rc1: * Two new coccinelle semantic patches * New scripts/tags.sh regexp * scripts/config improvements that I mistakenly applied here instead of in the kconfig branch (but there are no conflicts) * Debian packaging fixes Thanks, Michal The following changes since commit f8f5701bdaf9134b1f90e5044a82c66324d2073f: Linux 3.5-rc1 (2012-06-02 18:29:26 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git misc Julia Lawall (1): scripts/coccinelle: list iterator variable semantic patch Lars-Peter Clausen (1): scripts/coccinelle: Find threaded IRQs requests which are missing IRQF_ONESHOT Namhyung Kim (1): scripts/tags.sh: Teach [ce]tags about libtraceeevent error codes Yann E. MORIN (3): scripts/config: add option to not upper-case symbols scripts/config: allow alternate prefix to config option symbol scripts/config: add option to undef a symbol maximilian attems (2): deb-pkg: Install linux-firmware-image in versioned dir deb-pkg: Add all Makefiles to header package scripts/coccinelle/iterators/use_after_iter.cocci | 147 + scripts/coccinelle/misc/irqf_oneshot.cocci| 65 + scripts/config| 60 ++--- scripts/package/builddeb |7 +- scripts/tags.sh |6 +- 5 files changed, 264 insertions(+), 21 deletions(-) create mode 100644 scripts/coccinelle/iterators/use_after_iter.cocci create mode 100644 scripts/coccinelle/misc/irqf_oneshot.cocci -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT] kbuild treewide cleanup
Hi Linus, Paul Bolle did a cleanup of headers in various architectures. Because the patch touch several architectures at once, it was easiest for me to apply them to the kbuild tree. Thanks, Michal The following changes since commit f8f5701bdaf9134b1f90e5044a82c66324d2073f: Linux 3.5-rc1 (2012-06-02 18:29:26 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git trivial Paul Bolle (3): Remove useless wrappers of asm-generic/cpumask.h Remove useless wrappers of asm-generic/ipc.h Remove useless wrappers of asm-generic/rmap.h arch/frv/include/asm/cpumask.h|6 -- arch/hexagon/include/asm/Kbuild |2 -- arch/mn10300/include/asm/ipc.h|1 - arch/openrisc/include/asm/Kbuild |2 -- arch/tile/include/asm/Kbuild |1 - arch/xtensa/include/asm/cpumask.h | 16 arch/xtensa/include/asm/rmap.h| 16 7 files changed, 0 insertions(+), 44 deletions(-) delete mode 100644 arch/frv/include/asm/cpumask.h delete mode 100644 arch/mn10300/include/asm/ipc.h delete mode 100644 arch/xtensa/include/asm/cpumask.h delete mode 100644 arch/xtensa/include/asm/rmap.h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v2] Bluetooth: Another vendor specific ID for BCM20702A0 [0a5c:21f1]
T: Bus=02 Lev=02 Prnt=02 Port=01 Cnt=01 Dev#= 3 Spd=12 MxCh= 0
D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1
P: Vendor=0a5c ProdID=21f1 Rev= 1.12
S: Manufacturer=Broadcom Corp
S: Product=BCM20702A0
S: SerialNumber=9CB70DCFF833
C:* #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr= 0mA
I:* If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=1ms
E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms
E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms
I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms
E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms
I: If#= 1 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms
E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms
I: If#= 1 Alt= 2 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms
E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms
I: If#= 1 Alt= 3 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms
E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms
I: If#= 1 Alt= 4 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms
E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms
I: If#= 1 Alt= 5 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms
E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms
I:* If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
E: Ad=84(I) Atr=02(Bulk) MxPS= 32 Ivl=0ms
E: Ad=04(O) Atr=02(Bulk) MxPS= 32 Ivl=0ms
I:* If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none)
Signed-off-by: Michal Marek
---
drivers/bluetooth/btusb.c |1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index e272214..5748b15 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -97,6 +97,7 @@ static struct usb_device_id btusb_table[] = {
{ USB_DEVICE(0x0a5c, 0x21e3) },
{ USB_DEVICE(0x0a5c, 0x21e6) },
{ USB_DEVICE(0x0a5c, 0x21e8) },
+ { USB_DEVICE(0x0a5c, 0x21f1) },
{ USB_DEVICE(0x0a5c, 0x21f3) },
{ USB_DEVICE(0x413c, 0x8197) },
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] x86/kbuild: archscripts depends on scripts_basic
On Thu, Sep 20, 2012 at 10:28:45AM -0400, Jeff Mahoney wrote: > While building the SUSE kernel packages, which build the scripts, > make clean, and then build everything, we have been running into spurious > build failures. We tracked them down to a simple dependency issue: > > $ make mrproper > CLEAN arch/x86/tools > CLEAN scripts/basic > $ cp patches/config/x86_64/desktop .config > $ make archscripts > HOSTCC arch/x86/tools/relocs > /bin/sh: scripts/basic/fixdep: No such file or directory > make[3]: *** [arch/x86/tools/relocs] Error 1 > make[2]: *** [archscripts] Error 2 > make[1]: *** [sub-make] Error 2 > make: *** [all] Error 2 > > This was introduced by commit > 6520fe55 (x86, realmode: 16-bit real-mode code support for relocs), > which added the archscripts dependency to archprepare. > > This patch adds the scripts_basic dependency to the x86 archscripts. > > Signed-off-by: Jeff Mahoney Applied to kbuild.git#rc-fixes, thanks. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT] kbuild rc fixes
Hi Linus, there are two more kbuild fixes for 3.6. One fixes a race between x86's archscripts target and the rule (re)building scripts/basic/fixdep. The second is a fix for the previous attempt at fixing make firmware_install with make 3.82. This new solution should work with any version of GNU make. Thanks, Michal The following changes since commit 6c7080a61fc7b46b3ac8573952b5a3e9d5f68bc4: firmware: fix directory creation rule matching with make 3.82 (2012-08-30 16:27:13 +0200) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git rc-fixes for you to fetch changes up to 24cc7fb69a5b5edfdff1d38c6a213d6a33648829: x86/kbuild: archscripts depends on scripts_basic (2012-09-21 13:49:47 +0200) Jeff Mahoney (1): x86/kbuild: archscripts depends on scripts_basic Mark Asselstine (1): firmware: fix directory creation rule matching with make 3.80 arch/x86/Makefile |2 +- scripts/Makefile.fwinst |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] kbuild: Do not package /boot and /lib in make tar-pkg
There were reports of users destroying their Fedora installs by a kernel
tarball that replaces the /lib -> /usr/lib symlink. Let's remove the
toplevel directories from the tarball to prevent this from happening.
Reported-by: Andi Kleen
Suggested-by: Ben Hutchings
Signed-off-by: Michal Marek
---
arch/x86/Makefile|2 +-
scripts/Makefile.fwinst |4 ++--
scripts/package/buildtar |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index c098ca4..b0c5276 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -138,7 +138,7 @@ KBUILD_CFLAGS += $(call cc-option,-mno-avx,)
KBUILD_CFLAGS += $(mflags-y)
KBUILD_AFLAGS += $(mflags-y)
-archscripts: scripts_basic
+archscripts:
$(Q)$(MAKE) $(build)=arch/x86/tools relocs
###
diff --git a/scripts/Makefile.fwinst b/scripts/Makefile.fwinst
index 4d908d1..c3f69ae 100644
--- a/scripts/Makefile.fwinst
+++ b/scripts/Makefile.fwinst
@@ -27,7 +27,7 @@ endif
installed-mod-fw := $(addprefix $(INSTALL_FW_PATH)/,$(mod-fw))
installed-fw := $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-all))
-installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/./
+installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/.
# Workaround for make < 3.81, where .SECONDEXPANSION doesn't work.
PHONY += $(INSTALL_FW_PATH)/$$(%) install-all-dirs
@@ -42,7 +42,7 @@ quiet_cmd_install = INSTALL $(subst $(srctree)/,,$@)
$(installed-fw-dirs):
$(call cmd,mkdir)
-$(installed-fw): $(INSTALL_FW_PATH)/%: $(obj)/% | $(INSTALL_FW_PATH)/$$(dir %)
+$(installed-fw): $(INSTALL_FW_PATH)/%: $(obj)/% | $$(dir $(INSTALL_FW_PATH)/%)
$(call cmd,install)
PHONY += __fw_install __fw_modinst FORCE
diff --git a/scripts/package/buildtar b/scripts/package/buildtar
index 8a7b155..d0d748e 100644
--- a/scripts/package/buildtar
+++ b/scripts/package/buildtar
@@ -109,7 +109,7 @@ esac
if tar --owner=root --group=root --help >/dev/null 2>&1; then
opts="--owner=root --group=root"
fi
- tar cf - . $opts | ${compress} > "${tarball}${file_ext}"
+ tar cf - boot/* lib/* $opts | ${compress} > "${tarball}${file_ext}"
)
echo "Tarball successfully created in ${tarball}${file_ext}"
--
1.7.3.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: IRQ subsystem menu
(Adding lkml and Thomas as IRQ subsystem maintainer to CC) On Sun, Oct 21, 2012 at 03:40:16AM -0400, Paul Thompson wrote: > Hi; > > In menuconfig, General setup -> IRQ subsystem, there are two > possible menu-items. One depends partly on IRQ_DOMAIN, and the other > on MAY_HAVE_SPARSE_IRQ. > > On the x86-64 arch, neither of these seems to be set, so the > menu entry is blank if entered (displaying an odd ^@ if you try to > navigate up or down. And sometimes some screen garbage on the sides.) > > Previously (in the 3.2 kernel at least) this menu used to be > populated by the "Support sparse IRQ numbering" menu-item, which > at that time depended on HAVE_SPARSE_IRQ, and was forced to YES. > > I do not know if the current behaviour is intended, but it > is ugly and confusing to be confronted with a blank menu page. > > Ideally, the "IRQ subsystem" menu would not even show up > if it would contain no menu-items, but I do not know enough to > formulate that constraint. > > A simple alternative is a comment section to reasure babes in > the wood of kernel configuration that something is not amiss. I include > a sample patch. > > Paul > set.mailingl...@gmail.com > --- linux-3.7-rc2/kernel/irq/Kconfig.orig 2012-10-20 15:11:32.0 > -0400 > +++ linux-3.7-rc2/kernel/irq/Kconfig 2012-10-21 03:14:56.272952813 -0400 > @@ -4,6 +4,9 @@ config HAVE_GENERIC_HARDIRQS > > if HAVE_GENERIC_HARDIRQS > menu "IRQ subsystem" > + > +comment "Some configurations may have no available options here" > + > # > # Interrupt subsystem related configuration options > # -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] kbuild: Do not overwrite include/config/kernel.release needlessly
Use filechk to detect if the content changed or not. Signed-off-by: Michal Marek --- Makefile | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4e3575c..3aa232f 100644 --- a/Makefile +++ b/Makefile @@ -794,10 +794,13 @@ PHONY += $(vmlinux-dirs) $(vmlinux-dirs): prepare scripts $(Q)$(MAKE) $(build)=$@ +define filechk_kernel.release + echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))" +endef + # Store (new) KERNELRELEASE string in include/config/kernel.release include/config/kernel.release: include/config/auto.conf FORCE - $(Q)rm -f $@ - $(Q)echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))" > $@ + $(call filechk,kernel.release) # Things we need to do before we recursively start building the kernel -- 1.8.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2 4/5] scripts/checkkconfigsymbols.sh: replace echo -e with printf
On Fri, Aug 23, 2013 at 12:25:24AM +0400, Max Filippov wrote: > -e is a non-standard echo option, echo output is > implementation-dependent when it is used. Replace echo -e > with printf as suggested by POSIX echo manual. > > Signed-off-by: Max Filippov > --- > scripts/checkkconfigsymbols.sh |4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) Applied to kbuild.git#misc. Thanks, Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: Can anyone suggest a better fix? Not sure if I understand the problem, but the patch fixed it
On 27.8.2013 21:05, Yang, Fei wrote: >>> From: Fei Yang >>> Date: Mon, 26 Aug 2013 11:21:48 -0700 >>> Subject: [PATCH] FIXDEP: error opening depfile >>> >>> Met a kernel build issue where fixdep fails to open a depfile, >>> fixdep: error opening depfile: drivers/driver-name/.driver-code.o.d: >>> No such file or directory >>> make[4]: *** [drivers/driver-name/driver-code.o] Error 2 >>> make[3]: *** [drivers/driver-name] Error 2 Don't know why the expected >>> file was not created, but the assumption that the file had been >>> created might not be true, so simply return for such failure. > >> I tried to grep: >> git grep "driver-name" >> >> No hits. >> >> Are you trying to fix a build issue with something out-of-tree - or is this >> only in linux-next? > > Oh, I changed the driver and file name in the error message to avoid > unnecessary confusion You achieved quite the opposite :-). > as the driver is not an upstream one. But this issue happens randomly, not > 100% > reproducible. And it happens on different driver sometimes. Are you able to reproduce this with the vanilla kernel? If so, details please. If not, then this can be something with your module's build system. Are you using anything fancier than $ cat Makefile obj-m += my-module.o $ make -C M=$PWD ? Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: Can anyone suggest a better fix? Not sure if I understand the problem, but the patch fixed it
On 28.8.2013 17:07, Michal Marek wrote: > Are you able to reproduce this with the vanilla kernel? If so, details > please. If not, then this can be something with your module's build > system. Are you using anything fancier than > > $ cat Makefile > obj-m += my-module.o > $ make -C M=$PWD make -C M=$PWD modules Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] kbuild: Do not overwrite include/config/kernel.release needlessly
On 27.8.2013 15:53, Michal Marek wrote: > Use filechk to detect if the content changed or not. > > Signed-off-by: Michal Marek > --- > Makefile | 7 +-- > 1 file changed, 5 insertions(+), 2 deletions(-) I merged this to kbuild.git#kbuild now. Thanks, Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: Can anyone suggest a better fix? Not sure if I understand the problem, but the patch fixed it
Dne 28.8.2013 18:27, Yang, Fei napsal(a): > I thought fixdep is about finding module dependency, and it isn't > needed for built-in drivers. Please correct me if I'm wrong. fixdep filters the *.d files generated by gcc. These files record source -> object file dependencies, to not miss rebuilds. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [pull request] Pull request for branch yem/kconfig-rc-fixes
Dne 30.9.2013 19:01, Yann E. MORIN napsal(a): > From: "Yann E. MORIN" > > Michal, > > Please pull these two changes for 3.12-rc: > - a fix for "make install" on ARM, by Robert Richter, acked by Linus > and yourself; I cherry-picked this commit to kbuild.git#rc-fixes. > - a fix for "make allmodconfig" when KCONFIG_ALLCONFIG is set, which > already flew on the list, but with a better commit log now. I reported a problem with this one in the original thread. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT] kconfig changes for v3.11-rc1
Hi Linus, please pull these kconfig commit for v3.11-rc1: - dependency solver fix for make defconfig - randconfig fixes, one of which had to be reverted again - more user-friendly sorting of search results - hex and range keywords support longs - fix for [mn]conf not to rely on particular behavior of the LINES and COLS variables - cleanup of magic constants in kconfig/lxdialog - [mn]conf formatting fixes - fix for scripts/config's help text in our-of-tree usage (under a different name) Michal The following changes since commit f722406faae2d073cc1d01063d1123c35425939e: Linux 3.10-rc1 (2013-05-11 17:14:08 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git kconfig for you to fetch changes up to b57caaaed2bd127fe656e6c145970ed6a05c0125: kconfig: allow "hex" and "range" to support longs (2013-06-29 15:30:17 +0200) Arve Hjønnevåg (1): kconfig: Fix defconfig when one choice menu selects options that another choice menu depends on Clement Chauplannaz (1): scripts/config: replace hard-coded script name by a dynamic value Dirk Gouders (4): kconfig/lxdialog: handle newline characters in print_autowrap() mconf: use function calls instead of ncurses' variables LINES and COLS nconf: use function calls instead of ncurses' variables LINES and COLS mconf/nconf: mark empty menus/menuconfigs different from non-empty ones Kees Cook (1): kconfig: allow "hex" and "range" to support longs Sedat Dilek (2): kconfig/lxdialog: Add definitions for mininimum (re)size values kconfig/lxdialog: Use new mininimum resize definitions in conf_choice() Yann E. MORIN (8): kconfig/conf: fix randconfig setting multiple symbols in a choice kconfig/conf: accept a base-16 seed for randconfig kconfig/conf: print the seed used to initialise the RNG for randconfig kconfig: sort found symbols by relevance kconfig/[mn]conf: make it explicit in the search box that a regexp is possible kconfig: loop as long as we changed some symbols in randconfig kconfig: fix randomising choice entries in presence of KCONFIG_ALLCONFIG Revert "kconfig: fix randomising choice entries in presence of KCONFIG_ALLCONFIG" Documentation/kbuild/kconfig.txt | 13 + scripts/config | 12 +++-- scripts/kconfig/conf.c | 6 ++- scripts/kconfig/confdata.c | 33 +--- scripts/kconfig/expr.h | 3 ++ scripts/kconfig/lkc.h| 3 +- scripts/kconfig/lkc_proto.h | 1 + scripts/kconfig/lxdialog/checklist.c | 8 +-- scripts/kconfig/lxdialog/dialog.h| 14 + scripts/kconfig/lxdialog/inputbox.c | 8 +-- scripts/kconfig/lxdialog/menubox.c | 6 +-- scripts/kconfig/lxdialog/textbox.c | 6 +-- scripts/kconfig/lxdialog/util.c | 46 ++--- scripts/kconfig/lxdialog/yesno.c | 8 +-- scripts/kconfig/mconf.c | 21 scripts/kconfig/menu.c | 16 ++ scripts/kconfig/nconf.c | 39 -- scripts/kconfig/nconf.gui.c | 20 scripts/kconfig/symbol.c | 99 +++- 19 files changed, 262 insertions(+), 100 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT] kbuild changes for v3.11-rc1
Hi Linus, please pull the kbuild bits for v3.11-rc1: - fix for make headers_install argv explosion with too long path - scripts/setlocalversion does not call git update-index needlessly - fix for the src.rpm produced by make rpm-pkg. The new make image_name can be useful also for other packaging tools. - scripts/mod/devicetable-offsets.o is not rebuilt during each make run - make modules_install dependency fix - scripts/sortextable portability fix - fix for kbuild to generate the output directory for all object files in subdirs. - a couple of minor fixes Michal The following changes since commit f722406faae2d073cc1d01063d1123c35425939e: Linux 3.10-rc1 (2013-05-11 17:14:08 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git kbuild for you to fetch changes up to 4d47dde47f7dd95042fa56283d948f50dd4b509c: kbuild: create directory for dir/file.o (2013-07-03 22:47:08 +0200) Christian Kujau (1): scripts/setlocalversion on write-protected source tree Daniel Tang (1): Fix a build warning in scripts/mod/file2alias.c Geert Uytterhoeven (1): scripts/mod: Spelling s/DEVICEVTABLE/DEVICETABLE/ James Hogan (1): Makefile.lib: align DTB quiet_cmd Jan Beulich (1): improve modalias building Mike Marciniszyn (1): kbuild: fix error when building from src rpm Nicolas Dichtel (1): kbuild: fix make headers_install when path is too long Robert Richter (1): Makefile: Fix install error with make -j option Yaakov Selkowitz (1): tools/include: use stdint types for user-space byteshift headers 张忠山 (1): kbuild: create directory for dir/file.o Makefile | 8 ++-- scripts/Makefile.headersinst | 20 ++-- scripts/Makefile.lib | 4 ++-- scripts/headers_install.sh | 7 +-- scripts/mod/Makefile | 15 +-- scripts/mod/file2alias.c | 10 ++ scripts/package/mkspec | 1 + scripts/setlocalversion| 3 --- tools/include/tools/be_byteshift.h | 34 +- tools/include/tools/le_byteshift.h | 34 +- 10 files changed, 73 insertions(+), 63 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT] coccinelle updates for v3.11-rc1
Hi Linus, the misc branch is reserved for Coccinelle this time: - 'report' is the default mode - MAINTAINERS update for Coccinelle - documentation udate - use new option format for spatch(1) - J= variable to mimic make -j for coccicheck - check for missing pci_free_consistent() calls There are some patches for rpm-pkg and deb-pkg waiting for the 3.12-rc1 merge window. Michal The following changes since commit f722406faae2d073cc1d01063d1123c35425939e: Linux 3.10-rc1 (2013-05-11 17:14:08 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git misc for you to fetch changes up to ec97946ed038f4b3faa587bc76152b198805b0c4: Coccinelle: Update information about the minimal version required (2013-07-03 22:58:20 +0200) Julia Lawall (1): scripts/coccinelle: check for field address argument to kfree Kees Cook (1): coccicheck: span checks across CPUs Nicolas Palix (6): Coccinelle: Make 'report' the default mode Coccinelle: Update the Coccinelle section of MAINTAINERS Coccinelle: Update section of MAINTAINERS Coccinelle: Update the documentation Coccinelle: Update the options used to the new option scheme Coccinelle: Update information about the minimal version required strna...@fel.cvut.cz (1): scripts: Coccinelle script for pci_free_consistent() Documentation/coccinelle.txt | 63 +++--- MAINTAINERS| 3 + scripts/coccicheck | 76 -- .../coccinelle/api/alloc/drop_kmalloc_cast.cocci | 2 +- scripts/coccinelle/api/alloc/kzalloc-simple.cocci | 2 +- scripts/coccinelle/api/d_find_alias.cocci | 2 +- .../coccinelle/api/devm_request_and_ioremap.cocci | 2 +- scripts/coccinelle/api/kstrdup.cocci | 2 +- scripts/coccinelle/api/memdup.cocci| 2 +- scripts/coccinelle/api/memdup_user.cocci | 2 +- scripts/coccinelle/api/ptr_ret.cocci | 2 +- scripts/coccinelle/api/simple_open.cocci | 2 +- scripts/coccinelle/free/devm_free.cocci| 2 +- scripts/coccinelle/free/kfree.cocci| 2 +- scripts/coccinelle/free/kfreeaddr.cocci| 32 + scripts/coccinelle/free/pci_free_consistent.cocci | 52 +++ scripts/coccinelle/iterators/fen.cocci | 2 +- scripts/coccinelle/iterators/itnull.cocci | 2 +- .../coccinelle/iterators/list_entry_update.cocci | 2 +- scripts/coccinelle/iterators/use_after_iter.cocci | 2 +- scripts/coccinelle/locks/call_kern.cocci | 2 +- scripts/coccinelle/locks/double_lock.cocci | 2 +- scripts/coccinelle/locks/flags.cocci | 2 +- scripts/coccinelle/locks/mini_lock.cocci | 2 +- scripts/coccinelle/misc/boolinit.cocci | 2 +- scripts/coccinelle/misc/cstptr.cocci | 2 +- scripts/coccinelle/misc/doubleinit.cocci | 2 +- scripts/coccinelle/misc/ifaddr.cocci | 2 +- scripts/coccinelle/misc/ifcol.cocci| 2 +- scripts/coccinelle/misc/noderef.cocci | 2 +- scripts/coccinelle/misc/orplus.cocci | 2 +- scripts/coccinelle/misc/warn.cocci | 2 +- scripts/coccinelle/null/eno.cocci | 2 +- scripts/coccinelle/null/kmerr.cocci| 2 +- scripts/coccinelle/tests/doublebitand.cocci| 2 +- scripts/coccinelle/tests/doubletest.cocci | 2 +- scripts/coccinelle/tests/odd_ptr_err.cocci | 2 +- 37 files changed, 215 insertions(+), 75 deletions(-) create mode 100644 scripts/coccinelle/free/kfreeaddr.cocci create mode 100644 scripts/coccinelle/free/pci_free_consistent.cocci -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] menuconfig: Allow j/k to move down/up the menu
Dne 9.7.2013 01:08, Sören Brinkmann napsal(a): > On Sat, Jul 06, 2013 at 06:00:05PM -0500, Rob Landley wrote: >> On 07/05/2013 06:32:59 AM, Ramkumar Ramachandra wrote: >>> Like in Vim. >>> >>> Cc: Michal Marek >>> Signed-off-by: Ramkumar Ramachandra >>> --- >>> Unsure why nobody has done this yet. >> >> While you're at it, why don't you add the ws up and down bindings >> from World of Warcraft? >> [...] > Well, one advantage of these key bindings is, that you don't have to > move your hands away from the base line. And as vim user I find myself > using vim key sequences in all tools. One issue here is that j and k are already taken. Letters other than h/m/n/y are used as hotkeys in menuconfig/nconf, if there is a menu item starting with the respective letter. So at a minimum, the patch would have to add j and k to the reserved set. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT] kbuild changes for v3.11-rc1
On Wed, Jul 10, 2013 at 07:11:53PM -0700, Linus Torvalds wrote: > You need to start being more careful. And I would seriously suggest > you start doing some explicit testing for this. You can do things like > "find . -user root", and if that shows a single file in the kernel > tree after a "make [modules_]install", then there's a problem. Good idea. I added this after the *install calls in my test script. > Commit d2aae8477cd00325bb7c7c7e95be488088900c48 is broken. It causes > root to re-write "include/config/kernel.release". Yeah. It also reveals another bug that we rewrite the kernel.release file each time. This patch should fix it, but please do not apply it yet: >From f522eef24216f229c82b6bbb55f326814db2bac0 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Thu, 11 Jul 2013 15:34:51 +0200 Subject: [PATCH] kbuild: Do not overwrite include/config/kernel.release needlessly Use filechk to detect if the content changed or not. diff --git a/Makefile b/Makefile index 4e3575c..3aa232f 100644 --- a/Makefile +++ b/Makefile @@ -794,10 +794,13 @@ PHONY += $(vmlinux-dirs) $(vmlinux-dirs): prepare scripts $(Q)$(MAKE) $(build)=$@ +define filechk_kernel.release + echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))" +endef + # Store (new) KERNELRELEASE string in include/config/kernel.release include/config/kernel.release: include/config/auto.conf FORCE - $(Q)rm -f $@ - $(Q)echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))" > $@ + $(call filechk,kernel.release) # Things we need to do before we recursively start building the kernel > There is no excuse for this. That commit is shit. There's no way in > hell that "make modules_install" should ever rebuild anything, so > adding that kind of dependency is fundamentally wrong and broken. We also run dozens of gcc checks during every make invocation, including make install or make help, so there is some room for improvement. But at least, these do not write to the source or object tree. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] modpost: Fix secondary errors seen if a single module build fails
Dne 15.9.2013 06:39, Guenter Roeck napsal(a):
> Commit ea4054a23 (modpost: handle huge numbers of modules) added
> support for building a large number of modules.
>
> Unfortunately, the commit changed the semantics of the makefile: Instead of
> passing only existing object files to modpost, make now passes all expected
> object files. If make was started with option -i, this results in a modpost
> error if a single file failed to build.
>
> Example with the current btrfs build falure on m68k:
>
> fs/btrfs/btrfs.o: No such file or directory
> make[1]: [__modpost] Error 1 (ignored)
>
> This error is followed by lots of errors such as:
>
> m68k-linux-gcc: error: arch/m68k/emu/nfcon.mod.c: No such file or directory
> m68k-linux-gcc: fatal error: no input files
> compilation terminated.
> make[1]: [arch/m68k/emu/nfcon.mod.o] Error 1 (ignored)
>
> This doesn't matter much for normal builds, but it is annoying for builds
> started with "make -i" due to the large number of secondary errors.
> Those errors unnececessarily clog any error log and make it difficult
> to find the real errors in the build.
>
> Fix the problem by only passing existing object files to modpost.
>
> Cc: Rusty Russell
> Signed-off-by: Guenter Roeck
> ---
> scripts/Makefile.modpost |3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
> index 8dcdca2..387c806 100644
> --- a/scripts/Makefile.modpost
> +++ b/scripts/Makefile.modpost
> @@ -81,7 +81,8 @@ modpost = scripts/mod/modpost\
>
> # We can go over command line length here, so be careful.
> quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules
> - cmd_modpost = $(MODLISTCMD) | sed 's/\.ko$$/.o/' | $(modpost) -s -T -
> + cmd_modpost = $(MODLISTCMD) | sed 's/\.ko$$/.o/' | \
> + while read a; do [ -f $$a ] && echo $$a; done | $(modpost) -s -T -
Can you do this filtering only if make -i is used ('i' is present in
$(MAKEFLAGS)), to not hide potential buildsystem bugs? Regarding shell
loop vs. ls, maybe the cleanest way would be to add an option to modpost
to ignore missing files.
Thanks,
Michal
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 1/3] kconfig: do not special-case 'MODULES' symbol
Dne 3.9.2013 23:12, Yann E. MORIN napsal(a): > Doh... I forgot to send an intro mail first. Seems holidays really were > a good break! :-) :-) > Anyway, this series might be a bit late to go in for 3.12, but it has > previously been discussed with you and Sam. > > If you feel it's too touchy for 3.12, then I believe it can easily wait > for 3.13. > > If you want it for 3.12, I can send a pull-request if that's easier for > you. Please send me a pull request regardless, so that the second commit's changelog references the right commit id. I'll play with this and will merge it into kbuild.git if there are no problems. It's two days into the merge window, so no big deal (shh!). Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 1/3] kconfig: do not special-case 'MODULES' symbol
On 3.9.2013 23:04, Yann E. MORIN wrote: > From: "Yann E. MORIN" > > Currently, the 'MODULES' symbol is hard-coded to be the default symbol > that enables/disables tristates, if no other symbol was declared with > 'option modules'. > > While this used to be needed for the Linux kernel, we now have an > explicit 'option modules' attached to the 'MODULES' symbol (since > cset 11097a036), so we no longer need to special-case it in the > kconfig code. > > Furthermore, kconfig is extensively used out of the Linux kernel, and > other projects may have another meaning for a symbol named 'MODULES'. > > This patch changes the way we enable/disable tristates: if a symbol was > found with 'option modules' attached to it, then that symbol controls > enabling tristates. Otherwise, tristates are disabled, even if a symbol > named 'MODULES' exists. Wasn't this change supposed to fix allmodconfig with KCONFIG_ALLCONFIG (http://lkml.org/lkml/2013/8/8/573)? Or is there still more to do? Because I'm still getting: $ touch empty $ make KCONFIG_ALLCONFIG=empty allmodconfig HOSTCC scripts/basic/fixdep HOSTCC scripts/kconfig/conf.o SHIPPED scripts/kconfig/zconf.tab.c SHIPPED scripts/kconfig/zconf.lex.c SHIPPED scripts/kconfig/zconf.hash.c HOSTCC scripts/kconfig/zconf.tab.o HOSTLD scripts/kconfig/conf scripts/kconfig/conf --allmodconfig Kconfig # # configuration written to .config # $ grep MODULES .config CONFIG_MODULES_USE_ELF_RELA=y # CONFIG_MODULES is not set $ Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 1/3] kconfig: do not special-case 'MODULES' symbol
On 5.9.2013 11:38, Michal Marek wrote: > On 3.9.2013 23:04, Yann E. MORIN wrote: >> From: "Yann E. MORIN" >> This patch changes the way we enable/disable tristates: if a symbol was >> found with 'option modules' attached to it, then that symbol controls >> enabling tristates. Otherwise, tristates are disabled, even if a symbol >> named 'MODULES' exists. > > Wasn't this change supposed to fix allmodconfig with KCONFIG_ALLCONFIG > (http://lkml.org/lkml/2013/8/8/573)? Or is there still more to do? > Because I'm still getting: > [...] > $ grep MODULES .config > CONFIG_MODULES_USE_ELF_RELA=y > # CONFIG_MODULES is not set > $ Otherwise, I have no problem merging this series. I'm just curious what to do with the allmodconfig with KCONFIG_ALLCONFIG bug. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 1/3] kconfig: do not special-case 'MODULES' symbol
On 6.9.2013 11:47, Yann E. MORIN wrote: > Michal, All, > > On 2013-09-05 11:38 +0200, Michal Marek spake thusly: >> On 3.9.2013 23:04, Yann E. MORIN wrote: >>> From: "Yann E. MORIN" >>> >>> Currently, the 'MODULES' symbol is hard-coded to be the default symbol >>> that enables/disables tristates, if no other symbol was declared with >>> 'option modules'. >>> >>> While this used to be needed for the Linux kernel, we now have an >>> explicit 'option modules' attached to the 'MODULES' symbol (since >>> cset 11097a036), so we no longer need to special-case it in the >>> kconfig code. >>> >>> Furthermore, kconfig is extensively used out of the Linux kernel, and >>> other projects may have another meaning for a symbol named 'MODULES'. >>> >>> This patch changes the way we enable/disable tristates: if a symbol was >>> found with 'option modules' attached to it, then that symbol controls >>> enabling tristates. Otherwise, tristates are disabled, even if a symbol >>> named 'MODULES' exists. >> >> Wasn't this change supposed to fix allmodconfig with KCONFIG_ALLCONFIG >> (http://lkml.org/lkml/2013/8/8/573)? Or is there still more to do? > > This is part of the fix, and there are still things to change, yes. > > I'm not done with it yet, since I was unavailable for some time, and I > just wanted this part to be reviewed/upstreamed before continuing, just > in case I was going the wrong way. Understood. I will merge this series now and send the whole branch to Linus later. > I'll be further working on this, and hope to have something at the > beginning of next week. OK, thanks! Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT] kbuild updates for v3.12-rc1
Hi Linus, only these two commits are in the kbuild branch this time: - Using filechk for include/config/kernel.release - Cleanup in scripts/sortextable.c Thanks, Michal The following changes since commit ad81f0545ef01ea651886dddac4bef6cec930092: Linux 3.11-rc1 (2013-07-14 15:18:27 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git kbuild Michal Marek (1): kbuild: Do not overwrite include/config/kernel.release needlessly Ramkumar Ramachandra (1): scripts: remove unused function in sortextable.c Makefile |7 +-- scripts/sortextable.c |8 2 files changed, 5 insertions(+), 10 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT] kbuild misc updates for v3.12-rc1
Hi Linus, in the kbuild misc branch, I have: - make rpm-pkg updates, most importantly the rpm package now calls /sbin/installkernel - make deb-pkg: debuginfo split, correct kernel image path for parisc, mips and powerpc and a couple more minor fixes - New coccinelle check Thanks, Michal The following changes since commit ad81f0545ef01ea651886dddac4bef6cec930092: Linux 3.11-rc1 (2013-07-14 15:18:27 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git misc Anisse Astier (4): deb-pkg: use KCONFIG_CONFIG instead of .config file directly deb-pkg: split debug symbols in their own package deb-pkg: fix installed image path on parisc, mips and powerpc deb-pkg: add a hook argument to match debian hooks parameters Heinrich Schuchardt (1): Provide version number for Debian firmware package Max Filippov (1): scripts/checkkconfigsymbols.sh: replace echo -e with printf Mike Marciniszyn (3): rpm-pkg: add %post section to create initramfs and grub hooks rpm-pkg: install firmware files in kernel relative directory rpm-pkg: add generation of kernel-devel Rasmus Villemoes (1): coccinelle: replace 0/1 with false/true in functions returning bool scripts/checkkconfigsymbols.sh |4 +- scripts/coccinelle/misc/boolreturn.cocci | 58 ++ scripts/package/builddeb | 94 +- scripts/package/mkspec | 46 +-- 4 files changed, 178 insertions(+), 24 deletions(-) create mode 100644 scripts/coccinelle/misc/boolreturn.cocci -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT] kconfig updates for v3.12-rc1
Hi Linus, this is the kconfig part of kbuild for v3.12-rc1: - post-3.11 search code fixes and micro-optimizations - CONFIG_MODULES is no longer a special case; this is needed to eventually fix the bug that using KCONFIG_ALLCONFIG breaks allmodconfig - long long is used to store hex and int values - make silentoldconfig no longer warns when a symbol changes from tristate to bool (it's a job for make oldconfig) - scripts/diffconfig updated to work with newer Pythons - scripts/config does not rely on GNU sed extensions Michal The following changes since commit ad81f0545ef01ea651886dddac4bef6cec930092: Linux 3.11-rc1 (2013-07-14 15:18:27 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git kconfig for you to fetch changes up to e062781397e5bebc6c1b8dd4bf466136e13ae4c5: kconfig: do not allow more than one symbol to have 'option modules' (2013-09-05 11:10:08 +0200) Clement Chauplannaz (1): scripts/config: use sed's POSIX interface Kees Cook (1): kconfig: switch to "long long" for sanity Michal Marek (1): Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/kconfig Mike Pagano (2): diffconfig: Gracefully exit if the default config files are not present diffconfig: Update script to support python versions 2.5 through 3.3 Yann E. MORIN (11): Documentation/kconfig: more concise and straightforward search explanation kconfig: avoid multiple calls to strlen kconfig/[mn]conf: shorten title in search-box kconfig: minor style fixes in symbol-search code kconfig: don't allocate n+1 elements in temporary array kconfig: simplify symbol-search code kconfig: silence warning when parsing auto.conf when a symbol has changed type modules: do not depend on kconfig to set 'modules' option to symbol MODULES kconfig: do not special-case 'MODULES' symbol kconfig: regenerate bison parser kconfig: do not allow more than one symbol to have 'option modules' Documentation/kbuild/kconfig-language.txt | 1 + Documentation/kbuild/kconfig.txt | 8 +- init/Kconfig | 1 + scripts/config| 44 ++- scripts/diffconfig| 33 +- scripts/kconfig/confdata.c| 11 +- scripts/kconfig/mconf.c | 4 +- scripts/kconfig/menu.c| 11 +- scripts/kconfig/nconf.c | 4 +- scripts/kconfig/symbol.c | 68 ++-- scripts/kconfig/zconf.tab.c_shipped | 562 -- scripts/kconfig/zconf.y | 11 +- 12 files changed, 413 insertions(+), 345 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 2/4] scripts/config: use sed's POSIX interface
Dne 13.9.2013 11:54, Clément Chauplannaz napsal(a):
> On Sep 13, 2013, at 11:32 AM, Linus Walleij wrote:
>
>> On Fri, Sep 13, 2013 at 10:38 AM, Clément Chauplannaz
>> wrote:
>>
>>> Thank you for this report. I was able to reproduce this bug and fix it.
>>
>> Thanks! Tested and works fine.
> Glad to read the patch solves your issue. Thanks for the quick feedback!
>>
>>> My previous commit changed the separator between sed's substitute
>>> command and its parameters, from ':' to '/'. The latter conflicted
>>> with the slashes found in the value of variable CMDLINE, as provided
>>> in your email.
>>
>> Hm it could actually be useful to be able to have colons in a CMDLINE,
>> I wonder if we can think about some better separator ... oh well that
>> is another issue, all old scripts work now anyway.
> Indeed config script may not work with all possible string values.
> My
> first concern for now was to fallback to previous interface. We may look
> into hardening the script later on.
Right. I will merge the patch because it reverts a regression. But feel
free to submit another patch that escapes the colons in $after. The
script already uses #!/bin/bash, so a "${after//:/\:}" should work.
Michal
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[GIT] kconfig fix for v3.12-rc1
Hi Linus, there is a fix for a regression caused by my previous pull request. A sed command in scripts/config that used colons as separator was accidentally changed to use slashes, which fails when you use slashes in a value. Changing it back to colons is of course not a proper fix, but at least it will be broken in the same way it had been for four years. A proper fix is pending. Michal The following changes since commit 5b4197845ad1a33bc57da7ee5ea41de58c2f86bf: Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild (2013-09-11 08:34:25 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git kconfig Clement Chauplannaz (1): scripts/config: fix variable substitution command scripts/config |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT] kbuild fix for 3.12
Hi Linus, Here is an ARM Makefile fix that you even acked. After nobody wanted to take it, it ended up in the kbuild tree. Michal The following changes since commit 272b98c6455f00884f0350f775c5342358ebb73f: Linux 3.12-rc1 (2013-09-16 16:17:51 -0400) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git rc-fixes Robert Richter (1): arm, kbuild: make "make install" not depend on vmlinux arch/arm/Makefile|9 +++-- arch/arm/boot/Makefile | 16 arch/arm/boot/install.sh | 14 ++ 3 files changed, 29 insertions(+), 10 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] arm, kbuild: make "make install" not depend on vmlinux
On 9.10.2013 09:18, Geert Uytterhoeven wrote: > On Mon, Sep 30, 2013 at 6:31 PM, Yann E. MORIN > wrote: >> On 2013-09-30 10:49 +0200, Robert Richter spake thusly: >>> On 18.07.13 11:22:24, Michal Marek wrote: >>>>> So Michal (or ARM people - whoever wants to take the patch), just take >>>>> my ack. No objections. >>>> >>>> I can add it to the kbuild tree if needed. Otherwise you can add >>>> Acked-by: Michal Marek . >>> >>> This didn't make it upstream yet, can somebody at it to a tree? >> >> Since it's been acked-by Linus, I'll queue it in my tree, for Michal to >> pull from. Expect a pull-request soon. > > Sorry for chiming in that late, but I didn't think of this when reading the > original submission. > > Just doing "make oldconfig; make install" used to work. On ARM and maybe other architectures. > Removing the dependency of "make vmlinux" on vmlinux breaks this, doesn't it? Yes. > I had the habit of doing the above many years ago, when I was mostly doing > native builds, and before I had my own custom linux-install-kernel > script that e.g. > knows how to copy kernels and modules around to NFS servers. > > Not that I'm strongly attached to it, but there may be other users... We can't eat the cake and have it :). What can be done is to make arch/arm/boot/install.sh print a friendlier error message, like the x86 version does: if [ ! -f "$1" ]; then echo "" 1>&2 echo " *** Missing file: $1" 1>&2 echo ' *** You need to run "make" before "make install".' 1>&2 echo "" 1>&2 exit 1 fi Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: Can anyone suggest a better fix? Not sure if I understand the problem, but the patch fixed it
On 29.8.2013 19:55, Sam Ravnborg wrote: > Magic happens in Kbuild.include, Makefile.lib and Makefile.build. > But it make take some cup of coffee to grasp it. > > For find and fix whatever race condition you hit. BTW, there is a fix in 3.11 that might be relevant for you: commit 4d47dde47f7dd95042fa56283d948f50dd4b509c Author: 张忠山 Date: Sun Jun 30 17:09:28 2013 +0800 kbuild: create directory for dir/file.o At least, it's worth trying. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] kconfig: Make diffconfig work with Python 3
On 29.8.2013 17:10, Johannes Thumshirn wrote:
> On Wed, Aug 28, 2013 at 07:29:53AM -0700, Tim Bird wrote:
>> On Fri, Aug 9, 2013 at 5:27 AM, Johannes Thumshirn
>> wrote:
>>> Adjust diffconfig to run cleanly on Python 3 (Tested with 3.3.2) and
>>> Python 2 (2.7.5)
>>>
>>> Signed-off-by: Johannes Thumshirn
>>> ---
>>> scripts/diffconfig | 26 +-
>>> 1 file changed, 13 insertions(+), 13 deletions(-)
>>>
>>> diff --git a/scripts/diffconfig b/scripts/diffconfig
>>> index b91f3e3..dd0e75b 100755
>>> --- a/scripts/diffconfig
>>> +++ b/scripts/diffconfig
>>> @@ -10,7 +10,7 @@
>>> import sys, os
>>>
>>> def usage():
>>> -print """Usage: diffconfig [-h] [-m] [ ]
>>> +print ("""Usage: diffconfig [-h] [-m] [ ]
>>>
>>> Diffconfig is a simple utility for comparing two .config files.
>>> Using standard diff to compare .config files often includes extraneous and
>>> @@ -33,7 +33,7 @@ Example usage:
>>> EXT2_FS y -> n
>>> LOG_BUF_SHIFT 14 -> 16
>>> PRINTK_TIME n -> y
>>> -"""
>>> +""")
>>> sys.exit(0)
>>>
>>> # returns a dictionary of name/value pairs for config items in the file
>>> @@ -54,23 +54,23 @@ def print_config(op, config, value, new_value):
>>> if merge_style:
>>> if new_value:
>>> if new_value=="n":
>>> -print "# CONFIG_%s is not set" % config
>>> +print("# CONFIG_%s is not set" % config)
>>> else:
>>> -print "CONFIG_%s=%s" % (config, new_value)
>>> +print("CONFIG_%s=%s" % (config, new_value))
>>> else:
>>> if op=="-":
>>> -print "-%s %s" % (config, value)
>>> +print("-%s %s" % (config, value))
>>> elif op=="+":
>>> -print "+%s %s" % (config, new_value)
>>> +print("+%s %s" % (config, new_value))
>>> else:
>>> -print " %s %s -> %s" % (config, value, new_value)
>>> +print(" %s %s -> %s" % (config, value, new_value))
>>>
>>> def main():
>>> global merge_style
>>>
>>> # parse command line args
>>> if ("-h" in sys.argv or "--help" in sys.argv):
>>> - usage()
>>> +usage()
>>>
>>> merge_style = 0
>>> if "-m" in sys.argv:
>>> @@ -79,13 +79,13 @@ def main():
>>>
>>> argc = len(sys.argv)
>>> if not (argc==1 or argc == 3):
>>> -print "Error: incorrect number of arguments or unrecognized option"
>>> +print("Error: incorrect number of arguments or unrecognized
>>> option")
>>> usage()
>>>
>>> if argc == 1:
>>> # if no filenames given, assume .config and .config.old
>>> build_dir=""
>>> -if os.environ.has_key("KBUILD_OUTPUT"):
>>> +if 'KBUILD_OUTPUT' in os.environ:
>>> build_dir = os.environ["KBUILD_OUTPUT"]+"/"
>>>
>>> configa_filename = build_dir + ".config.old"
>>> @@ -94,8 +94,8 @@ def main():
>>> configa_filename = sys.argv[1]
>>> configb_filename = sys.argv[2]
>>>
>>> -a = readconfig(file(configa_filename))
>>> -b = readconfig(file(configb_filename))
>>> +a = readconfig(open(configa_filename))
>>> +b = readconfig(open(configb_filename))
>>>
>>> # print items in a but not b (accumulate, sort and print)
>>> old = []
>>> @@ -121,7 +121,7 @@ def main():
>>>
>>> # now print items in b but not in a
>>> # (items from b that were in a were removed above)
>>> -new = b.keys()
>>> +new = list(b.keys())
>>> new.sort()
>>> for config in new:
>>> print_config("+", config, None, b[config])
>>> --
>>> 1.7.9.5
>>
>> Sorry I missed this earlier. My new e-mail is tim.b...@sonymobile.com, and
>> my old am.sony.com address doesn't work any more.
>>
>> Thanks - this looks great.
>>
>> Acked-by Tim Bird
>>
>> -- Tim Bird
>> Senior Software Engineer, Sony Mobile
>> Architecture Group Chair, CE Workgroup, Linux Foundation
>
> Is there any comments from the kbuild maintainers?
I merged a nearly identical patch by Mike Pagano
(http://www.spinics.net/lists/linux-kbuild/msg08503.html), seems like
you guys had the same idea at the same time.
Michal
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [RFC V4 PATCH 00/15] Signature verification of hibernate snapshot
On 26.9.2013 14:06, Pavel Machek wrote: > Actually... > > Is not it as simple as storing hash of hibernation image into NVRAM > and then verifying the hash matches the value in NVRAM on next > startup? No encryption needed. I think that part of the exercise is to minimize the number of writes to the NVRAM. The hash changes with every hibernation, obviously. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] modpost: Fix secondary errors seen if a single module build fails
On 18.9.2013 16:05, Guenter Roeck wrote: > To follow up on this - are you at the Linux Plumbers conference ? > If yes maybe we can meet briefly and discuss how to proceed. > I'd volunteer to create a patch to add the above functionality if > people think it is valuable, but I would like to keep it as > separate patch. Sorry, I was not at the LPC and had vacation at that time. I see Rusty already merged your patch, that's great. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
