| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
This can happen if the top layer would have an empty diff and on the next
lower layer the config is a /dev/null symlink.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
| |
--auto-version
Without this $PTXDIST_TEMPDIR is never deleted and remains as a empty
directory.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
Pre-layer BSPs may contain a 'base' that is not a layer directory. Ignore
it for --autoversion. The next ptxdist will check again if necessary.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
Use the command-line order for 'config' and 'part'. Drop whitespace if
'part' is empty.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
All other variables like this start with PTXDIST_.
Export it, so it can be used later during the build.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
If the last explicit layer is PTXdist then this exact version should be
used, regardless of the version in the config file.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If PTXdist is an explicit last layer, then it is often a symlink.
PTXDIST_TOPDIR is always resolved with 'realpath', so do the same when
setting up the layers.
Make sure that the last path in PTXDIST_LAYERS is exactly PTXDIST_TOPDIR.
This is needed used in other places (e.g. ptxd_kconfig_update()).
This also fixes calling ptxdist from PTXDIST_TOPDIR when
$PWD != `realpath $PWD`.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
| |
Before the introduction of layers, these variables referred to the
nonexistent selected_* link if no config was selected of found.
The corresponding error handling rely on the behaviour. Restore this
behaviour to get the correct error message.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
This only happens if the path exists but is not a directory, e.g. a broken
link or a file. Change the error message to make this clearer.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is the first step to support layers in PTXdist.
A layer is just a subdirectory (or symlink) named 'base' in the BSP
workspace. Each layer looks just like another BSP. The first layer is
implicitly or explicitly PTXdist itself.
Automatic config file detection works as before in the last layer. If no
config file is found, then the previous tlayer is checked the same way, and so
on.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
Check the content of make and in files for packages in addition to the
package options to trigger the prepare stage.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
| |
It's obsolete and broken. dev packages should be used instead.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
| |
References: commit c22b59105d7596ee7ae561f9aa68c45355672620
Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
| |
Required to work with local python tools.
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
|
|
|
|
|
|
|
|
| |
Otherwise printing variables such as PACKAGES-y fails with
ptxdist: line 2042: PACKAGES-y: bad substitution
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
|
| |
PTXDIST_WORKSPACE
PTXDIST_TOPDIR is set to based on the path to ptxdist with all symlinks
resolved. PTXDIST_WORKSPACE is set to the current working directory. If
this path contains symlinks then comparing the strings does not work as
expected.
Use '-ef' instead to check if both paths point to the same directory.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
| |
Add arguments to set sysroot and debug-file-directory.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I discovered after updating to a new version of ptxdist that all of my
compile output including errors/warnings are now all going to stdout
instead of having the errors/warning going to stderr.
This is causing some problem when I use qtcreator as my IDE because
qtcreator will only filter stderr for errors/warnings to put into the
Issues tab, where one can simply click on the error/warning and be taken
right to the source line where the error/warning is found.
I found that this problem was introduced by commit
30b9267e35eea1c2edb4da0231a428bfa25b6766
This patch will conditionally redirect stderr>stdout on compile output
if ptxdist has output synchronization enabled.
This small program demonstrates the behavior with this patch applied:
$ cat local_src/testprog/testprog.c
int main(int argc, char *argv[])
{
printf("Hello World, I'm testprog!\n");
exit(EXIT_SUCCESS);
}
$ ptxdist compile testprog >/dev/null
testprog.c:4:2: error: #error An error here
#error An error here
^
make[1]: *** [testprog] Error 1
make: *** [/home/jringle-admin/code/gpec/ec1k-rootfs/platform-EC1K/state/testprog.compile] Error 2
$ ptxdist compile --output-sync testprog >/dev/null
make: *** [/home/jringle-admin/code/gpec/ec1k-rootfs/platform-EC1K/state/testprog.compile] Error 2
$ ptxdist compile --no-output-sync testprog >/dev/null
testprog.c:4:2: error: #error An error here
#error An error here
^
make[1]: *** [testprog] Error 1
make: *** [/home/jringle-admin/code/gpec/ec1k-rootfs/platform-EC1K/state/testprog.compile] Error 2
Signed-off-by: Jon Ringle <jringle@gridpoint.com>
[mol: bailout to PTXDIST_FD_STDERR and more cleanup]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
| |
Collecting files from doc/_static in a BSP lead to two nested _static
directories. This results in broken javascript and image links in the
html documentation.
Signed-off-by: Bastian Stender <bst@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
| |
'print-%' does not match 'print-/some/path'. This would be useful to debug
the tarball/package mappings that are defined as '$(<PKG>_SOURCE) = <PKG>'.
Using '/print-%' instead seems to work better. Use it but keep the old
patterns for backwards compatibility.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
| |
This allows to build the documentation on a fresh tree when
platform-dir/ does not exist yet
Signed-off-by: Roland Hieber <rohieb@rohieb.name>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
| |
That's the make version that is used later with the detected argument.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
| |
Checking if an archive is available without downloading it is difficult and
not 100 percent reliable. For best result curl needs to fail for error http
status codes (--fail) and follow redirects (--location). A HEAD request
(--head) is used to avoid downloading the whole file, but we send a GET
anyways (--request GET) because some servers don't allow HEAD requests.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
|
| |
For the simple use-case (the rootfs contains all packages) the normal
nfsroot works well. However, this is not useful to work with root
filesystems that contain only a subset of all packages.
With this change, if <IMAGE>_NFSROOT can be set to 'YES' then
<platformdir>/nfsroot/<image> will be filled with the files from only the
packages that are part of this image.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
| |
Separate debug files in .debug/ directories in root/ have been available
for some time. This is supported by all modern toolchains and much less
confusing.
Remove all references to root-debug except for cleaning: This way there
won't be old root-debug/ directories lying around after upgrading and
running 'ptxdist clean' or 'ptxdist clean root'.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
| |
Calling make with --output-sync=... can have unexpected effects. So don't
enable it by default for parallel building. Instead this adds an option for
this and enables it by default for quiet builds.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
| |
|
|
|
|
|
|
|
|
| |
The full 'usage' text is rarely useful because this is often triggered by
typos. Print the unknown argument instead and a hint where to find more
information.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
|
| |
- avoid "recipe for target '...' failed" messages
- generate '<variable>=<value>' when running in verbose mode
- produce and empty value instead of an error when "-k" is used
This makes is possible to use
$ ptxdist -v--k make print-<VAR1> print-<VAR2>·...
to dump a useful list of many variables that may or may not be defined.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
It may be needed in case a tarball depends on a host package.
This is currently true for the nodejs modules.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|