| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
These are only the -isystem arguments for sysroot. They should be added at
the end of the commandline. This way any other -isystem generated by the
package build system has priority.
This fixes building Qt5 packages if Qt4 is installed as well. For Q55 qmake
produces '-isystem <sysroot>/usr/include/qt5'. Without this the Qt4 headers
in <sysroot>/usr/include are used.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
| |
The escape sequence will not be evaluated without 'echo -e'.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
| |
This reverts commit 03ed2b8987737805fc64be0fda9d2532c7aee28e.
This was accidentally committed and breaks the building a lot of packages.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
'@SYSROOT@' is only introduced in _install_pack, so replace it in
_install_unpack.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
| |
ASCII representations in filenames, e.g. \x2d ("-"), were
interpreted by 'echo -e'. This fix uses 'echo -e' only for
the seperator.
Fixes: 0d61da7cd13f ("use ^_ as separator in perms files")
Signed-off-by: Bastian Stender <bst@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
The local variable must be declared first. Otherwise the error code for
mktemp is lost.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
| |
If someone else created the initial repository, then FETCH_HEAD already has
the correct permissions but 'chmod' will fail, so only try to change the
permissions if they are incorrect.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is mostly useful for install_alternative/install_alternative_tree.
There are use-cases where individual files installed by upstream packages
are unwanted for some reason.
With this change, such files can be masked by providing a symlink to
/dev/null as alternative. This makes it possible to remove such files
without copying and modifying the rule.
Note: this does not affect install_link, so creating links to /dev/null is
still possible.
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>
|
|
|
|
|
|
|
| |
Symlinks don't add anything to ther permission file, so make sure at least
an empty file exists for each package.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
| |
There are usecases where more than on 'PACKAGES-... += ...' in one makefile
is useful. This ensures that the makefile is only included once in this
case.
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>
|
|
|
|
|
|
|
|
|
| |
Otherwise they won't be added to PTX_PACKAGES_SELECTED. This breaks
source -> packages mapping and causes the get stage to fail with:
error: empty parameter to 'ptxd_make_get'
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
| |
On ArchLinux, python defaults to python 3.5.2, which breaks the script.
Fix it by calling /usr/bin/env python which uses <ptxdist>/bin/python, a
symlink to python2.
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
Setting pkg_install_env to the same value as pkg_make_env is redundant.
Both are used in the install stage.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
| |
For each package with info pages, install-info creates
'<pkgdir>/<prefix>/share/info/dir'. If packages are built in parallel, then
multiple install.post stages may try to create this file in <sysroot> at
exactly the same time and fail.
This fake install-info does nothing, so to avoid this race condition.
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>
|
|
|
|
|
|
|
|
| |
Using just 'ptxd_install_file' does not install all symlinks and
ptxd_install_shared does not handle errors correctly causes some symlinks
to be installed again.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
ptxd_install_toolchain_lib creates ptxd_install_link for all necessary
links, so using ptxd_install_shared just creates them a second time.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
| |
If a strip argument is given, don't overwrite it with the readelf result.
This avoids some unnecessary calls of readelf but may break packages with
incorrect strip arguments.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
| |
With this change strip=y will no longer be specified for non elf files.
This will be needed for later changes, when any explicitly specified strip
argument is enforced.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Without this, the strip argument is ignored. As a result, all kernel
modules are broken.
Also, always run readelf for now. Anything else breaks the current kernel
and glibc packages.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Redirect stderr to stdout for the actual autogen.sh, prepare, compile,
install and opkg-build command.
This preserves the chronological order of stdout vs. stderr when building
packages in parallel with output sync enabled.
As a side-effect, the stderr output of these commands won't show up on the
console for quiet builds. But most of that is not really useful by itself
anyways. And the resulting logfile is more readable now for the rest.
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>
|
|
|
|
|
|
| |
existing (packaged) *.pyc files
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
| |
executable
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 series file for 'git quiltimport' was only created if the original series
file is not empty. In this case, with newer git versions (at least 2.8.1)
'git quiltimport' returns an error if the series file is missing.
An empty series file is usefull to start creating new patches.
Create the series file for 'git quiltimport' to make sure this works with
new git versions.
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>
|