diff options
| -rw-r--r-- | conf/distro/openslug-packages.conf | 1 | ||||
| -rw-r--r-- | conf/distro/ucslugc-packages.conf | 2 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb | 4 | ||||
| -rw-r--r-- | packages/meta/openslug-packages.bb | 1 | ||||
| -rw-r--r-- | packages/pciutils/pciutils_2.1.11.bb | 11 |
5 files changed, 15 insertions, 4 deletions
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index 316a030f8a..6bd6708814 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -184,6 +184,7 @@ ${PKGDIR}/packages/update-rc.d/*.bb \ ${PKGDIR}/packages/upslug/*.bb \ ${PKGDIR}/packages/usbutils/*.bb \ ${PKGDIR}/packages/util-linux/*.bb \ +${PKGDIR}/packages/vim/*.bb \ ${PKGDIR}/packages/vlan/*.bb \ ${PKGDIR}/packages/vsftpd/*.bb \ ${PKGDIR}/packages/wakelan/*.bb \ diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf index 66bb74577b..5ecc44fb03 100644 --- a/conf/distro/ucslugc-packages.conf +++ b/conf/distro/ucslugc-packages.conf @@ -51,6 +51,7 @@ ${PKGDIR}/packages/gzip/*.bb \ ${PKGDIR}/packages/hotplug-ng/*.bb \ ${PKGDIR}/packages/initscripts/*.bb \ ${PKGDIR}/packages/install/*.bb \ +${PKGDIR}/packages/intltool/*.bb \ ${PKGDIR}/packages/ipkg-utils/*.bb \ ${PKGDIR}/packages/ipkg/*.bb \ ${PKGDIR}/packages/ircp/*.bb \ @@ -62,6 +63,7 @@ ${PKGDIR}/packages/libaal/*.bb \ ${PKGDIR}/packages/libao/*.bb \ ${PKGDIR}/packages/libexif/*.bb \ ${PKGDIR}/packages/libgphoto2/*.bb \ +${PKGDIR}/packages/libgsm/*.bb \ ${PKGDIR}/packages/libiconv/*.bb \ ${PKGDIR}/packages/libid3tag/*.bb \ ${PKGDIR}/packages/libmad/*.bb \ diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb index 76f217d74e..065d5d9eb8 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r10" +PR = "r11" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -79,7 +79,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${DOSRC}/tosa-lcd-r3.patch;patch=1 \ ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \ ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \ - ${RPSRC}/pxa27x_extraregs-r2.patch;patch=1 \ + ${RPSRC}/pxa27x_extraregs-r3.patch;patch=1 \ ${RPSRC}/spitzbase-r5.patch;patch=1 \ ${RPSRC}/spitzkbd-r1.patch;patch=1 \ ${RPSRC}/spitzssp-r4.patch;patch=1 \ diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index e67eadd555..2febd8d2b3 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -118,6 +118,7 @@ OPENSLUG_PACKAGES = "\ unionfs-modules unionfs-utils \ usbutils \ util-linux \ + vim \ vlan \ vsftpd \ wakelan \ diff --git a/packages/pciutils/pciutils_2.1.11.bb b/packages/pciutils/pciutils_2.1.11.bb index 792b34fda7..ce9979ca91 100644 --- a/packages/pciutils/pciutils_2.1.11.bb +++ b/packages/pciutils/pciutils_2.1.11.bb @@ -1,13 +1,15 @@ SECTION = "console/utils" DESCRIPTION = 'The PCI Utilities package contains a library for portable access \ to PCI bus configuration space and several utilities based on this library.' +DESCRIPTION_pciutils-ids = 'The list of PCI IDs for pciutils' HOMEPAGE = "http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml" LICENSE = "GPLv2" -PR="r1" +PR="r3" PARALLEL_MAKE = "" - +FILES_pciutils-ids="${prefix}/share/pci.ids" +PACKAGES =+ "pciutils-ids" SRC_URI = "ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ file://configure-uclibc.patch;patch=1 \ @@ -25,3 +27,8 @@ export MANDIR = "${D}${mandir}" do_install () { oe_runmake install } +do_install_append () { + install -d ${D}/${prefix}/share + install -m 6440 ${WORKDIR}/${PN}-${PV}/pci.ids ${D}/${prefix}/share +} + |