Commit Graph

40 Commits

Author SHA1 Message Date
Jussi Kukkonen e908ffe3cd quilt: Fix paths for patch and perl
Currently some shebang lines end up as
    #! /usr/bin/env perl -w
env does not like the argument. Also the current sed to insert env
does not cover the copies ptests use. Fix these issues by:
 - using --with-perl to insert "env"
 - Replacing "-w" in shebang lines with a new "use warning;" line

Remove a EXTRA_OECONF_append_class_target from the native recipe.
Don't overwrite EXTRA_OECONF in native: the values should be correct
for native as well.

--with-patch is used within the gnu patch wrapper only: before this
commit the wrapper contained a (build host) path to native patch.

Also tweak one test so busybox mv output is accepted.

All ptests should now pass: Fixes [YOCTO #11221].

(From OE-Core rev: 4b667d268fe410a21cacaecd1b5e3bfbbe7d53d8)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-04-05 23:22:13 +01:00
Richard Purdie c35a258827 quilt: Avoid hardcoding paths into output
Avoids:
 quilt-0.65-r0 do_package_qa: QA Issue: /usr/lib/quilt/ptest/quilt/scripts/edmail contained in package
 quilt-ptest requires /media/build1/poky/build/tmp/hosttools/perl, but no providers found in
 RDEPENDS_quilt-ptest? [file-rdeps]

(From OE-Core rev: e0188f6ccebaaf7c9948c771d3da5b07eed09a94)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-03-10 14:50:11 +00:00
Richard Purdie a39b7e2c50 quilt: Don't add hardcoded links to utilities
This triggers warnings about absolute symlink paths with the PATH changes.
In reality we simply don't need/care about these so just remove/disable
them.

(From OE-Core rev: b319e43b9fee62f30c11d266a23cea4ff30addcd)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-03-10 14:50:11 +00:00
Robert Yang aa31fe37e2 quilt: 0.64 -> 0.65
* Removed install.patch since it is already in the patch.
* Fix indent for file://test.sh

(From OE-Core rev: bd8b1d79b50819486e5882db05abb6b358b7392a)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-01-05 13:54:05 +00:00
Mariano Lopez 262c81e3ca quilt/acl/attc/sed: Fix use of tar's --exclude option for tar >= 1.29
Starting from tar 1.29 the --exclude option won't work
anymore if is not used before the path. There are some
recipes that copy the ptest using tar and --exclude
option. This fixes these for OE-Core recipes.

[YOCTO #9763]

(From OE-Core rev: 2ba55933c81f78f4e4c36e21c59e935f74ce0f52)

Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-08-10 10:46:31 +01:00
Dengke Du ddedab4d1d quilt: run ptest as normal user
When the user is root, run quilt ptest, the faildiff.test failed.
Because in the faildiff.test, we drop the read permission of the
file test.txt, we can't "quilt refresh" as normal user, so we got
the following:
	>~ .*diff:test\.txt: Permission denied
	> Diff failed on file 'test.txt', aborting
But when the user is root, we can access the file, so we got the
following:
	> Nothing in patch patchs/test.diff
So the faildiff.test was failed. We should create a normal user
to run the ptest in the run-ptest scripts to slove the problem.

(From OE-Core rev: f7d52d12f943b9e1f79b32758308607036d6a760)

Signed-off-by: Dengke Du <dengke.du@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-03-28 15:55:48 +01:00
Maxin B. John a25e8bd47a quilt: fix the deps for ptest
quilt ptest requires getopt and perl-module-overloading.

[YOCTO #8062]

(From OE-Core rev: 9dce5c79354359c0c7c513b6650891a6efce0e66)

Signed-off-by: Maxin B. John <maxin.john@enea.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-08-16 22:40:55 +01:00
Robert Yang aba8f4a5a5 quilt: 0.63 -> 0.64
quilt-0.63.inc -> quilt.inc: we don't have multiple quilt-xxx.inc, so
use quilt.inc rather than quilt-0.63.inc.

(From OE-Core rev: 941be822ee7772b70fe78e6b61278bb8567bc905)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-02-21 22:05:34 +00:00
Robert Yang 41e6eae923 quilt: set CLEANBROKEN
Fix when rebuild:
| DEBUG: Executing shell function autotools_preconfigure
| Please run ./configure
| make: *** [Makefile] Error 1

(From OE-Core rev: 3918dd643e45ca7009559b5e04f925b924707a36)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-01-16 23:08:24 +00:00
Robert Yang 36f6caae93 run-ptest: fix bashism
These script use /bin/sh as the interpreter, but contains bashism:
    recipes-devtools/insserv/files/run-ptest
    recipes-devtools/quilt/quilt/run-ptest
    recipes-devtools/tcltk/tcl/run-ptest
    recipes-extended/gawk/gawk-4.1.1/run-ptest
    recipes-support/beecrypt/beecrypt/run-ptest

Fixed:
    "==" -> "=" (should be -eq when integer)
    "&>log" -> ">log 2>&1"

And quilt's test scripts requires bash, add bash to RDEPENDS_quilt-ptest

(From OE-Core rev: 70c6e0b84d3e17807cbea0677df2f0772a284130)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-08-28 15:12:44 +01:00
Chong Lu 250b58aa91 quilt: Update to 0.63 version
Upgrade quilt to 0.63 version and add perl-module-text-parsewords to
RDEPENDS of ptest.

(From OE-Core rev: 48c09163db18634e3071009b94645812ade285f4)

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-05-21 09:09:01 +01:00
Changhyeok Bae bcb30d84f9 mirrors.bbclass: Add mirror site for savannah
* The SRC_URI is not accessible.
  So need to add mirror site referred by the original site.
* The problem is that
  http://download.savannah.gnu.org/releases redirects to closest mirror
  and few mirrors (e.g. .jp) weren't working correctly while
  http://download-mirror.savannah.gnu.org/releases/ seems to be reliable.
* Add SAVANNAH_GNU_MIRROR and SAVANNAH_NONGNU_MIRROR variable in bitbake.conf.
* Change the SRC_URI using the new variable.

(From OE-Core rev: af00b6544f60e4d7581f9d9767f9d3f574392359)

Signed-off-by: Changhyeok Bae <changhyeok.bae@lge.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-05-11 12:27:21 +01:00
Richard Purdie 069de520ec autotools-brokensep: Mark recipes with broken separate build dir support
This patch goes through the OE-Core recipes and marks those which use autotools
but don't support a separate build directory (${S} != ${B}). A new class,
autotools-brokensep is used for this purpose.

This doesn't introduce any change in behaviour in its own right.

(From OE-Core rev: 006b8a7808a58713af16c326dc37d07765334b12)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-28 14:01:16 +00:00
Ming Liu e54c1ad651 quilt: add ac_cv_path_BASH to CACHED_CONFIGUREVARS also for native
A issue was fixed in target recipe with commit: 95893404

[
    quilt: added ac_cv_path_BASH to CACHED_CONFIGUREVARS

    On Fedora 17, bash has moved to /usr/bin/bash and the configure process finds it
    on the host machine there, this ensures that it is set correctly for the target.

    [YOCTO #2363]

    Signed-off-by: Saul Wold <sgw@linux.intel.com>
]

But it's also impacting native package in the case that the sstate is used
between Fedora 17(or later) and other hosts.

(From OE-Core rev: 34bd53c657f82a402723fcf2640b0511a68b6af5)

Signed-off-by: Ming Liu <ming.liu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-02 11:22:09 +00:00
Chong Lu 03435469e2 quilt: enable ptest support
Install quilt test suite and run it as ptest.
Exclude delete.test and mail.test.
delete.test need execute with normal user and mail.test need depend
on mail agent, else these test cases will fail. So exclude them order
to make ptest all pass.

(From OE-Core rev: 45bb0364e5f97e7d99b494df8d13e7f58265159f)

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-06 11:14:02 +00:00
Chong Lu 7579e19c2b quilt: upgrade to 0.61
(From OE-Core rev: 691a2746e95caa583f89d8fd6eed246fc3e54979)

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-02 12:52:34 +00:00
Paul Eggleton cec8b230cf Replace one-line DESCRIPTION with SUMMARY
A lot of our recipes had short one-line DESCRIPTION values and no
SUMMARY value set. In this case it's much better to just set SUMMARY
since DESCRIPTION is defaulted from SUMMARY anyway and then the SUMMARY
is at least useful. I also took the opportunity to fix up a lot of the
new SUMMARY values, making them concisely explain the function of the
recipe / package where possible.

(From OE-Core rev: b8feee3cf21f70ba4ec3b822d2f596d4fc02a292)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-02 12:50:18 +00:00
Richard Purdie 5e42796675 recipes: Remove PR = r0 from all recipes
Remove all PR = "r0" from all .bb files in oe-core. This was done
with the command sed -e '/^PR.*=.*r0\"/d' recipes*/*/*.bb -i

We've switching to the PR server, PR bumps are no longer needed and
this saves people either accidentally bumping them or forgetting to
remove the lines (r0 is the default anyway).

(From OE-Core rev: 58ae94f1b06d0e6234413dbf9869bde85f154c85)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-10-30 14:52:04 +00:00
Martin Ertsaas 583d2b8f92 quilt: Don't use BUILD_ROOT on darwin.
(From OE-Core rev: 130f1fa3d2787c3c542522ecf9ba5debf914f41a)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-15 08:10:15 +00:00
Martin Ertsaas 3f5a047afe quilt: Remove non-gnu.patch, and added configure flags for darwin.
(From OE-Core rev: f495dfb60cb1fd86b7365210dd7aab75cec2d5e4)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-15 08:10:15 +00:00
Richard Purdie ac7a031182 bitbake.conf: Define USRBINPATH globally instead of individually
Many recipes are now having to define PERLPATH and PYTHONPATH variables.
Creating USRBINPATH in bitbake.conf means we can remove all these lines
from the many recipes now needing this and simplify the code changes
needed in each case, reducing the chance of errors being introduced.

Also fixup glib python binary location issue and fix function indentation.

(From OE-Core rev: cf63d9068c3a8c635dfc240d30dfff278be9b0e2)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-18 22:18:52 +01:00
Saul Wold ec07dfcbf4 quilt: added ac_cv_path_BASH to CACHED_CONFIGUREVARS
On Fedora 17, bash has moved to /usr/bin/bash and the configure process finds it
on the host machine there, this ensures that it is set correctly for the target.

[YOCTO #2363]

(From OE-Core rev: 958934049e4b3b84e5eaa9c6b0d672cf2c4a693e)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-06-15 15:12:44 +01:00
Nitin A Kamble d911601b4d quilt: upgrade from 0.51 to 0.60
(From OE-Core rev: 0e6843e7a3ed3b12e5f2bc6273047c2be5e47489)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-03 15:48:04 +01:00
Nitin A Kamble e3a6524579 quilt: fix perl path in target perl scripts
While building on distros like fedora17, which has /bin/perl,
the target perl scripts get perl path also as /bin/perl.
And that is not correction path of perl on the target.

This commit avoids this error.

| error: Failed dependencies:
|       /bin/perl is needed by quilt-0.51-r2.i586
NOTE: package core-image-sato-sdk-1.0-r0: task do_rootfs: Failed
ERROR: Task 8
(/home/nitin/prj/poky.git/meta/recipes-sato/images/core-image-sato-sdk.bb,
do_rootfs) failed with exit code '1'

(From OE-Core rev: f091895d7dacd601f52edb0f0a08bdfa7e6d2461)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-26 10:05:20 +01:00
Saul Wold b4d6cedcc3 quilt: move empty quiltrc to native sysconfdir
patch.bbclass orignally pointed at /usr/bin/quiltrc for an empty
version to ensure that no user setting were picked up, change this
to /etc/quiltrc in the Native sysroot since we now have a native
sysconfdir.

Make sure that the quiltrc is actually installed in the Native
sysconfdir, not the target, so fix this after the recipe split.

(From OE-Core rev: 1af73900cea82e63fb0f94e6f057144f723146ec)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-26 10:05:11 +01:00
Saul Wold 8776baa318 quilt: Fix docs packaging warnings
WARNING: For recipe quilt, the following files/directories were installed but not shipped in any package:
WARNING:   /usr/share/doc
WARNING:   /usr/share/doc/quilt
WARNING:   /usr/share/doc/quilt/README
WARNING:   /usr/share/doc/quilt/quilt.pdf
WARNING:   /usr/share/doc/quilt/README.MAIL
(From OE-Core rev: b9834c7725420ea22df604edb994f6735927b2e7)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-14 13:03:10 +00:00
Andreas Oberritter 10d6c4e056 bzip2: split into binary and library packages
* Create libbz2 (and -dev, -staticdev), which can be
  installed without the bzip2 executables.

(From OE-Core rev: e27af1f273e9a7348dd8f5542df9206acd9210f3)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-08 12:12:06 -08:00
Nitin A Kamble f0262b7ab2 quilt: upgrade from 0.50 to 0.51
(From OE-Core rev: 956bb43cabac5c2245c4588464e8ee3e69e6d433)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-03 15:56:37 +00:00
Nitin A Kamble 99e4a9ad79 quilt upgreade from 0.48 to 0.50
gnu_patch_test_fix.patch : this patch removed as it is already
upstream now.

Renamed quilt.inc to quilt-0.50.inc and moved the dupicate information
from native & target recipe files into the quilt-0.50.inc file.

Clean up the unpackaged files warning

These warnings are avoided:
WARNING: For recipe quilt, the following files/directories were
installed but not shipped in any package:
WARNING:   /usr/bin/quiltrc
WARNING:   /usr/share/emacs
WARNING:   /usr/share/emacs/site-lisp
WARNING:   /usr/share/emacs/site-lisp/quilt.el

The /usr/bin/quiltrc is purposely not packaged, as it is needed
for native recipe only.

(From OE-Core rev: ffb10e51dae3e360822f26d1425c3327213a7e81)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-03 12:14:40 +00:00
Saul Wold c594b49418 quilt: Add RDEPENDS on bash
[YOCTO #1214]

(From OE-Core rev: 73787e1a1feb8b8e8e3401ff772452ac6f9bbf4b)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-08 16:39:07 +01:00
Nitin A Kamble 42d2170f86 recipes: Update upstream-status of patches
python: update upstream-status for patches
binutils: update upstream-status for patches
gcc 4.5.1 4.6.0: update upstream-status for patches
autoconf: update upstream-status for patches
automake: update upstream-status for patches
bison: update upstream-status for patches
distcc: update upstream-status of patches
fstests: update upstream-status for patches
gdb: update upstream-status of patches
intltool: update upstream-status of patches
libtool: update upstream status of patches
linux-libc-headers: update upstream-status for patches
make: update upstream-status for patches
perl: update upstream-status for patches
python-pycurl: update upstream-status for patches
python-pygobject: update upstream status for patches
python-pyrex: update upstream-status for patches
quilt: update upstream-status of patches
tcl: update upstream-status for patches
gnu-config: update upstream-status for patches
gmp: update upstream-status for patches

(From OE-Core rev: a62fa9b213b09bf48c48499d2e3c66a9ee306deb)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-13 11:02:19 +01:00
Qing He 07a6bec75c quilt: fix test for target build
fixes [YOCTO #969]

(From OE-Core rev: fd2485ab15ed82cb3dc84b8408e516a932de1bd1)

Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-28 10:44:20 +01:00
Saul Wold fab742bd46 quilt: add autotools inheritance
(From OE-Core rev: c0ce17aed98c6475b6c1dc18c6655f3a52eda0fa)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-08 17:14:04 -08:00
Richard Purdie ec740ac770 Revert "quilt: fix patch version detection"
This reverts commit bc31351f69.

This change is already applied against configure, not configure.ac. This change forces a
reautoconf of quilt-native before we've built autoconf and if "git-desc" isn't present it
can result in further problems. The simplest solution is to revert this change.
2011-02-01 17:34:59 +00:00
Qing He bc31351f69 quilt: fix patch version detection
Fixes [BUGID #690]

Signed-off-by: Qing He <qing.he@intel.com>
2011-02-01 14:55:18 +00:00
Darren Hart 03ae4a68cb Correct LIC_FILES_CHKSUM typos
An investigation into undocumented variables uncovered a handful
of LIC_FILES_CHKSUM spelling errors

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
2010-12-10 22:01:44 -08:00
Saul Wold 3d08b9f2c6 SRC_URI Checksums Additionals
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2010-12-09 08:18:17 -08:00
Mei Lei c4c11d9d80 quilt:Add license checksum and update the GPL information
Add COPYING file checksum to bb file and add "GPLv2" information according to the COPYING file

Signed-off-by: Mei Lei <lei.mei@intel.com>
2010-12-02 05:24:49 -08:00
Beth Flanagan 32f241a51c quilt: Fixed configure test for patch --version.
OpenSuSE 11.3 uses GNU patch 2.6.1.81-5b68 which breaks quilt's
configure test for patch version.

Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com>
2010-11-10 21:22:26 +08:00
Richard Purdie 29d6678fd5 Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.

The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.

Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-08-27 15:29:45 +01:00