diff options
| -rw-r--r-- | conf/bitbake.conf | 2 | ||||
| -rw-r--r-- | conf/machine/include/tune-x86-nocona.conf | 2 | ||||
| -rw-r--r-- | conf/machine/x86-32-nocona.conf | 23 | ||||
| -rw-r--r-- | conf/machine/x86-prescott.conf | 2 | ||||
| -rw-r--r-- | packages/glibc/glibc-package.bbclass | 2 | ||||
| -rw-r--r-- | packages/images/helloworld-image.bb | 15 | ||||
| -rw-r--r-- | packages/linux/linux-x86_2.6.20.bb | 3 | ||||
| -rw-r--r-- | packages/linux/linux.inc | 2 | ||||
| -rw-r--r-- | packages/maemo3/libhildonmime_1.9.5.bb | 2 | ||||
| -rw-r--r-- | packages/meta/slugos-packages.bb | 3 |
10 files changed, 35 insertions, 21 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index d642998e8d..de5266f855 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -108,6 +108,8 @@ PROVIDES = "" PROVIDES_prepend = "${P} ${PF} ${PN} " RPROVIDES = "" +MULTI_PROVIDER_WHITELIST = "virtual/libintl" + PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale" FILES = "" diff --git a/conf/machine/include/tune-x86-nocona.conf b/conf/machine/include/tune-x86-nocona.conf new file mode 100644 index 0000000000..f1189a171e --- /dev/null +++ b/conf/machine/include/tune-x86-nocona.conf @@ -0,0 +1,2 @@ +TARGET_CC_ARCH = "-march=nocona" +TARGET_CC_KERNEL_ARCH = "-march=nocona" diff --git a/conf/machine/x86-32-nocona.conf b/conf/machine/x86-32-nocona.conf new file mode 100644 index 0000000000..ebb7a14b06 --- /dev/null +++ b/conf/machine/x86-32-nocona.conf @@ -0,0 +1,23 @@ +#@TYPE: Machine +#@NAME: x86-nocona +#@DESCRIPTION: Machine configuration for Intel 'Nocona' processor in 32-bit mode +# + +TARGET_ARCH = "i686" +MACHINE_ARCH = "x86-32-nocona" +PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586 i686" + +require conf/machine/include/tune-x86-nocona.conf + +PREFERRED_PROVIDER_virtual/kernel = "linux-x86" +OLDEST_KERNEL = "2.6.20" + +GLIBC_ADDONS = "nptl" +GLIBC_EXTRA_OECONF = "--with-tls" + +IMAGE_FSTYPES = "ext2.gz" + +MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" +MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" +MACHINE_TASK_PROVIDER = "task-base" + diff --git a/conf/machine/x86-prescott.conf b/conf/machine/x86-prescott.conf index 549a949a8b..2b0ef0e922 100644 --- a/conf/machine/x86-prescott.conf +++ b/conf/machine/x86-prescott.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for a generic i686 machine TARGET_ARCH = "i686" -PACKAGE_ARCH = "x86-prescott" +MACHINE_ARCH = "x86-prescott" PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586 i686" require conf/machine/include/tune-x86-prescott.conf diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index ae6a085e74..e8e755d139 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -27,7 +27,7 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "0" BINARY_LOCALE_ARCHES ?= "arm.*" PACKAGES = "glibc-dbg glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" -PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-*" +PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* locale-base-*" libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*" diff --git a/packages/images/helloworld-image.bb b/packages/images/helloworld-image.bb index 058bb7f12a..a1caf54cc5 100644 --- a/packages/images/helloworld-image.bb +++ b/packages/images/helloworld-image.bb @@ -11,18 +11,3 @@ export IMAGE_LINGUAS = "" PACKAGE_INSTALL = ${RDEPENDS} inherit image - -# Hello world image -# Contains *only* a statically linked hello world init program -LICENSE = "MIT" -PR = "r0" - -RDEPENDS = "helloworld" - -export IMAGE_BASENAME = "helloworld-image" -export IMAGE_LINGUAS = "" - -PACKAGE_INSTALL = ${RDEPENDS} - -inherit image - diff --git a/packages/linux/linux-x86_2.6.20.bb b/packages/linux/linux-x86_2.6.20.bb index 0582c9d58a..288c1c1166 100644 --- a/packages/linux/linux-x86_2.6.20.bb +++ b/packages/linux/linux-x86_2.6.20.bb @@ -9,9 +9,10 @@ SRC_URI_append_x86 = "file://i486-defconfig" SRC_URI_append_i586 = "file://i586-defconfig" SRC_URI_append_i686 = "file://i686-defconfig" - S = "${WORKDIR}/linux-${PV}" +KERNEL_IMAGETYPE ?= "bzImage" + inherit kernel COMPATIBLE_HOST = "i.86.*-linux" diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index ae7308bb81..4a09c92975 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -64,7 +64,7 @@ do_deploy() { ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin rm -f linux.bin.gz gzip -9 linux.bin - uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME} Kernel for ${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin + uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin rm -f linux.bin.gz fi } diff --git a/packages/maemo3/libhildonmime_1.9.5.bb b/packages/maemo3/libhildonmime_1.9.5.bb index 3379cb7168..1e0285b1fb 100644 --- a/packages/maemo3/libhildonmime_1.9.5.bb +++ b/packages/maemo3/libhildonmime_1.9.5.bb @@ -1,7 +1,7 @@ LICENSE = "LGPL" DESCRIPTION = "Nokia hildon mime library" -DEPENDS = "libosso" +DEPENDS = "libosso gnome-vfs" PR = "r0" diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 2125773569..26b89ff000 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r34" +PR = "r35" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2" @@ -140,6 +140,7 @@ SLUGOS_PACKAGES = "\ nano \ ncftp \ ncurses \ + net-tools \ netcat \ netpbm \ nfs-utils \ |