| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The memcached ./configure option for lighttpd changed, see the changeset
for upgrading lighttpd package from 1.4.39 to 1.4.45. For making the
configure option consistent with the menu entry, the menu variable is
renamed here. It seems lighttpd has switched from libmemcache to
libmemcached for memcached support.
Took this from a not applied patch from 2016, and added the necessary
migration helper suggested by Michael Olbrich, plus the dependency
changes in lighttpd.in.
However libmemcache and libmemcached are outdated and build against the
old libmemcached fails now, so mark it as broken.
Suggested-by: Andreas Geisenhainer <Andreas.Geisenhainer@atsonline.de>
Suggested-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Alexander Dahl <ada@thorsis.com>
[mol: LIGHTTPD_MOD_TRIGGER_B4_DL is also broken + commends for that]
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>
|
|
|
|
|
|
|
| |
This may be called multiple times in parallel when building with '-j'. Use
a random config file name to avoid collisions.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
| |
In quiet mode PTXDIST_FD_LOGERR is stdout and the error message may be
interpreted as valid output.
configure scripts will capture stdout of pkg-config anyways and dump it
with the rest of the output, so ordering is preserved.
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>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
| |
stderr redirection does not work with '$(< ...)'
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
| |
Remove indirection now, that only one package tool remains.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Recent debugging tools support separate binaries and debug information
files. Providing a unique 'build-id' embedded in the binary enables the
debugging tools to select the correct and matching debug information
files from the system's root filesystem.
The 'build-id' is a 40 character calculated SHA1 from important sections in
the binary. The debug information files get stored at a central direcory at
"/usr/lib/debug/", with a special path based on the 'build-id'. If the
'build-id' is "123456789abcdef", the path and filename will be
".build-id/12/3456789abcdef.debug".
Its possible to have more than one 'build-id' in the binary. This
implementation prefers the first one in the list, which might be the
wrong one. It's unclear yet how the common debugging tools will behave in
this case.
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
|
|
|
|
|
|
| |
Add arguments to set sysroot and debug-file-directory.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
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>
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
It's always the same and calling the compiler several times has a
measurable impact on the startup time.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
Use 'dst' as variable name. This way install_setup() will do the correct
/usr merge fixup.
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>
|
|
|
|
|
|
|
|
|
|
| |
Some file names have changed, adapt to new names. The labels are adapted
as well, so add migration helpers.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
[mol: create legacy linsk with configure options for host-dosfstools]
[mol: fix migrate patterns]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
| |
Signed-off-by: Philipp Zabel <p.zabel@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>
|
|
|
|
|
|
| |
stderr goes to the shell when quite is enable and that is not wanted here.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
| |
icecc creates temporary files with the username in the name. In fakeroot
the username is 'root' so this can cause collisions in multi-user
environments.
Nothing is supposed to be compiled in fakeroot, but it can happen during
'make install' due to broken dependencies.
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 helps with migration. Otherwise files in e.g. projectroot/lib/ in the
BSP a silently skipped for packages that have been converted to
prefix='/usr'.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
Any files in /bin, /sbin and /lib are transparently installed in /usr.
This makes it possible to migrate each package individually.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
| |
By default, tar.gz archives store a mod time in the gzip header.
This means that archives created from the same files will still
have different md5 sums. Fix this by passing gzip option -n to tar.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
| |
This happens when ptxd_make_image_extract_xpkg_files() calls
ptxd_lib_dopermissions() to fix the directory permissions and for fifos if
ptxd_make_nfsd() is called more than once.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
| |
Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
| |
This way changes to udev from systemd cannot break the legacy udev any
more.
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
[mol: moajor rework]
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>
|
|
|
|
|
|
|
| |
make sure the configure scripts don't overwrite the
enable_option_checking=fatal that we set in the environment.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
Such files may be created, e.g. by qmake if 'separate_debug_info' is
enabled.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
| |
In bash >= 4.2 escaping '{' and '}' works differently. As a result, the
output is not the same (extra '\'). Use temporary variables to handle old
and new bash versions correctly.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
This avoids "error: empty parameter to 'ptxd_make_get'" errors ptxdist
tries to download a package that is not selected.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
| |
Independently from the PTXCONF_PROJECT_CHECK_LICENSES setting the license
was extracted from each package due to this '='/'==' mismatch.
Also, move the check before the loop that modifies 'this_PKG'. Otherwise
the check always fails.
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
| |
Only shore test programs are compiled here. So just do this locally and
avoid the overhead from calling icecc first.
This can speed up the prepare stage significantly.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
In make 4.2 --jobserver-fds was renamed to --jobserver-auth and is now a
public command line option. Use the new option if it is recognized.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
| |
Without this, building images that use the same config files in parallel is
broken. They use the same file in PTXDIST_TEMPDIR and all may use the
substitutions from one of them.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|