Commit Graph

39 Commits

Author SHA1 Message Date
Laurentiu Palcu cbc12aac86 package_deb, apt.conf: fix apt failure in do_rootfs()
The changes in this commit, dc5f6c3898,
moved apt config directory from native SYSROOT to WORKDIR.
Unfortunately, Dir::Etc in apt.conf was not changed accordingly and
sources.list file could not be found during do_rootfs().

This commit fixes this issue.

[YOCTO #5241]

(From OE-Core rev: 65a2a1e1d0b0e3dcc34d47f46185f24d753b53dd)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-09-24 17:24:14 +01:00
Saul Wold d5ca5d8c96 apt-native: fix SRC_URI Checksum for update
(From OE-Core rev: c07c477ff96358d3b40cc743ec4adf92193bb336)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-08-06 12:39:56 +01:00
Ionut Radu 8d68f1695c apt: Upgrade from 0.9.8.2 to 0.9.9.4
makerace.patch: adapted to the new version

(From OE-Core rev: ad69f62e42c131dcccd33b0e39c61a431f581bea)

Signed-off-by: Ionut Radu <ionutx.radu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-08-03 10:33:08 +01:00
Ionut Radu 6784e26d2e apt: Add Upstream Status to patches
no-nls-dpkg.patch: Added Upstream Status
use-host.patch: Added Upstream Status
fix-gcc-4.6-null-not-defined.patch: Added Upstream Status

(From OE-Core rev: 9d0da2e46c1b23163ad76b10d5fad889521a68b3)

Signed-off-by: Ionut Radu <ionutx.radu@intel.com>

[sgw - Squashed patches and fixed up commit subject]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-29 13:09:16 +01:00
Ionut Radu 70a26477ce apt: Updated from 0.9.8.1 to 0.9.8.2
(From OE-Core rev: 1500b4e7f6adec612efbdebad6a08a1efeeda7b6)

Signed-off-by: Ionut Radu <ionutx.radu@intel.com>

[sgw - fixed apt-native checksums]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-02 22:23:46 +01:00
Richard Purdie 66dfd49b86 apt-native: Fix incorrect checksums
The apt recipe had the correct checksums, the -native did not. Depending
on which downloaded first, the build could succeed or fail.

This patch corrects the checksums for -native to match the apt recipe.

(From OE-Core rev: 86d0708bb59952a139e705a8c396e70dd0084b75)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-06-03 16:43:37 +01:00
Ionut Radu b752e188ce apt: Updated from 0.9.7.8 to 0.9.8.1
(From OE-Core rev: 76b32bbe16c790ed81fffe37e67d80d1ec754e4e)

Signed-off-by: Ionut Radu <ionutx.radu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-29 22:07:52 +01:00
Eric Bénard f94519c617 apt: update to 0.9.7.8
(From OE-Core rev: 09b3a782bf1c0738ddd7f9622a7fa4a1d51225ca)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-29 14:45:07 +01:00
Richard Purdie 0b679927fe apt: Fix case where ${B} != ${S}
Need to reference objects from ${B}.

(From OE-Core rev: 0610cf3ef864acc9ca98498b9810bcce0fbb935a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:37 +00:00
Constantin Musca 8a32acf22e apt-native: fix checksums
(From OE-Core rev: c5632d833a1be4de1dcda18a67019e134844a8ee)

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-10 04:36:51 +00:00
Constantin Musca 9199c33913 apt: upgrade to 0.9.7.7
bb files: remove invalid config.sub/config.guess files (autotools will
generate the correct files)
allocate-larger-memory.patch: not needed anymore
fix-gcc-4.6-null-not-defined.patch: added
	- include header that defines NULL
includes-fix.patch: not needed anymore
localefixes.patch: removed
	- not necessary anymore (no compiling errors)
makerace.patch: adapted to the new version
no-ko-translation.patch: adapted to the new version
no-nls-dpkg.patch: added
	- fix build without nls
noconfigure.patch: adapted to the new version
nodoc.patch: adapted to the new version (apply patch on all cases
because the doc generation needs docbook-xsl)
remove-redeclaration.patch: not needed anymore
truncate-filename.patch: moved
use-host.patch: adapted to the new version
no-curl.patch: adapted to the new version
disable-configure-in-makefile.patch: added
    - do not run configure at do_compile

(From OE-Core rev: 97403b14765331c8c48bb570c6b98f2809214a9a)

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-05 13:14:54 +00:00
Stefan Eichenberger 40962b8a48 Write DPKG_ARCH to /etc/apt/apt.conf
Apt does not recognize the architecture if a different one is set with
DPKG_ARCH (e.g. armel). This patch writes the correct architecture to
/etc/apt/apt.conf.

(From OE-Core rev: 81b8c36641994dc7a4e025f2d43f9ce57d04b6f0)

Signed-off-by: Stefan Eichenberger <stefan.eichenberger@netmodule.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-12 13:22:42 +00:00
Hongxu Jia 78e5426a76 apt-native: fix the creation of apt.conf.sample
1.The file of "apt.conf.sample" is in the outdir, and outdir is assigned
by "os.path.join" with the params of ${D}, ${sysconfdir} and "apt". But
${sysconfdir} is an absolute dir and that let ${D} be discarded.

The following is the help on function os.path.join(a, *p):
     Join two or more pathname components, inserting '/' as needed.
     If any component is an absolute path, all previous path components
     will be discarded.
Use oe.path.join instead which don't have this problem.

2. Create apt.conf.sample if it doesn't exist.

[YOCTO #3677]

(From OE-Core rev: 95a655a853b7cd43163362d72da0c134d4c0ec85)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-10 23:49:39 +00:00
Robert Yang 0348e2c1c2 apt-native 0.7.14: remove an extra line from apt.conf
There is an additional "};" at the end of apt.conf, remove it.

[YOCTO #2495]

(From OE-Core rev: 2d6d2549676bb6a84a049f41d6ed31107efc28ad)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-17 18:04:22 +01:00
Richard Purdie 73cf0335c4 Remove a number of unneeded import os/bb calls
The bb and os modules are always imported so having these extra import calls
are a waste of space/execution time. They also set a bad example for people
copy and pasting code so clean them up.

(From OE-Core rev: 7d674820958be3a7051ea619effe1a6061d9cbe2)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-19 12:24:50 +01:00
Richard Purdie bfd279de32 Convert tab indentation in python functions into four-space
(From OE-Core rev: 604d46c686d06d62d5a07b9c7f4fa170f99307d8)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-19 10:24:50 +01:00
Robert Yang 12c8d9d451 apt 0.7.14: runtime error: Method file has died unexpectedly
When the length of the tmpdir is longer than 400, there is an error
when run "apt-get update":

Method file has died unexpectedly!

This is because the "char S[1024]" is not enough for long URI, S[2048]
would be enough.

[YOCTO #2689]

(From OE-Core rev: 3ed08bd24cef39a85c528159a494e8f0dd001739)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-09 16:58:57 +01:00
Robert Yang f06c1c3df0 apt 0.7.14: runtime error: filename too long (tmpdir length)
when the tmpdir dir is longer than 220, there is no files saved in
tmp/sysroots/x86_64-linux/var/lib/apt/lists/ after run apt-get update,
this is because apt-get uses the path as the file name, but the file
name can't be longer than 255 according to /usr/include/linux/limits.h.

[YOCTO #2688]

(From OE-Core rev: 9a0c0393871eda4bbcecfdd4b595f0c1b8e42edf)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-09 16:58:57 +01:00
Robert Yang 1e71397c23 apt 0.7.14: do_compile failed with gcc 4.7
apt do_compile failed with gcc 4.7:

deb/deblistparser.cc: In member function 'virtual short unsigned int debListParser::VersionHash()':
deb/deblistparser.cc:212:13: error: redeclaration of 'char* I'
deb/deblistparser.cc:202:22: error: 'const char** I' previously declared here

Backport the patch from the upstream would fix the problem, both target and
native apt need it.

[YOCTO #2488]

(From OE-Core rev: fae7fc49052720f037bac128084851c09d420381)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-06-08 11:43:22 +01:00
Robert Yang 9e7c915114 apt-get 0.7.14: hangs at runtime
This patch had a little problem, it made a infinite loop:

for (K = CmdL.FileList + 1; *K != 0; J++)

But the value of "K" will nerver change, so the apt-get hangs, revert
this patch first, and will fix the problem in another patch.

Note: Increment the PR from 11 to 12

Revert "apt: Fix a latent bug exposed by gcc 4.7"

This reverts commit 9d526462fe.

[YOCTO #2488]

(From OE-Core rev: 1e381c83396a65c6c93b8fc1f4e35564c52bd042)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-06-08 11:43:22 +01:00
Khem Raj 9d526462fe apt: Fix a latent bug exposed by gcc 4.7
Further Details are in patch itself

(From OE-Core rev: 0dc952e35da00a753317a4f878b23eab8bb7bc4a)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-02 04:54:17 +01:00
Richard Purdie 78f91f09e7 apt: Fix parallel make race
I was just going to turn off parallel make but ended up fixing this properly.

(From OE-Core rev: dcad44962fc78741020584edced0526866d09b53)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-19 20:28:46 +00:00
Richard Purdie b1aeaa8b0d meta: Replace bb.data.expand(xxx, d) -> d.expand(xxx)
sed \
 -e 's:bb.data.\(expand([^,()]*\), *\([^) ]*\) *):\2.\1):g' \
 -i `grep -ril bb.data.expand *`

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-05 10:23:53 -08:00
Richard Purdie 06f2f8ce0a meta: Convert getVar/getVarFlag(xxx, 1) -> (xxx, True)
Using "1" with getVar is bad coding style and "True" is preferred.
This patch is a sed over the meta directory of the form:

sed \
 -e 's:\(\.getVar([^,()]*, \)1 *):\1True):g' \
 -e 's:\(\.getVarFlag([^,()]*, [^,()]*, \)1 *):\1True):g' \
 -i `grep -ril getVar *`

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-05 10:22:56 -08:00
Joshua Lock a23e9ee6e8 apt: clarify LICENSE as GPLv2.0
(From OE-Core rev: 9b8c8ac43fbf9dc73f55306ec103208328a1766c)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-21 17:16:30 +00:00
Richard Purdie dc2d701207 apt: Fix locale header and hardcoded libname issues
apt wasn't building on modern libc/compiler combinations due to missing
header includes.

The libcpp version was also being hardcoded, this patch generates it
dynamically to work on different host systems which no longer have
this.

(From OE-Core rev: ca8237ee51053d70b5e7579c224a824db2be76b2)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-23 23:41:09 +00:00
Richard Purdie c8dee9b92d Convert to use direct access to the data store (instead of bb.data.*Var*())
This is the result of running the following over the metadata:

sed \
-e 's:bb.data.\(setVar([^,()]*,[^,()]*\), *\([^ )]*\) *):\2.\1):g' \
-e 's:bb.data.\(setVarFlag([^,()]*,[^,()]*,[^,()]*\), *\([^) ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^() ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,()]*\), *\([^) ]*\) *):\2.\1):g' \
-i `grep -ril bb.data *`

(From OE-Core rev: b22831fd63164c4db9c0b72934d7d734a6585251)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-10 11:51:19 +00:00
Dexuan Cui 23773a899b deb packages support: switch from /var/dpkg to /var/lib/dpkg
[YOCTO #1086]

The pach was backported from OE:
http://git.openembedded.net/cgit.cgi/openembedded/commit/?id=41e0fbf792037f249d1b8d283b3de81718887c9f

(From OE-Core rev: d1e6f49a6473df3c626100ba01b27485f735c33b)

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-21 13:42:49 +01:00
Richard Purdie dbb0d56fac apt: Package unpackaged files
(From OE-Core rev: 1e134055b8c00dd2f93a40a50cf69377c7b325c0)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-07 10:57:49 +01:00
Qing He f93d6872f2 update patch upstream status
for the following recipes:
  pcmciautils openssl udev apt gdm

(From OE-Core rev: 552c9fa44c2a2bb94bcf83bff802773265a35a27)

Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-17 15:14:47 +01:00
Lianhao Lu a7937d740e apt-native: Added licence checksum.
Added licence checksum for apt-native.

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
2011-01-28 17:01:22 +00:00
Nitin A Kamble ff02b36428 apt: revert the dso_linking_change patch as the new linker fixes it
The newer binutils recipe of version 2.21 has a fix for ld which avoids an
issue where weak symbols like pthread_cancel were causing linking to fail wh
--no-add-as-needed parameter was passed to ld.

See more information here: http://bugs.debian.org/591405

This makes some of the fixes for breakage after gcc dso linking change
unnecessary and this is one of them.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
2011-01-24 14:09:12 -08:00
Nitin A Kamble 546ef7bb6d apt: fix build issue with gcc dso linking change
All the libraries needs to be specified explicitely with the new gcc dso
linking change patch. This was causing build errors for this
recipe. Specifying the libpthread library explicitely for linking to work
without errors.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
2011-01-20 21:37:05 +00:00
Koen Kooi 0e8f0f0a03 RDEPENDS, RRECOMMENDS -> RDPEPENDS_${PN}, RRECOMMENDS_${PN}
For these recipes the dependencies listed in RDEPENDS and RRECOMMENDS only apply to ${PN}

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-12-30 10:03:10 +00:00
Saul Wold 66fd56ddf9 apt: update use-host patch to support x86_64
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2010-12-23 14:20:50 +00: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 75921860df apt:Add license checksum to bb file
Add COPYING.GPL file checksum to bb file

Signed-off-by: Mei Lei <lei.mei@intel.com>
2010-11-23 16:47:02 -08:00
Saul Wold e72e7b2fdc rootfs_deb: Fix problem with pseduo and rootfs location
This address [BUGID #401] to complete dpkg rootfs support

Signed-off-by: Saul Wold <Saul.Wold@intel.com>
2010-10-08 13:51:44 -07: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