diff options
| -rw-r--r-- | conf/distro/ucslugc-packages.conf | 9 | ||||
| -rw-r--r-- | conf/distro/ucslugc.conf | 2 | ||||
| -rw-r--r-- | conf/machine/nslu2.conf | 4 | ||||
| -rw-r--r-- | packages/meta/ucslugc-packages.bb | 11 |
4 files changed, 16 insertions, 10 deletions
diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf index c6575241ba..013a0b031b 100644 --- a/conf/distro/ucslugc-packages.conf +++ b/conf/distro/ucslugc-packages.conf @@ -1,5 +1,4 @@ -# automatically generated by bitbake freeze -# hacked by the addition of UCSLUG_EXTRA_BBFILES at the end +# hand editted from bitbake freeze output BBFILES := "\ ${PKGDIR}/packages/atftp/*.bb \ ${PKGDIR}/packages/autoconf/*.bb \ @@ -62,6 +61,8 @@ ${PKGDIR}/packages/libiconv/*.bb \ ${PKGDIR}/packages/libid3tag/*.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 \ @@ -90,6 +91,7 @@ ${PKGDIR}/packages/nano/*.bb \ ${PKGDIR}/packages/ncftp/*.bb \ ${PKGDIR}/packages/ncurses/*.bb \ ${PKGDIR}/packages/netbase/*.bb \ +${PKGDIR}/packages/netpbm/*.bb \ ${PKGDIR}/packages/nslu2-binary-only/*.bb \ ${PKGDIR}/packages/ntp/*.bb \ ${PKGDIR}/packages/obexftp/*.bb \ @@ -106,6 +108,7 @@ ${PKGDIR}/packages/patcher/*.bb \ ${PKGDIR}/packages/pciutils/*.bb \ ${PKGDIR}/packages/pcmcia-cs/*.bb \ ${PKGDIR}/packages/pcre/*.bb \ +${PKGDIR}/packages/perl/*.bb \ ${PKGDIR}/packages/pkgconfig/*.bb \ ${PKGDIR}/packages/popt/*.bb \ ${PKGDIR}/packages/portmap/*.bb \ @@ -142,4 +145,4 @@ ${PKGDIR}/packages/util-linux/*.bb \ ${PKGDIR}/packages/vlan/*.bb \ ${PKGDIR}/packages/wget/*.bb \ ${PKGDIR}/packages/zlib/*.bb \ -${OPENSLUG_UCSLUGC_BBFILES}" +${UCSLUGC_EXTRA_BBFILES}" diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index 34bc39a3a3..c321f18009 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -24,7 +24,7 @@ OVERRIDES = "local:${MACHINE}:${DISTRO}:openslug:${TARGET_OS}:${TARGET_ARCH}:bui # NOTE: to build new packages set UCSLUGC_EXTRA_BBFILES to the full path name to # the .bb files for the packages to build - see ucslugc-packages.conf in this # directory -OPENSLUG_UCSLUGC_BBFILES ?= "" +UCSLUGC_EXTRA_BBFILES ?= "" # pull in the frozen list of bbfiles - this sets BBFILES and this will override any # setting in local.conf diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index 3beac45143..83849396b2 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -27,6 +27,10 @@ PACKAGE_ARCH = "armeb" # values are.) FULL_OPTIMIZATION = "-fomit-frame-pointer -frename-registers -fweb -funit-at-a-time -Os" +# uClibc does not include sinf or cosf, so the gcc auto-use of +# these functions must be disabled (this only occurs with -O) +FULL_OPTIMIZATION_append_linux-uclibc = " -fno-builtin-sin -fno-builtin-cos" + SERIAL_CONSOLE = "115200 ttyS0" KERNEL_CONSOLE = "ttyS0,115200n8" USE_VT = "0" diff --git a/packages/meta/ucslugc-packages.bb b/packages/meta/ucslugc-packages.bb index afd029bc30..8e534364f2 100644 --- a/packages/meta/ucslugc-packages.bb +++ b/packages/meta/ucslugc-packages.bb @@ -17,7 +17,6 @@ UCSLUGC_PACKAGES = "\ autoconf \ automake \ bash \ - bash \ binutils \ bison \ bluez-utils-nodbus \ @@ -26,7 +25,6 @@ UCSLUGC_PACKAGES = "\ bzip2 \ ccxstream \ coreutils \ - coreutils \ cron \ cvs \ cvs\ @@ -48,7 +46,9 @@ UCSLUGC_PACKAGES = "\ gtk-doc \ gzip \ ipkg-utils \ + jpeg \ less \ + libpng \ libtool \ libusb \ libxml2 \ @@ -70,11 +70,11 @@ UCSLUGC_PACKAGES = "\ openldap \ openntpd \ openssh \ - openssh \ openvpn \ patch \ pciutils \ pcre \ + perl \ pkgconfig \ ppp \ procps \ @@ -89,15 +89,15 @@ UCSLUGC_PACKAGES = "\ sed \ setpwc \ strace \ - strace \ sudo \ sysfsutils \ thttpd \ - thttpd \ + tiff \ unionfs-modules unionfs-utils \ util-linux \ vlan \ wget \ + zlib \ " # These packages only build on TARGET_OS=linux, but not TARGET_OS=linux-uclibc. @@ -108,7 +108,6 @@ UCSLUGC_BROKEN_PACKAGES = "\ man man-pages \ mgetty \ mpd \ - perl \ php \ postfix \ psmisc \ |