Author: ayoung
Date: Thu Mar 15 08:50:19 2012
New Revision: 9653
URL: http://svn.slimdevices.com/jive?rev=9653&view=rev
Log:
Get opkg and opkg-utils from new repos because svn.openmoko.org is dead.
I have tried to get the closed match in terms of versions. The only one was
r4545.
For opkg-utils it looks like an exact match but for opkg we now have something
a bit newer.
Added:
7.8/trunk/squeezeos/poky/meta/packages/opkg-utils/opkg-utils-native_git.bb
- copied, changed from r9652,
7.8/trunk/squeezeos/poky/meta/packages/opkg-utils/opkg-utils-native_svn.bb
7.8/trunk/squeezeos/poky/meta/packages/opkg-utils/opkg-utils_git.bb
- copied, changed from r9652,
7.8/trunk/squeezeos/poky/meta/packages/opkg-utils/opkg-utils_svn.bb
Removed:
7.8/trunk/squeezeos/poky/meta/packages/opkg-utils/opkg-utils-native_svn.bb
7.8/trunk/squeezeos/poky/meta/packages/opkg-utils/opkg-utils_svn.bb
7.8/trunk/squeezeos/poky/meta/packages/opkg/files/opkg-fix-gcc-warnings.patch
Modified:
7.8/trunk/squeezeos/poky/meta/conf/distro/include/poky-fixed-revisions.inc
7.8/trunk/squeezeos/poky/meta/packages/opkg/files/fix_prototype.patch
7.8/trunk/squeezeos/poky/meta/packages/opkg/opkg.inc
Modified:
7.8/trunk/squeezeos/poky/meta/conf/distro/include/poky-fixed-revisions.inc
URL:
http://svn.slimdevices.com/jive/7.8/trunk/squeezeos/poky/meta/conf/distro/include/poky-fixed-revisions.inc?rev=9653&r1=9652&r2=9653&view=diff
==============================================================================
--- 7.8/trunk/squeezeos/poky/meta/conf/distro/include/poky-fixed-revisions.inc
(original)
+++ 7.8/trunk/squeezeos/poky/meta/conf/distro/include/poky-fixed-revisions.inc
Thu Mar 15 08:50:19 2012
@@ -75,11 +75,11 @@
SRCREV_pn-matchbox-wm-2 ?= "2083"
SRCREV_pn-matchbox-wm ?= "1524"
SRCREV_pn-oh-puzzles ?= "23"
-SRCREV_pn-opkg-native ?= "4545"
-SRCREV_pn-opkg-sdk ?= "4545"
-SRCREV_pn-opkg ?= "4545"
-SRCREV_pn-opkg-utils-native ?= "4534"
-SRCREV_pn-opkg-utils ?= "4534"
+SRCREV_pn-opkg-native ?= "180"
+SRCREV_pn-opkg-sdk ?= "180"
+SRCREV_pn-opkg ?= "180"
+SRCREV_pn-opkg-utils-native ?= "234524f33dbaf750b921b4a8ecb0e64e1ef38d00"
+SRCREV_pn-opkg-utils ?= "234524f33dbaf750b921b4a8ecb0e64e1ef38d00"
SRCREV_pn-oprofileui ?= "194"
SRCREV_pn-libowl-av = "398"
SRCREV_pn-owl-video = "394"
Copied:
7.8/trunk/squeezeos/poky/meta/packages/opkg-utils/opkg-utils-native_git.bb
(from r9652,
7.8/trunk/squeezeos/poky/meta/packages/opkg-utils/opkg-utils-native_svn.bb)
URL:
http://svn.slimdevices.com/jive/7.8/trunk/squeezeos/poky/meta/packages/opkg-utils/opkg-utils-native_git.bb?p2=7.8/trunk/squeezeos/poky/meta/packages/opkg-utils/opkg-utils-native_git.bb&p1=7.8/trunk/squeezeos/poky/meta/packages/opkg-utils/opkg-utils-native_svn.bb&r1=9652&r2=9653&rev=9653&view=diff
==============================================================================
--- 7.8/trunk/squeezeos/poky/meta/packages/opkg-utils/opkg-utils-native_svn.bb
(original)
+++ 7.8/trunk/squeezeos/poky/meta/packages/opkg-utils/opkg-utils-native_git.bb
Thu Mar 15 08:50:19 2012
@@ -1,4 +1,4 @@
-require opkg-utils_svn.bb
+require opkg-utils_git.bb
RDEPENDS = ""
Copied: 7.8/trunk/squeezeos/poky/meta/packages/opkg-utils/opkg-utils_git.bb
(from r9652,
7.8/trunk/squeezeos/poky/meta/packages/opkg-utils/opkg-utils_svn.bb)
URL:
http://svn.slimdevices.com/jive/7.8/trunk/squeezeos/poky/meta/packages/opkg-utils/opkg-utils_git.bb?p2=7.8/trunk/squeezeos/poky/meta/packages/opkg-utils/opkg-utils_git.bb&p1=7.8/trunk/squeezeos/poky/meta/packages/opkg-utils/opkg-utils_svn.bb&r1=9652&r2=9653&rev=9653&view=diff
==============================================================================
--- 7.8/trunk/squeezeos/poky/meta/packages/opkg-utils/opkg-utils_svn.bb
(original)
+++ 7.8/trunk/squeezeos/poky/meta/packages/opkg-utils/opkg-utils_git.bb Thu Mar
15 08:50:19 2012
@@ -5,10 +5,10 @@
RDEPENDS = "python"
PR = "r2"
-SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http"
+SRC_URI = "git://git.yoctoproject.org/opkg-utils;protocol=git"
-S = "${WORKDIR}/opkg-utils"
+S = "${WORKDIR}/git"
inherit autotools_stage
-S = "${WORKDIR}/opkg-utils"
+S = "${WORKDIR}/git"
Modified: 7.8/trunk/squeezeos/poky/meta/packages/opkg/files/fix_prototype.patch
URL:
http://svn.slimdevices.com/jive/7.8/trunk/squeezeos/poky/meta/packages/opkg/files/fix_prototype.patch?rev=9653&r1=9652&r2=9653&view=diff
==============================================================================
--- 7.8/trunk/squeezeos/poky/meta/packages/opkg/files/fix_prototype.patch
(original)
+++ 7.8/trunk/squeezeos/poky/meta/packages/opkg/files/fix_prototype.patch Thu
Mar 15 08:50:19 2012
@@ -24,16 +24,4 @@
int get_available_blocks(char * filesystem);
char **read_raw_pkgs_from_file(const char *file_name);
-Index: opkg/libopkg/opkg_cmd.c
-===================================================================
---- opkg.orig/libopkg/opkg_cmd.c 2008-10-23 12:02:29.000000000 +0100
-+++ opkg/libopkg/opkg_cmd.c 2008-10-23 12:02:53.000000000 +0100
-@@ -151,7 +151,7 @@
- error_list = error_list->next;
-
- }
-- free_error_list(&error_list);
-+ free_error_list();
- }
-
- }
+
Modified: 7.8/trunk/squeezeos/poky/meta/packages/opkg/opkg.inc
URL:
http://svn.slimdevices.com/jive/7.8/trunk/squeezeos/poky/meta/packages/opkg/opkg.inc?rev=9653&r1=9652&r2=9653&view=diff
==============================================================================
--- 7.8/trunk/squeezeos/poky/meta/packages/opkg/opkg.inc (original)
+++ 7.8/trunk/squeezeos/poky/meta/packages/opkg/opkg.inc Thu Mar 15 08:50:19
2012
@@ -6,15 +6,9 @@
DEPENDS = "curl gpgme"
PV = "0.0+svnr${SRCREV}"
-# opkg-fix-gcc-warnings.patch: the patch is already upstreamed and could be
-# taken out once okpg is updated to new repo
-# http://opkg.googlecode.com/svn/trunk
-# with rev >= 150
+SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
+ file://fix_prototype.patch;patch=1"
-SRC_URI = "svn://svn.openmoko.org/trunk/src/target/;module=opkg;proto=http \
- file://fix_prototype.patch;patch=1 \
- file://opkg-fix-gcc-warnings.patch;patch=1"
-
-S = "${WORKDIR}/opkg"
+S = "${WORKDIR}/trunk"
inherit autotools_stage pkgconfig
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
