| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
no patches
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>
|
|
|
|
|
|
|
|
|
|
|
| |
Since commit
b6f9a55b3ddc ptxd_make_world_patchin: run use pkg_dir for patchin_fixup
ptxdist will fail on packages that define a <PACKAGE>_DIR but don't create that
during extract stage. This patch fixes the problem.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
|
|
|
| |
...otherweise bash would interprete the number as octal. This fails if the
patch number contains a figure >= 8.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
| |
This way, it is also called when the tarball is replaced with a symlink in
local_src/. Also allow symlinks for ltmain.sh and config.sub. They will be
replaced with modified copies of the original link target.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
This is needed for newer architectures like aarch64 because older versions
of config.sub don't support those yet.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
| |
Since kernel.org provides their patches as .xz-compressed files, that's
quite useful.
Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When working with pure git work flow the git parameter diff.renames may save
space when sending patches or storing them.
However using a patch generated with this parameter in a mixed git/quilt/patch
work flow is useless cause quilt/patch can not work with this information,
they need explicit delete of lines and add of lines.
This patch change the local git configuration of an extracted package to force
the diff.renames parameter to false witch will overwrite a possible global
configuration.
Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
Replace ~ with - when creating a git tag
Signed-off-by: Jon Ringle <jon@ringle.org>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The patch series I have for the Linux kernel includes incremental patches
from upstream like
patch-2.6.33.1.bz2
patch-2.6.33.1-2.bz2
followed by a patch series for my board.
But ptxdist messes this up when applying the patch series with git.
This patch allows one to mark the base tag in the series with:
#tag:base --start-number 1
Other arbitrary tags can also be put in the series:
#tag:for-upstream --start-number 5
When using 'git ptx-patches' to regenerate the series, only the patches
between "#tag:base" and the next "#tag:*" or EOF in the series are
regenerated. All others in the series are left untouched. To use a
different tag than the default tag base, use -t tagname.
e.g.:
# generated by git-ptx-patches
patch-2.6.33.1.bz2
patch-2.6.33.1-2.bz2
patch-2.6.33.2-3.bz2
#tag:for-upstream --start-number 1
0001-for-upstream-1.patch
0002-for-upstream-2.patch
0003-for-upstream-3.patch
#tag:base --start-number 4
0004-foo.patch
0005-bar.batch
# 25a3096f40bc8d841c8bf3ec24dd101f - git-ptx-patches magic
Any options included on a #tag:* line are passed to git format-patch when
generating the patches for that section.
Signed-off-by: Jon Ringle <jon@ringle.org>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
| |
<PKG>_SOURCE are undefined.
This makes it possible to use the default extract stage for packages
that have nothing to extract.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
| |
Don't use "sh" because the script uses bashisms, this breaks on ubuntu
where /bin/sh is dash.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
scripts/lib/ptxd_make_install.sh
This is due to "360f73777af1661d85ae0aa2434b6acde22da9fa" Fix
dependencies to files in projectroot.
The modifications to ptxd_make_install_init have been moved to
ptxd_make_xpkg_prepare.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
| |
| |
| |
| |
| |
| | |
...because this function works for directories and/or files.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|/
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
| |
* it's unnecessary because that's the current directory
* older git versions can't handle it
Based on a patch from Remy Bohmer <linux@bohmer.net>
Also: fix the error propagation.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
|
|
|
|
|
| |
...because it might take some time.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
|
|
| |
...to avoid using "para" from last cycle.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
For various reasons (git quiltimport cannot handle compressed patches
and uses a hardcoded "series" file) ptxdist creates a special "patches"
folder that git quiltimport" works with.
This patch changes the name of the folder from ".ptxdist/patches" to
".ptxdist/git-patches" so that the original patch folder can always be
found in ".ptxdist/patches" and "patches" (which links to it) regardless
of using git or not.
This fixes a problem with the package "directfb-examples".
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
|
|
| |
decompress bzip2 and gz patches on the fly.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
|
|
| |
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|