From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
MIME-Version: 1.0
From: Jon Ringle <jon@ringle.org>
Date: Mon, 18 Feb 2019 11:11:51 -0500
Message-ID: <CAMwGMjwmVM-wC3F-6GSWYN0m-Yt-eRgtszTFtfsYUqZN7B2OjQ@mail.gmail.com>
Subject: [ptxdist] Problems building kernel image with initramfs with no tty
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Content-Type: multipart/mixed; boundary="===============1866529645=="
Errors-To: ptxdist-bounces@pengutronix.de
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
To: ptxdist@pengutronix.com

--===============1866529645==
Content-Type: multipart/alternative; boundary="0000000000009d6fa005822d622e"

--0000000000009d6fa005822d622e
Content-Type: text/plain; charset="UTF-8"

I've recently updated to ptxdist-2019.01.0 and have noted some changes with
my project that builds a kernel image with initramfs:

1) In rules/kernel.make, there is the following code:

#
# Don't keep the expanded path to INITRAMS_SOURCE in $(KERNEL_CONFIG),
# because it contains local workdir path which is not relevant to
# other developers.
#
ifdef KERNEL_INITRAMFS_SOURCE_y
        @sed -i -e
's,^CONFIG_INITRAMFS_SOURCE.*$$,CONFIG_INITRAMFS_SOURCE=\"# Automatically
set by PTXDist\",g' \
                "$(<)"
endif


However, this is no longer having the intended behavior. The
$(KERNEL_CONFIG) is being modified after doing a `ptxdist images`:

$ ptxdist print KERNEL_CONFIG
/home/local/GRIDPOINT/jringle/git/linux-initramfs/ptxconf/ec1k/kernelconfig-3.12
$ ptxdist print KERNEL_INITRAMFS_SOURCE_y
/home/local/GRIDPOINT/jringle/git/linux-initramfs/platform-ec1k/state/empty.cpio
$ git diff
diff --git a/ptxconf/ec1k/kernelconfig-3.12 b/ptxconf/ec1k/kernelconfig-3.12
index 247c3bb..c77037f 100644
--- a/ptxconf/ec1k/kernelconfig-3.12
+++ b/ptxconf/ec1k/kernelconfig-3.12
@@ -116,7 +116,7 @@ CONFIG_NET_NS=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="# Automatically set by PTXDist"
+CONFIG_INITRAMFS_SOURCE="/home/local/GRIDPOINT/jringle/git/linux-initramfs/platform-ec1k/state/empty.cpio"
 CONFIG_INITRAMFS_ROOT_UID=0
 CONFIG_INITRAMFS_ROOT_GID=0
 # CONFIG_RD_GZIP is not set


2) As a result of the above, the build behavior is different between a
build with a tty, and a build without a tty (build by a CI build
environment), because the kernel config file has changed and
ptxd_make_kconfig_sync() in scripts/lib/ptxd_make_world_kconfig.sh is
called:

ptxd_make_kconfig_sync() {
    local mode
    if [ "${ptx_config_mode}" = run ]; then
        if tty -s; then
            ptx_config_mode=update
        else
            ptx_config_mode=check
        fi
    fi
    if [ -n "${ref_file_dotconfig}" ]; then
        file_dotconfig="${ref_file_dotconfig}" ptxd_normalize_config &&
        relative_ref_file_dotconfig="${relative_file_dotconfig}"
    fi &&
    ptxd_normalize_config &&
    ptxd_kconfig_sync_config "${ptx_config_mode}"
"${pkg_build_dir}/.config" \
        "${relative_file_dotconfig}" "${file_dotconfig}"
"${relative_ref_file_dotconfig}"
}


A build failure without a tty can be simulated with: `ssh localhost "cd
$(pwd); ptxdist images"`:

----------------------
target: kernel.prepare
----------------------

Using config file: 'linux-initramfs/ptxconf/ec1k/kernelconfig-3.12'

make[1]: Entering directory `/home/local/GRIDPOINT/jringle/git/linux'
scripts/kconfig/conf --oldconfig Kconfig
#
# configuration written to .config
#
make[1]: Leaving directory `/home/local/GRIDPOINT/jringle/git/linux'

ptxdist: error: Outdated config for 'linux-initramfs'
ptxdist: error: 'oldconfig' changes the file. Run 'oldconfig kernel' to
update.

make: ***
[/home/local/GRIDPOINT/jringle/git/linux-initramfs/platform-ec1k/state/kernel.prepare]
Error 1


I worked around this by modifying the ptxdist used by our build server so
that ptxd_make_kconfig_sync() always used ptx_config_mode=update even if
there is no tty. But I know that this is not the right solution. But I also
don't know what the proper solution should be.

Regards,
-Jon

--0000000000009d6fa005822d622e
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div dir=3D"ltr"><div dir=3D"ltr"><div dir=3D"ltr"><div di=
r=3D"ltr"><div dir=3D"ltr"><div dir=3D"ltr"><div dir=3D"ltr">I&#39;ve recen=
tly updated to ptxdist-2019.01.0 and have noted some changes with my projec=
t that builds a kernel image with initramfs:<div><br></div><div>1) In rules=
/kernel.make, there is the following code:<br></div></div><blockquote style=
=3D"margin:0px 0px 0px 40px;border:none;padding:0px"><div><div><div>#</div>=
</div></div><div><div><div># Don&#39;t keep the expanded path to INITRAMS_S=
OURCE in $(KERNEL_CONFIG),</div></div></div><div><div><div># because it con=
tains local workdir path which is not relevant to</div></div></div><div><di=
v><div># other developers.</div></div></div><div><div><div>#</div></div></d=
iv><div><div><div>ifdef KERNEL_INITRAMFS_SOURCE_y</div></div></div><div><di=
v><div>=C2=A0 =C2=A0 =C2=A0 =C2=A0 @sed -i -e &#39;s,^CONFIG_INITRAMFS_SOUR=
CE.*$$,CONFIG_INITRAMFS_SOURCE=3D\&quot;# Automatically set by PTXDist\&quo=
t;,g&#39; \</div></div></div><div><div><div>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 &quot;$(&lt;)&quot;</div></div></div><div><div><di=
v>endif</div></div></div></blockquote><div dir=3D"ltr"><div><div><br></div>=
<div>However, this is no longer having the intended behavior. The $(KERNEL_=
CONFIG) is being modified after doing a `ptxdist images`:</div></div></div>=
</div></div></div><blockquote style=3D"margin:0px 0px 0px 40px;border:none;=
padding:0px"><div><div><div><div><div><div>$ ptxdist print KERNEL_CONFIG</d=
iv></div></div></div></div></div><div><div><div><div><div><div>/home/local/=
GRIDPOINT/jringle/git/linux-initramfs/ptxconf/ec1k/kernelconfig-3.12</div><=
/div></div></div></div></div><div><div><div><div><div><div>$ ptxdist print =
KERNEL_INITRAMFS_SOURCE_y</div></div></div></div></div></div><div><div><div=
><div><div><div>/home/local/GRIDPOINT/jringle/git/linux-initramfs/platform-=
ec1k/state/empty.cpio</div></div></div></div></div></div><div><div><div><di=
v><div><div>$ git diff</div></div></div></div></div></div><div><div><div><d=
iv><div><div>diff --git a/ptxconf/ec1k/kernelconfig-3.12 b/ptxconf/ec1k/ker=
nelconfig-3.12</div></div></div></div></div></div><div><div><div><div><div>=
<div>index 247c3bb..c77037f 100644</div></div></div></div></div></div><div>=
<div><div><div><div><div>--- a/ptxconf/ec1k/kernelconfig-3.12</div></div></=
div></div></div></div><div><div><div><div><div><div>+++ b/ptxconf/ec1k/kern=
elconfig-3.12</div></div></div></div></div></div><div><div><div><div><div><=
div>@@ -116,7 +116,7 @@ CONFIG_NET_NS=3Dy</div></div></div></div></div></di=
v><div><div><div><div><div><div>=C2=A0# CONFIG_SYSFS_DEPRECATED is not set<=
/div></div></div></div></div></div><div><div><div><div><div><div>=C2=A0# CO=
NFIG_RELAY is not set</div></div></div></div></div></div><div><div><div><di=
v><div><div>=C2=A0CONFIG_BLK_DEV_INITRD=3Dy</div></div></div></div></div></=
div><div><div><div><div><div><div>-CONFIG_INITRAMFS_SOURCE=3D&quot;# Automa=
tically set by PTXDist&quot;</div></div></div></div></div></div><div><div><=
div><div><div><div>+CONFIG_INITRAMFS_SOURCE=3D&quot;/home/local/GRIDPOINT/j=
ringle/git/linux-initramfs/platform-ec1k/state/empty.cpio&quot;</div></div>=
</div></div></div></div><div><div><div><div><div><div>=C2=A0CONFIG_INITRAMF=
S_ROOT_UID=3D0</div></div></div></div></div></div><div><div><div><div><div>=
<div>=C2=A0CONFIG_INITRAMFS_ROOT_GID=3D0</div></div></div></div></div></div=
><div><div><div><div><div><div>=C2=A0# CONFIG_RD_GZIP is not set</div></div=
></div></div></div></div></blockquote><div dir=3D"ltr"><div dir=3D"ltr"><di=
v dir=3D"ltr"><div dir=3D"ltr"><div><br></div><div>2) As a result of the ab=
ove, the build behavior is different between a build with a tty, and a buil=
d without a tty (build by a CI build environment), because the kernel confi=
g file has changed and ptxd_make_kconfig_sync() in scripts/lib/ptxd_make_wo=
rld_kconfig.sh is called:</div></div></div></div></div></div><blockquote st=
yle=3D"margin:0px 0px 0px 40px;border:none;padding:0px"><div><div><div><div=
><div><div><div>ptxd_make_kconfig_sync() {</div></div></div></div></div></d=
iv></div><div><div><div><div><div><div><div>=C2=A0 =C2=A0 local mode</div><=
/div></div></div></div></div></div><div><div><div><div><div><div><div>=C2=
=A0 =C2=A0 if [ &quot;${ptx_config_mode}&quot; =3D run ]; then</div></div><=
/div></div></div></div></div><div><div><div><div><div><div><div>=C2=A0 =C2=
=A0 =C2=A0 =C2=A0 if tty -s; then</div></div></div></div></div></div></div>=
<div><div><div><div><div><div><div>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 ptx_config_mode=3Dupdate</div></div></div></div></div></div></div><div>=
<div><div><div><div><div><div>=C2=A0 =C2=A0 =C2=A0 =C2=A0 else</div></div><=
/div></div></div></div></div><div><div><div><div><div><div><div>=C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ptx_config_mode=3Dcheck</div></div></div></=
div></div></div></div><div><div><div><div><div><div><div>=C2=A0 =C2=A0 =C2=
=A0 =C2=A0 fi</div></div></div></div></div></div></div><div><div><div><div>=
<div><div><div>=C2=A0 =C2=A0 fi</div></div></div></div></div></div></div><d=
iv><div>=C2=A0 =C2=A0 if [ -n &quot;${ref_file_dotconfig}&quot; ]; then</di=
v><div>=C2=A0 =C2=A0 =C2=A0 =C2=A0 file_dotconfig=3D&quot;${ref_file_dotcon=
fig}&quot; ptxd_normalize_config &amp;&amp;</div><div>=C2=A0 =C2=A0 =C2=A0 =
=C2=A0 relative_ref_file_dotconfig=3D&quot;${relative_file_dotconfig}&quot;=
</div><div>=C2=A0 =C2=A0 fi &amp;&amp;</div><div>=C2=A0 =C2=A0 ptxd_normali=
ze_config &amp;&amp;</div><div>=C2=A0 =C2=A0 ptxd_kconfig_sync_config &quot=
;${ptx_config_mode}&quot; &quot;${pkg_build_dir}/.config&quot; \</div><div>=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 &quot;${relative_file_dotconfig}&quot; &quot;${=
file_dotconfig}&quot; &quot;${relative_ref_file_dotconfig}&quot;</div><div>=
}</div></div></blockquote><div dir=3D"ltr"><div dir=3D"ltr"><div dir=3D"ltr=
"><div dir=3D"ltr"><div dir=3D"ltr"><div><br></div><div>A build failure wit=
hout a tty can be simulated with: `ssh localhost &quot;cd $(pwd); ptxdist i=
mages&quot;`:</div></div></div></div></div></div></div></div><blockquote st=
yle=3D"margin:0 0 0 40px;border:none;padding:0px"><div><div><div><div><div>=
<div><div><div><div>----------------------</div></div></div></div></div></d=
iv></div></div></div><div><div><div><div><div><div><div><div><div>target: k=
ernel.prepare</div></div></div></div></div></div></div></div></div><div><di=
v><div><div><div><div><div><div><div>----------------------</div></div></di=
v></div></div></div></div></div></div><div><div><div><div><div><div><div><d=
iv><div><br></div></div></div></div></div></div></div></div></div><div><div=
><div><div><div><div><div><div><div>Using config file: &#39;linux-initramfs=
/ptxconf/ec1k/kernelconfig-3.12&#39;</div></div></div></div></div></div></d=
iv></div></div><div><div><div><div><div><div><div><div><div><br></div></div=
></div></div></div></div></div></div></div><div><div><div><div><div><div><d=
iv><div><div>make[1]: Entering directory `/home/local/GRIDPOINT/jringle/git=
/linux&#39;</div></div></div></div></div></div></div></div></div><div><div>=
<div><div><div><div><div><div><div>scripts/kconfig/conf --oldconfig Kconfig=
</div></div></div></div></div></div></div></div></div><div><div><div><div><=
div><div><div><div><div>#</div></div></div></div></div></div></div></div></=
div><div><div><div><div><div><div><div><div><div># configuration written to=
 .config</div></div></div></div></div></div></div></div></div><div><div><di=
v><div><div><div><div><div><div>#</div></div></div></div></div></div></div>=
</div></div><div><div><div><div><div><div><div><div><div>make[1]: Leaving d=
irectory `/home/local/GRIDPOINT/jringle/git/linux&#39;</div></div></div></d=
iv></div></div></div></div></div><div><div><div><div><div><div><div><div><d=
iv><br></div></div></div></div></div></div></div></div></div><div><div><div=
><div><div><div><div><div><div>ptxdist: error: Outdated config for &#39;lin=
ux-initramfs&#39;</div></div></div></div></div></div></div></div></div><div=
><div><div><div><div><div><div><div><div>ptxdist: error: &#39;oldconfig&#39=
; changes the file. Run &#39;oldconfig kernel&#39; to update.</div></div></=
div></div></div></div></div></div></div><div><div><div><div><div><div><div>=
<div><div><br></div></div></div></div></div></div></div></div></div><div><d=
iv><div><div><div><div><div><div><div>make: *** [/home/local/GRIDPOINT/jrin=
gle/git/linux-initramfs/platform-ec1k/state/kernel.prepare] Error 1</div></=
div></div></div></div></div></div></div></div></blockquote><div dir=3D"ltr"=
><div dir=3D"ltr"><div dir=3D"ltr"><div dir=3D"ltr"><div dir=3D"ltr"><div d=
ir=3D"ltr"><div dir=3D"ltr"><div><br></div><div>I worked around this by mod=
ifying the ptxdist used by our build server so that ptxd_make_kconfig_sync(=
) always used ptx_config_mode=3Dupdate even if there is no tty. But I know =
that this is not the right solution. But I also don&#39;t know what the pro=
per solution should be.</div><div><br></div><div>Regards,</div><div>-Jon</d=
iv><div><br></div><div><br></div></div></div></div></div></div></div></div>=
</div>

--0000000000009d6fa005822d622e--


--===============1866529645==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: base64
Content-Disposition: inline

X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KcHR4ZGlzdCBt
YWlsaW5nIGxpc3QKcHR4ZGlzdEBwZW5ndXRyb25peC5kZQ==

--===============1866529645==--