diff options
author | Oyvind Repvik <nail@nslu2-linux.org> | 2005-08-03 21:07:05 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-03 21:07:05 +0000 |
commit | faa3ea865bbec5433bcc950fae04d7554de7ba33 (patch) | |
tree | 1e4d49090768b7729ae1344453efe96623f63c24 /conf | |
parent | 92917970baea2b818611e3a7e8fffc9d27acb2b1 (diff) | |
parent | 61c8ed82a9e81ffc00074bc374d4c0a8de76174e (diff) |
explicit_merge of f4993582a6bc13487c991548a98342ea6d084c2a
and 7dcc40f11838a5d4253110fb45d10c0cd109a0ff
using ancestor 6c249e86f20cab16da75a620e43f22520d6b1f7b
to branch 'org.openembedded.nslu2-linux'
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/openslug-native-packages.conf | 4 | ||||
-rw-r--r-- | conf/distro/openslug-packages.conf | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/conf/distro/openslug-native-packages.conf b/conf/distro/openslug-native-packages.conf index de8d7f92a1..3ab2c056ae 100644 --- a/conf/distro/openslug-native-packages.conf +++ b/conf/distro/openslug-native-packages.conf @@ -2,7 +2,9 @@ BBFILES := "\ ${PKGDIR}/packages/gzip/*.bb \ ${PKGDIR}/packages/ipkg-utils/*.bb \ -${PKGDIR}/packages/meta/*.bb \ +${PKGDIR}/packages/meta/package-index.bb \ +${PKGDIR}/packages/meta/openslug-native-packages.bb \ +${PKGDIR}/packages/freeze/*.bb \ ${PKGDIR}/packages/vlan/*.bb \ ${OPENSLUG_EXTRA_BBFILES}" # I don't know of any packages we currently need to compile nativly, so this is something to test with diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index 25ea543f29..7255ec5528 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -1,4 +1,3 @@ -# automatically generated by bitbake freeze BBFILES := "\ ${PKGDIR}/packages/atftp/*.bb \ ${PKGDIR}/packages/audiofile/*.bb \ @@ -47,7 +46,6 @@ ${PKGDIR}/packages/glibc/*.bb \ ${PKGDIR}/packages/gnu-config/*.bb \ ${PKGDIR}/packages/gphoto2/*.bb \ ${PKGDIR}/packages/grep/*.bb \ -${PKGDIR}/packages/groff/*.bb \ ${PKGDIR}/packages/gtk-doc/*.bb \ ${PKGDIR}/packages/gzip/*.bb \ ${PKGDIR}/packages/hotplug-ng/*.bb \ @@ -70,6 +68,8 @@ ${PKGDIR}/packages/libmad/*.bb \ ${PKGDIR}/packages/libmikmod/*.bb \ ${PKGDIR}/packages/libogg/*.bb \ ${PKGDIR}/packages/libpcap/*.bb \ +${PKGDIR}/packages/libpng/*.bb \ +${PKGDIR}/packages/libtiff/*.bb \ ${PKGDIR}/packages/libtool/*.bb \ ${PKGDIR}/packages/libusb/*.bb \ ${PKGDIR}/packages/libvorbis/*.bb \ @@ -101,6 +101,7 @@ ${PKGDIR}/packages/nano/*.bb \ ${PKGDIR}/packages/ncftp/*.bb \ ${PKGDIR}/packages/ncurses/*.bb \ ${PKGDIR}/packages/netbase/*.bb \ +${PKGDIR}/packages/netpbm/*.bb \ ${PKGDIR}/packages/nfs-utils/*.bb \ ${PKGDIR}/packages/nis/*.bb \ ${PKGDIR}/packages/nslu2-binary-only/*.bb \ @@ -152,7 +153,6 @@ ${PKGDIR}/packages/tar/*.bb \ ${PKGDIR}/packages/thttpd/*.bb \ ${PKGDIR}/packages/timezones/*.bb \ ${PKGDIR}/packages/tinylogin/*.bb \ -${PKGDIR}/packages/udev/*.bb \ ${PKGDIR}/packages/unionfs/*.bb \ ${PKGDIR}/packages/unzip/*.bb \ ${PKGDIR}/packages/update-modules/*.bb \ |