diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:14:24 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:29:45 +0100 |
commit | 29d6678fd546377459ef75cf54abeef5b969b5cf (patch) | |
tree | 8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/recipes-devtools/opkg-utils | |
parent | da49de6885ee1bc424e70bc02f21f6ab920efb55 (diff) | |
download | poky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz |
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>
Diffstat (limited to 'meta/recipes-devtools/opkg-utils')
-rw-r--r-- | meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch | 54 | ||||
-rw-r--r-- | meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb | 24 |
2 files changed, 78 insertions, 0 deletions
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch new file mode 100644 index 0000000000..e4a548156f --- /dev/null +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch | |||
@@ -0,0 +1,54 @@ | |||
1 | If we're building an image and some package rebuilds while this is happening | ||
2 | some package can be removed/added to the ipk deploy directory. The image will | ||
3 | not depend on this package so we can safely ignore these cases rather than | ||
4 | error out. | ||
5 | |||
6 | RP - 26/8/09 | ||
7 | |||
8 | Index: opkg-utils/opkg-make-index | ||
9 | =================================================================== | ||
10 | --- opkg-utils.orig/opkg-make-index 2009-08-26 17:21:26.000000000 +0100 | ||
11 | +++ opkg-utils/opkg-make-index 2009-08-27 16:11:22.000000000 +0100 | ||
12 | @@ -96,6 +96,7 @@ | ||
13 | files=glob(pkg_dir + '/*.ipk') + glob(pkg_dir + '/*.deb') | ||
14 | files.sort() | ||
15 | for filename in files: | ||
16 | + try: | ||
17 | basename = os.path.basename(filename) | ||
18 | pkg = None | ||
19 | fnameStat = os.stat(filename) | ||
20 | @@ -130,6 +131,12 @@ | ||
21 | to_morgue(basename) | ||
22 | if opt_s: | ||
23 | print filename | ||
24 | + except OSError: | ||
25 | + sys.stderr.write("Package %s disappeared on us!\n" % (filename)) | ||
26 | + continue | ||
27 | + except IOError: | ||
28 | + sys.stderr.write("Package %s disappeared on us!\n" % (filename)) | ||
29 | + continue | ||
30 | |||
31 | pkgsStampsFile = open(stamplist_filename, "w") | ||
32 | for f in pkgsStamps.keys(): | ||
33 | @@ -148,6 +155,7 @@ | ||
34 | names = packages.packages.keys() | ||
35 | names.sort() | ||
36 | for name in names: | ||
37 | + try: | ||
38 | pkg = packages.packages[name] | ||
39 | if locales_dir and pkg.depends: | ||
40 | depends = string.split(pkg.depends, ',') | ||
41 | @@ -165,6 +173,13 @@ | ||
42 | if (verbose): | ||
43 | sys.stderr.write("Writing info for package %s\n" % (pkg.package,)) | ||
44 | print pkg | ||
45 | + except OSError: | ||
46 | + sys.stderr.write("Package %s disappeared on us!\n" % (name)) | ||
47 | + continue | ||
48 | + except IOError: | ||
49 | + sys.stderr.write("Package %s disappeared on us!\n" % (name)) | ||
50 | + continue | ||
51 | + | ||
52 | if packages_filename: | ||
53 | sys.stdout.close() | ||
54 | sys.stdout = old_stdout | ||
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb new file mode 100644 index 0000000000..f3b6f1f4cb --- /dev/null +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb | |||
@@ -0,0 +1,24 @@ | |||
1 | DESCRIPTION = "OPKG Package Manager Utilities" | ||
2 | SECTION = "base" | ||
3 | HOMEPAGE = "http://wiki.openmoko.org/wiki/Opkg" | ||
4 | PRIORITY = "optional" | ||
5 | LICENSE = "GPLv2+" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
7 | file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083" | ||
8 | RDEPENDS = "python" | ||
9 | RDEPENDS_virtclass-native = "" | ||
10 | PR = "r1" | ||
11 | |||
12 | SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \ | ||
13 | file://index-ignore-filenotfound.patch" | ||
14 | |||
15 | S = "${WORKDIR}/opkg-utils" | ||
16 | |||
17 | # Avoid circular dependencies from package_ipk.bbclass | ||
18 | PACKAGES_virtclass-native = "" | ||
19 | |||
20 | do_install() { | ||
21 | oe_runmake PREFIX=${prefix} DESTDIR=${D} install | ||
22 | } | ||
23 | |||
24 | BBCLASSEXTEND = "native" | ||