From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5F84BA046B for ; Fri, 23 Aug 2019 12:04:38 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 510A11BFB1; Fri, 23 Aug 2019 12:04:38 +0200 (CEST) Received: from mail-lj1-f194.google.com (mail-lj1-f194.google.com [209.85.208.194]) by dpdk.org (Postfix) with ESMTP id 417A01BFB1 for ; Fri, 23 Aug 2019 12:04:37 +0200 (CEST) Received: by mail-lj1-f194.google.com with SMTP id h15so8300513ljg.10 for ; Fri, 23 Aug 2019 03:04:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nfware-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:message-id:in-reply-to:references:subject :mime-version; bh=iiqk0vU07gCn6FeaEexET2iSm7GvgT2tf+QgUaD/fOI=; b=DIyiB62xhh3Hb9SHIAASrgDR/KMIlN1O2ukyS0kmCsZYdTJprGWFdfQeGnHmsmN1KM teNbuDHcFXn3k+YG2wh3LCYY/skVHIwHIUeifm3lm7Gfc0H2JXm0My2JaGDfj0hTel44 0NRaXARh7/SsqCwxErIdKbwAr+QhnxrNl4/CdMQurke6upkMOcLbSbQIqV3rvjkD3Umt i4zLfoJdouRspfQfRcjPrZWGL0SiX/B60u3ATbev72Teia1WNqkUcXnHdF9YE/zGB6Tp QdIm2VEqUDNw+WPput66lQnO7wqi1YRdnh/YD4vd/e2D6p88zPex9jfmxxKf20vHotHR YZnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:message-id:in-reply-to :references:subject:mime-version; bh=iiqk0vU07gCn6FeaEexET2iSm7GvgT2tf+QgUaD/fOI=; b=KPNBNsQSZTrR/DhWEXssVlF2xHyerveFNCrSOlr0KNCuEZ4YEz8uVtmfK9rmlYW1KD SXfWcvDJYLfDnBY8BUfmeXtJGFMAXLzB/k7VhjLN7BnW7IkG8yMkrDaJTbdpxO+LXmKa I3KrEK3mO3/G2Qcic0LDTjaiYRC3giCMAjXoLib07j1xxxfUqifVNU8lVvMtsIiJMdBe +lsRblfy/8i1rqvxUIFPLZM/Ftk8Y0MQg08BAuftO6ptcF3f0rIGTLSCTr1V23LakVrz 4ypvmQZBJ3wEjGl0Bm81mIpGHX2+EUEH3Ew4JN3ftl0BB81/bx5DvKXXden+y0WC/8Pj sJ6g== X-Gm-Message-State: APjAAAUNBeA/FzUS/wOhOKQsjGPhhj9/pgLcHFoFxiTP2vkADUqexMiD bTcnmOzLvqjVvWr1o2fLlk4Vvg== X-Google-Smtp-Source: APXvYqyby96ztnYDGOnTcnJCEaFyr6I0DsqWP+rb0PFmN6ONRnYmGxCXxNnlksGx81Lh9Zi2GDkg1A== X-Received: by 2002:a2e:8004:: with SMTP id j4mr2373268ljg.231.1566554676684; Fri, 23 Aug 2019 03:04:36 -0700 (PDT) Received: from [10.20.30.106] ([212.48.63.198]) by smtp.gmail.com with ESMTPSA id c23sm542406ljf.105.2019.08.23.03.04.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Aug 2019 03:04:36 -0700 (PDT) Date: Fri, 23 Aug 2019 13:04:30 +0300 From: Igor Ryzhov To: Kevin Traynor Cc: Bruce Richardson , dpdk stable Message-ID: In-Reply-To: <20190823094336.12078-6-ktraynor@redhat.com> References: <20190823094336.12078-1-ktraynor@redhat.com> <20190823094336.12078-6-ktraynor@redhat.com> X-Readdle-Message-ID: e9fde847-548b-432b-8537-0ec8db346d67@Spark MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: Re: [dpdk-stable] patch 'kernel/linux: fix modules install path' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Rebased version looks fine. Best regards, Igor On 23 Aug 2019, 12:44 +0300, Kevin Traynor , wrote: > Hi, > > FYI, your patch has been queued to LTS release 18.11.3 > > Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. > It will be pushed if I get no objections before 08/28/19. So please > shout if anyone has objections. > > Also note that after the patch there's a diff of the upstream commit vs the > patch applied to the branch. This will indicate if there was any rebasing > needed to apply to the stable branch. If there were code changes for rebasing > (ie: not only metadata diffs), please double check that the rebase was > correctly done. > > Queued patches are on a temporary branch at: > https://github.com/kevintraynor/dpdk-stable-queue > > This queued commit can be viewed at: > https://github.com/kevintraynor/dpdk-stable-queue/commit/15a14f6d5bc6fb4df53e8b3cb3fb53e504f838c9 > > Thanks. > > Kevin Traynor > > --- > From 15a14f6d5bc6fb4df53e8b3cb3fb53e504f838c9 Mon Sep 17 00:00:00 2001 > From: Igor Ryzhov > Date: Tue, 11 Jun 2019 11:49:34 +0300 > Subject: [PATCH] kernel/linux: fix modules install path > > [ upstream commit 317832f97c165cd4f327567935dfbd6af92b4159 ] > > Currently kernel modules are installed into /usr/src instead of > /lib/modules when meson build system is used. This patch fixes that. > > Signed-off-by: Igor Ryzhov > Acked-by: Bruce Richardson > --- > kernel/linux/igb_uio/meson.build | 4 ++-- > kernel/linux/kni/meson.build | 4 ++-- > kernel/linux/meson.build | 4 ++-- > meson_options.txt | 2 +- > 4 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/kernel/linux/igb_uio/meson.build b/kernel/linux/igb_uio/meson.build > index f5a9d5ccf..fac404f07 100644 > --- a/kernel/linux/igb_uio/meson.build > +++ b/kernel/linux/igb_uio/meson.build > @@ -9,5 +9,5 @@ custom_target('igb_uio', > input: ['igb_uio.c', 'Kbuild'], > output: 'igb_uio.ko', > - command: ['make', '-C', kernel_dir, > + command: ['make', '-C', kernel_dir + '/build', > 'M=' + meson.current_build_dir(), > 'src=' + meson.current_source_dir(), > @@ -17,4 +17,4 @@ custom_target('igb_uio', > depends: mkfile, > install: true, > - install_dir: kernel_dir + '/../extra/dpdk', > + install_dir: kernel_dir + '/extra/dpdk', > build_by_default: get_option('enable_kmods')) > diff --git a/kernel/linux/kni/meson.build b/kernel/linux/kni/meson.build > index a09af5aa5..e6822f49c 100644 > --- a/kernel/linux/kni/meson.build > +++ b/kernel/linux/kni/meson.build > @@ -17,5 +17,5 @@ custom_target('rte_kni', > input: kni_sources + kni_igb_sources + kni_ixgbe_sources, > output: 'rte_kni.ko', > - command: ['make', '-j4', '-C', kernel_dir, > + command: ['make', '-j4', '-C', kernel_dir + '/build', > 'M=' + meson.current_build_dir(), > 'src=' + meson.current_source_dir(), > @@ -31,4 +31,4 @@ custom_target('rte_kni', > console: true, > install: true, > - install_dir: kernel_dir + '/../extra/dpdk', > + install_dir: kernel_dir + '/extra/dpdk', > build_by_default: get_option('enable_kmods')) > diff --git a/kernel/linux/meson.build b/kernel/linux/meson.build > index 5b7ec06e1..c5bcc1f38 100644 > --- a/kernel/linux/meson.build > +++ b/kernel/linux/meson.build > @@ -21,9 +21,9 @@ else > # use default path for native builds > kernel_version = run_command('uname', '-r').stdout().strip() > - kernel_dir = '/lib/modules/' + kernel_version + '/build' > + kernel_dir = '/lib/modules/' + kernel_version > endif > > # test running make in kernel directory, using "make kernelversion" > - make_returncode = run_command('make', '-sC', kernel_dir, > + make_returncode = run_command('make', '-sC', kernel_dir + '/build', > 'kernelversion').returncode() > if make_returncode != 0 > diff --git a/meson_options.txt b/meson_options.txt > index 10b541615..91b0449a1 100644 > --- a/meson_options.txt > +++ b/meson_options.txt > @@ -14,5 +14,5 @@ option('include_subdir_arch', type: 'string', value: '', > description: 'subdirectory where to install arch-dependent headers') > option('kernel_dir', type: 'string', value: '', > - description: 'path to the kernel for building kernel modules, they will be installed in $DEST_DIR/$kernel_dir/../extra/dpdk') > + description: 'Path to the kernel for building kernel modules. Headers must be in $kernel_dir/build. Modules will be installed in $DEST_DIR/$kernel_dir/extra/dpdk.') > option('lib_musdk_dir', type: 'string', value: '', > description: 'path to the MUSDK library installation directory') > -- > 2.20.1 > > --- > Diff of the applied patch vs upstream commit (please double-check if non-empty: > --- > --- - 2019-08-22 19:38:20.876697935 +0100 > +++ 0006-kernel-linux-fix-modules-install-path.patch 2019-08-22 19:38:20.397027833 +0100 > @@ -1 +1 @@ > -From 317832f97c165cd4f327567935dfbd6af92b4159 Mon Sep 17 00:00:00 2001 > +From 15a14f6d5bc6fb4df53e8b3cb3fb53e504f838c9 Mon Sep 17 00:00:00 2001 > @@ -5,0 +6,2 @@ > +[ upstream commit 317832f97c165cd4f327567935dfbd6af92b4159 ] > + > @@ -9,2 +10,0 @@ > -Cc: stable@dpdk.org > - > @@ -38 +38 @@ > -index a9f48b0e6..955eec949 100644 > +index a09af5aa5..e6822f49c 100644 > @@ -41,2 +41,2 @@ > -@@ -14,5 +14,5 @@ custom_target('rte_kni', > - input: kni_sources, > +@@ -17,5 +17,5 @@ custom_target('rte_kni', > + input: kni_sources + kni_igb_sources + kni_ixgbe_sources, > @@ -48 +48 @@ > -@@ -26,4 +26,4 @@ custom_target('rte_kni', > +@@ -31,4 +31,4 @@ custom_target('rte_kni', > @@ -55 +55 @@ > -index a37c95752..1796cc686 100644 > +index 5b7ec06e1..c5bcc1f38 100644 > @@ -58,6 +58,6 @@ > -@@ -14,9 +14,9 @@ if kernel_dir == '' > - # use default path for native builds > - kernel_version = run_command('uname', '-r').stdout().strip() > -- kernel_dir = '/lib/modules/' + kernel_version + '/build' > -+ kernel_dir = '/lib/modules/' + kernel_version > - endif > +@@ -21,9 +21,9 @@ else > + # use default path for native builds > + kernel_version = run_command('uname', '-r').stdout().strip() > +- kernel_dir = '/lib/modules/' + kernel_version + '/build' > ++ kernel_dir = '/lib/modules/' + kernel_version > + endif > @@ -65,5 +65,5 @@ > - # test running make in kernel directory, using "make kernelversion" > --make_returncode = run_command('make', '-sC', kernel_dir, > -+make_returncode = run_command('make', '-sC', kernel_dir + '/build', > - 'kernelversion').returncode() > - if make_returncode != 0 > + # test running make in kernel directory, using "make kernelversion" > +- make_returncode = run_command('make', '-sC', kernel_dir, > ++ make_returncode = run_command('make', '-sC', kernel_dir + '/build', > + 'kernelversion').returncode() > + if make_returncode != 0 > @@ -71 +71 @@ > -index 16d9f92c6..5302b9c68 100644 > +index 10b541615..91b0449a1 100644 > @@ -74 +74 @@ > -@@ -16,5 +16,5 @@ option('include_subdir_arch', type: 'string', value: '', > +@@ -14,5 +14,5 @@ option('include_subdir_arch', type: 'string', value: '',