diff options
| -rw-r--r-- | conf/distro/openslug-packages.conf | 1 | ||||
| -rw-r--r-- | conf/distro/ucslugc-packages.conf | 1 | ||||
| -rw-r--r-- | packages/libid3tag/libid3tag_0.15.0b.bb | 4 | ||||
| -rw-r--r-- | packages/libmad/libmad_0.15.0b.bb | 4 | ||||
| -rw-r--r-- | packages/libvorbis/libvorbis_1.0.1.bb | 12 | ||||
| -rw-r--r-- | packages/meta/slugos-packages.bb | 1 |
6 files changed, 9 insertions, 14 deletions
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index 0c743ef64f..c013252e0a 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -77,6 +77,7 @@ ${PKGDIR}/packages/ixp425-eth/*.bb \ ${PKGDIR}/packages/ixp4xx/*.bb \ ${PKGDIR}/packages/joe/*.bb \ ${PKGDIR}/packages/jpeg/*.bb \ +${PKGDIR}/packages/klibc/*.bb \ ${PKGDIR}/packages/lcdproc/*.bb \ ${PKGDIR}/packages/less/*.bb \ ${PKGDIR}/packages/libaal/*.bb \ diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf index 8aec056d24..540d9621ef 100644 --- a/conf/distro/ucslugc-packages.conf +++ b/conf/distro/ucslugc-packages.conf @@ -71,6 +71,7 @@ ${PKGDIR}/packages/ixp425-eth/*.bb \ ${PKGDIR}/packages/ixp4xx/*.bb \ ${PKGDIR}/packages/joe/*.bb \ ${PKGDIR}/packages/jpeg/*.bb \ +${PKGDIR}/packages/klibc/*.bb \ ${PKGDIR}/packages/lcdproc/*.bb \ ${PKGDIR}/packages/less/*.bb \ ${PKGDIR}/packages/libaal/*.bb \ diff --git a/packages/libid3tag/libid3tag_0.15.0b.bb b/packages/libid3tag/libid3tag_0.15.0b.bb index fea3a7c6e0..0eb9608668 100644 --- a/packages/libid3tag/libid3tag_0.15.0b.bb +++ b/packages/libid3tag/libid3tag_0.15.0b.bb @@ -1,3 +1,4 @@ +PR = "r1" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Greg Gilbert <greg@treke.net>" @@ -13,6 +14,5 @@ inherit autotools EXTRA_OECONF = "-enable-speed" do_stage() { - oe_libinstall -so libid3tag ${STAGING_LIBDIR} - install -m 0644 id3tag.h ${STAGING_INCDIR} + autotools_stage_all } diff --git a/packages/libmad/libmad_0.15.0b.bb b/packages/libmad/libmad_0.15.0b.bb index 51402d2f01..4d7e0a5202 100644 --- a/packages/libmad/libmad_0.15.0b.bb +++ b/packages/libmad/libmad_0.15.0b.bb @@ -1,3 +1,4 @@ +PR = "r1" DESCRIPTION = "MPEG Audio Decoder Library" SECTION = "libs" PRIORITY = "optional" @@ -20,6 +21,5 @@ do_configure_prepend () { } do_stage() { - oe_libinstall -so libmad ${STAGING_LIBDIR} - install -m 0644 mad.h ${STAGING_INCDIR} + autotools_stage_all } diff --git a/packages/libvorbis/libvorbis_1.0.1.bb b/packages/libvorbis/libvorbis_1.0.1.bb index 3a3ab73eeb..30124a982b 100644 --- a/packages/libvorbis/libvorbis_1.0.1.bb +++ b/packages/libvorbis/libvorbis_1.0.1.bb @@ -1,3 +1,4 @@ +PR = "r1" SECTION = "libs" DEPENDS = "libogg" DESCRIPTION = "Ogg Vorbis is a high-quality lossy audio codec \ @@ -17,14 +18,5 @@ EXTRA_OECONF = "--with-ogg-libraries=${STAGING_LIBDIR} \ --with-ogg-includes=${STAGING_INCDIR}" do_stage () { - oe_libinstall -a -so -C lib libvorbis ${STAGING_LIBDIR} - oe_libinstall -a -so -C lib libvorbisfile ${STAGING_LIBDIR} - oe_libinstall -a -so -C lib libvorbisenc ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/vorbis - install -m 0644 include/vorbis/vorbisenc.h \ - include/vorbis/vorbisfile.h \ - include/vorbis/codec.h ${STAGING_INCDIR}/vorbis/ - install -d ${STAGING_DATADIR}/aclocal - install -m 0644 vorbis.m4 ${STAGING_DATADIR}/aclocal/ + autotools_stage_all } diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 2cc8f5878b..c7410d2f0c 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -70,6 +70,7 @@ SLUGOS_PACKAGES = "\ iptables \ joe \ jpeg \ + klibc \ lcdproc \ less \ libao \ |