diff options
| -rw-r--r-- | packages/e17/entice_20060416.bb | 2 | ||||
| -rw-r--r-- | packages/meta/meta-maemo.bb | 10 | ||||
| -rw-r--r-- | packages/tasks/task-pivotboot.bb | 2 | ||||
| -rw-r--r-- | packages/tasks/task-sdk.bb | 30 | ||||
| -rw-r--r-- | packages/xorg-proto/xproto-native_6.6.2.bb | 4 | ||||
| -rw-r--r-- | packages/xorg-proto/xproto-native_cvs.bb | 4 | ||||
| -rw-r--r-- | packages/xorg-proto/xproto_6.6.2+cvs20050226.bb | 12 | ||||
| -rw-r--r-- | packages/xorg-proto/xproto_6.6.2.bb | 12 | ||||
| -rw-r--r-- | packages/xorg-proto/xproto_cvs.bb | 14 |
9 files changed, 23 insertions, 67 deletions
diff --git a/packages/e17/entice_20060416.bb b/packages/e17/entice_20060416.bb index 0e1d571205..25b50467a4 100644 --- a/packages/e17/entice_20060416.bb +++ b/packages/e17/entice_20060416.bb @@ -6,7 +6,7 @@ PR = "r0" inherit e -RDEPENDS += "libesmart-container-plugins libesmart-thumb0 libesmart-trans-x11-0 libesmart-file-dialog0" +RDEPENDS += "libesmart-container-plugins libesmart-thumb libesmart-trans-x11-0 libesmart-file-dialog" SRC_URI = "${E_CVS};module=e17/apps/entice;date=${PV}" S = "${WORKDIR}/entice" diff --git a/packages/meta/meta-maemo.bb b/packages/meta/meta-maemo.bb index e25e9b8261..2619fcdae4 100644 --- a/packages/meta/meta-maemo.bb +++ b/packages/meta/meta-maemo.bb @@ -14,11 +14,11 @@ RDEPENDS_maemo-base-depends := "${maemo-base-depends}" DEPENDS += " ${maemo-base-depends}" maemo-task-libs-install = "\ - libsqlite0 \ - libhildonlgpl0 \ - libhildonbase0 \ - libhildonwidgets0 \ - libhildonfm1" + libsqlite \ + hildon-lgpl \ + libhildonbase \ + libhildonwidgets \ + hildon-fm" RDEPENDS_maemo-task-libs-install := "${maemo-task-libs-install}" diff --git a/packages/tasks/task-pivotboot.bb b/packages/tasks/task-pivotboot.bb index a1885170e2..c410b577b8 100644 --- a/packages/tasks/task-pivotboot.bb +++ b/packages/tasks/task-pivotboot.bb @@ -13,6 +13,8 @@ MODUTILS ?= "24 26" require task-bootstrap.inc HOTPLUG ?= "linux-hotplug" +PIVOTBOOT_EXTRA_RDEPENDS ?= "" +PIVOTBOOT_EXTRA_RRECOMMENDS ?= "" RDEPENDS = 'base-files base-passwd busybox \ netbase modutils-initscripts \ diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb index 8514ceb717..6654769443 100644 --- a/packages/tasks/task-sdk.bb +++ b/packages/tasks/task-sdk.bb @@ -34,23 +34,23 @@ RDEPENDS_task-sdk-base := "\ ipkg-dev \ jpeg-dev \ libapm-dev \ - libasound2 \ + libasound \ libdisplaymigration-dev \ libetpan-dev \ libgcrypt-dev \ libglade-dev \ - libgnutls-dev \ + gnutls-dev \ libgpg-error-dev \ libidl-dev \ libiw-dev \ - libmimedir-0.4-dev \ + libmimedir-dev \ libpcap-dev \ libpixman-dev \ libpng-dev \ libschedule-dev \ libsm-dev \ libsoundgen-dev \ - libsoup-2.2-dev \ + libsoup-dev \ libsvg-dev \ libtododb-dev \ libts-dev \ @@ -90,20 +90,20 @@ RDEPENDS_task-sdk-x11-ext := "\ recordext-dev \ renderext-dev \ resourceext-dev \ - x11-dev \ - xau-dev \ - xcalibrate-dev \ + libx11-dev \ + libxau-dev \ + libxcalibrate-dev \ xcalibrateext-dev \ - xcomposite-dev \ - xdamage-dev \ - xext-dev \ - xextensions-dev \ - xfont-dev \ - xpm-dev \ + libxcomposite-dev \ + libxdamage-dev \ + libxext-dev \ + xextproto-dev \ + libxfont-dev \ + libxpm-dev \ xproto-dev \ - xt-dev \ + libxt-dev \ xtrans-dev \ - xtst-dev" + libxtst-dev" # libxss-dev \ RDEPENDS_task-sdk-gpe := "\ diff --git a/packages/xorg-proto/xproto-native_6.6.2.bb b/packages/xorg-proto/xproto-native_6.6.2.bb deleted file mode 100644 index 6645f592bd..0000000000 --- a/packages/xorg-proto/xproto-native_6.6.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -SECTION = "unknown" -require xproto_${PV}.bb -inherit native -PROVIDES = "" diff --git a/packages/xorg-proto/xproto-native_cvs.bb b/packages/xorg-proto/xproto-native_cvs.bb deleted file mode 100644 index a34db98ab9..0000000000 --- a/packages/xorg-proto/xproto-native_cvs.bb +++ /dev/null @@ -1,4 +0,0 @@ -SECTION = "unknown" -require xproto_cvs.bb -inherit native -PROVIDES = "" diff --git a/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb b/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb deleted file mode 100644 index 55bc32b768..0000000000 --- a/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE= "MIT" -SECTION = "x11/libs" -DESCRIPTION = "X protocol and ancillary headers." - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xproto;date=20050226" -S = "${WORKDIR}/Xproto" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xorg-proto/xproto_6.6.2.bb b/packages/xorg-proto/xproto_6.6.2.bb deleted file mode 100644 index 1f01c0979a..0000000000 --- a/packages/xorg-proto/xproto_6.6.2.bb +++ /dev/null @@ -1,12 +0,0 @@ -SECTION = "x11/libs" -LICENSE= "MIT" -DESCRIPTION = "X protocol and ancillary headers." - -SRC_URI = "${XLIBS_MIRROR}/xproto-${PV}.tar.gz" -S = "${WORKDIR}/xproto-${PV}" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xorg-proto/xproto_cvs.bb b/packages/xorg-proto/xproto_cvs.bb deleted file mode 100644 index f42fa1bb43..0000000000 --- a/packages/xorg-proto/xproto_cvs.bb +++ /dev/null @@ -1,14 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE= "MIT" -SECTION = "x11/libs" -DESCRIPTION = "X protocol and ancillary headers." - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xproto" -S = "${WORKDIR}/Xproto" - -inherit autotools pkgconfig - - -do_stage() { - autotools_stage_all -} |