| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
| |
In case of any issue with `selcted_*` (non-exising for example),
it failed (silently at the bottom of ./ptxdist) showing only
> PTXdist: fatal error ... cannot start, sorry!
which isn't helpful, so let's see the real error as well.
Signed-off-by: Christian Hermann <christian.hermann@hytera.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
New helper to find a file with ptxd_in_path() and then atomically replace
the target file.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
This ensures that nothing waits for user input. Any output that requests
the input will not be visible anyways.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
It is mostly the same as ptxd_get_path() but it filters out any results
that are symlinks to /dev/null.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
PTXDIST_PATH_LAYERS is used to find the absolute path for
Relative file:// URLs. Do the same thing for lndir://.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
| |
This is a lot faster than starting a shell.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
| |
This is a lot faster than starting a shell.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
| |
Just move the functions and whitespace changes.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
This is needed to support layers in custom search paths, e.g. in
PTXCONF_DTC_OFTREE_DTS_PATH.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
| |
This just extends the search list to include all layers. Each layer has the
usual BSP search paths. If a file is not found on one layer, then the
previous layer is checked.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
| |
'oldconfig' is executed recursivly. Each time, the last layer is removed
from PTXDIST_PATH. As a result, ptxd_print_path will produce paths starting
with 'base/' in the current layer.
Also, any platformconfigdir or layer paths are not used anyways, because
the workspace matches first.
So just use the workspace and topdir explicitly.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
Each argument is printed as one line. If the last argument is a number,
then it is uses as exit code.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
tar 1.30 reports position sensitive options and returns with an error
code. This causes the following error during barebox prepare.
tar: The following options were used after any non-optional arguments in
archive create or update mode. These options are positional and affect
only arguments that follow them. Please, rearrange them properly.
tar: --exclude '.svn' has no effect
tar: --exclude '.pc' has no effect
tar: --exclude '.git' has no effect
tar: --exclude '*.in' has no effect
tar: --exclude '*.in.*' has no effect
tar: --exclude '*/*~' has no effect
tar: Exiting with failure status due to previous errors
Reorder the arguments to tar and put the --exclude arguments before the
current directory.
Signed-off-by: Michael Tretter <michael.tretter@posteo.net>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This basically reverts bf1a5b588e4c1b0ac7dbfd52d4acb4c0d1b81539
("ptxd_make_log: improve output handling") and implements it differently.
Showing the bailout message even when quiet is enabled is good, but using
the error path breaks the ordering in the logfile when output-sync is
enabled.
Use the normal output explicitly write the message to stdout if quiet is
enabled.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
| |
Make it possible to use PTXDIST_FD_LOGERR to bypass output redirection.
Ensure that ptxd_bailout() output is always logged and printed to the
console.
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>
|
|
|
|
|
|
|
| |
This is called 4 times before 'make' is executed. No need to do this
multiple times.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
| |
stderr goes to the shell when quite is enable and that is not wanted here.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
| |
Change separator to allow ':' in filenames.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
[mol: fix old perm file detection]
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>
|
|
|
|
|
|
|
| |
With this option enabled the make jobserver is shared between outer and
inner 'make' to optimize parallel building.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
The generated Kconfig files for the sections don't change during on ptxdist
run. There is no need to generate those more than once.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
This way, it should be possible to call e.g. 'ptxdist kernelconfig' while
'ptxdist go' is still running.
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>
|
|
|
|
|
|
|
|
| |
Redirecting with ">&${PTXDIST_FD_LOGFILE}" would be better, however this
does not work if the function using it is define outside of 'make' and then
called inside 'make'.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
| |
5, 6 and 7 are also used in configure scripts, so avoid those.
Allocate PTXDIST_FD_STDOUT and PTXDIST_FD_STDERR dynamically
Set PTXDIST_FD_LOGFILE=9 so the wrapper works when 'dash' is /bin/sh for
the wrapper scripts: dash only works with 0-9 for fd redirection.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
PTXDIST_VERBOSE is set to '0' or '1'
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
PTXDIST_VERBOSE is set to "1" when enabled, not "true".
So test for non zero length instead of true.
Signed-off-by: Marc Kleine-Budde <mkl@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>
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
Derived from solution of the script given in the following thread:
http://list.us.dell.com/pipermail/dkms-devel/2004-July/000142.html
Porting it to ptxdist.
Signed-off-by: Benoît Burnichon <benoit.burnichon@airtag.com>
|