diff options
| -rw-r--r-- | classes/image_ipk.bbclass | 2 | ||||
| -rw-r--r-- | conf/machine/htcuniversal.conf | 1 | ||||
| -rw-r--r-- | packages/gpe-calendar/gpe-calendar_svn.bb (renamed from packages/gpe-calendar/gpe-calendar_cvs.bb) | 8 | ||||
| -rw-r--r-- | packages/gpe-conf/gpe-conf_svn.bb (renamed from packages/gpe-conf/gpe-conf_cvs.bb) | 7 | ||||
| -rw-r--r-- | packages/libgpevtype/libgpevtype_svn.bb (renamed from packages/libgpevtype/libgpevtype_cvs.bb) | 4 | ||||
| -rw-r--r-- | packages/libgpewidget/libgpewidget_svn.bb (renamed from packages/libgpewidget/libgpewidget_cvs.bb) | 4 |
6 files changed, 14 insertions, 12 deletions
diff --git a/classes/image_ipk.bbclass b/classes/image_ipk.bbclass index 83e9acf315..2beb137aef 100644 --- a/classes/image_ipk.bbclass +++ b/classes/image_ipk.bbclass @@ -2,7 +2,7 @@ inherit rootfs_ipk # We need to recursively follow RDEPENDS and RRECOMMENDS for images BUILD_ALL_DEPS = "1" -do_rootfs[recrdeptask] = "do_package" +do_rootfs[recrdeptask] = "do_package_write" # Images are generally built explicitly, do not need to be part of world. EXCLUDE_FROM_WORLD = "1" diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index 9add014c93..91da071c03 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -21,7 +21,6 @@ MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscree # Software/packages selection # PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" -PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" XSERVER = "xserver-kdrive-fbdev" diff --git a/packages/gpe-calendar/gpe-calendar_cvs.bb b/packages/gpe-calendar/gpe-calendar_svn.bb index f93f9d1fae..d6a232b225 100644 --- a/packages/gpe-calendar/gpe-calendar_cvs.bb +++ b/packages/gpe-calendar/gpe-calendar_svn.bb @@ -7,13 +7,15 @@ LICENSE = "GPL" DEPENDS = "libhandoff libsoup libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype" RDEPENDS = "gpe-icons" -PV = "0.73+cvs${SRCDATE}" +inherit autotools gpe + + +PV = "0.72+svn${SRCDATE}" PR = "r0" -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" +SRC_URI = "${GPE_SVN}" S = "${WORKDIR}/${PN}" -inherit autotools gpe PARALLEL_MAKE = "" diff --git a/packages/gpe-conf/gpe-conf_cvs.bb b/packages/gpe-conf/gpe-conf_svn.bb index 9825702ecb..e4675ecfae 100644 --- a/packages/gpe-conf/gpe-conf_cvs.bb +++ b/packages/gpe-conf/gpe-conf_svn.bb @@ -9,13 +9,14 @@ DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons" RDEPENDS_gpe-conf-panel = "gpe-conf" -PV = "0.2.2+cvs${SRCDATE}" +inherit autotools gpe + +PV = "0.2.2+svn${SRCDATE}" PR = "r0" -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" +SRC_URI = "${GPE_SVN}" S = "${WORKDIR}/${PN}" -inherit autotools gpe PACKAGES = "gpe-conf gpe-conf-panel" diff --git a/packages/libgpevtype/libgpevtype_cvs.bb b/packages/libgpevtype/libgpevtype_svn.bb index 6316ba67f6..235a1312db 100644 --- a/packages/libgpevtype/libgpevtype_cvs.bb +++ b/packages/libgpevtype/libgpevtype_svn.bb @@ -7,12 +7,12 @@ DEPENDS = "libmimedir" DEFAULT_PREFERENCE = "-1" S = "${WORKDIR}/${PN}" -PV = "0.17+cvs${SRCDATE}" +PV = "0.17+svn${SRCDATE}" PR = "r0" inherit pkgconfig gpe autotools -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" +SRC_URI = "${GPE_SVN}" headers = "tag-db.h vcard.h vevent.h vtodo.h" diff --git a/packages/libgpewidget/libgpewidget_cvs.bb b/packages/libgpewidget/libgpewidget_svn.bb index 1eeea30e59..1da0a946be 100644 --- a/packages/libgpewidget/libgpewidget_cvs.bb +++ b/packages/libgpewidget/libgpewidget_svn.bb @@ -8,12 +8,12 @@ LICENSE = "LGPL" DEFAULT_PREFERENCE = "-1" S = "${WORKDIR}/${PN}" -PV = "0.109+cvs${SRCDATE}" +PV = "0.114+svn${SRCDATE}" PR = "r0" inherit gpe autotools pkgconfig -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" +SRC_URI = "${GPE_SVN}" EXTRA_OECONF = "--enable-cairo" |