From 619095980381dfe5cb35cbd365bd1a1feacc2085 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Mon, 6 Jun 2011 17:14:28 +0100 Subject: update toolchain settings --- conf/distro/micro-uclibc.conf | 2 +- conf/distro/micro.conf | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/conf/distro/micro-uclibc.conf b/conf/distro/micro-uclibc.conf index 55b4ebd..cde50f5 100644 --- a/conf/distro/micro-uclibc.conf +++ b/conf/distro/micro-uclibc.conf @@ -18,7 +18,7 @@ DISTRO_FEATURES = "xattr" # TOOLCHAIN ############################################################################# -LIBC = "uclibc" +TCLIBC = "uclibc" # Based on the Micro Linux distribution require conf/distro/micro.conf diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf index 0eaf294..0532e63 100644 --- a/conf/distro/micro.conf +++ b/conf/distro/micro.conf @@ -18,8 +18,7 @@ DISTRO_VERSION = "${SRCDATE}" ############################################################################# # DISTRO FEATURE SELECTION ############################################################################# -# No features selected -DISTRO_FEATURES += "eabi" +DISTRO_FEATURES += "eabi ipv6 ipv4 largefile thumb-interwork xattr" ############################################################################# # LIBRARY NAMES @@ -34,6 +33,8 @@ INHERIT += "debian" PREFERRED_PKG_FORMAT = "ipk" IPKG_VARIANT = "opkg" +FULL_OPTIMIZATION = "-O2 -flto ${DEBUG_FLAGS}" + require conf/distro/include/sane-feed.inc require conf/distro/include/sane-feed-${PREFERRED_PKG_FORMAT}.inc @@ -50,6 +51,7 @@ DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" # Image output types IMAGE_FSTYPES ?= "tar.gz jffs2" +IMAGE_FEATURES = "read-only-rootfs" ############################################################################# # LINUX KERNEL SELECTION @@ -60,10 +62,9 @@ MACHINE_KERNEL_VERSION = "2.6" ############################################################################# # TOOLCHAIN ############################################################################# -LIBC ?= "eglibc" +TCLIBC ?= "eglibc" PREFERRED_VERSION_eglibc = "2.13" PREFERRED_ARM_INSTRUCTION_SET ?= "thumb" -require conf/distro/include/sane-toolchain.inc require conf/distro/include/arm-thumb.inc ############################################################################# -- cgit 1.2.3-korg From 3097f7b539e8afd2d5e042ff0758b1f7b51c49a4 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Mon, 6 Jun 2011 17:15:14 +0100 Subject: base-files: add fstab --- recipes/base-files/base-files/fstab | 8 ++++++++ recipes/base-files/base-files_3.0.14.bb | 18 ++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 recipes/base-files/base-files/fstab diff --git a/recipes/base-files/base-files/fstab b/recipes/base-files/base-files/fstab new file mode 100644 index 0000000..01f3b9f --- /dev/null +++ b/recipes/base-files/base-files/fstab @@ -0,0 +1,8 @@ +rootfs / auto defaults 1 1 +proc /proc proc defaults 0 0 +devtmpfs /dev devtmpfs defaults 0 0 +devpts /dev/pts devpts mode=0620,gid=5 0 0 +usbfs /proc/bus/usb usbfs defaults 0 0 +tmpfs /var/volatile tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 +tmpfs /media/ram tmpfs defaults 0 0 diff --git a/recipes/base-files/base-files_3.0.14.bb b/recipes/base-files/base-files_3.0.14.bb index 10538d2..b8de63c 100644 --- a/recipes/base-files/base-files_3.0.14.bb +++ b/recipes/base-files/base-files_3.0.14.bb @@ -1,12 +1,13 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r102" +PR = "r103" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://licenses/GPL-2;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = " \ + file://fstab \ file://nsswitch.conf \ file://licenses/BSD \ file://licenses/GPL-2 \ @@ -33,23 +34,24 @@ hostname = "oe-micro" do_install () { for d in ${dirs755}; do - install -m 0755 -d ${D}$d + install -m 0755 -d "${D}$d" done for d in ${dirs1777}; do - install -m 1777 -d ${D}$d + install -m 1777 -d "${D}$d" done for d in ${dirs2775}; do - install -m 2755 -d ${D}$d + install -m 2755 -d "${D}$d" done for d in ${volatiles}; do - if [ -d ${D}${localstatedir}/volatile/$d ]; then - ln -sf volatile/$d ${D}/${localstatedir}/$d + if [ -d "${D}${localstatedir}/volatile/$d" ]; then + ln -sf volatile/$d "${D}/${localstatedir}/$d" fi done - echo ${hostname} > ${D}${sysconfdir}/hostname + echo ${hostname} > "${D}${sysconfdir}/hostname" - install -m 0644 ${WORKDIR}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf + install -m 0644 "${WORKDIR}/fstab" "${D}${sysconfdir}/fstab" + install -m 0644 "${WORKDIR}/nsswitch.conf" "${D}${sysconfdir}/nsswitch.conf" } PACKAGES = "${PN}-dbg ${PN}-doc ${PN}" -- cgit 1.2.3-korg From 9271a8c4ec730661b78155c4e642254c5f7be30f Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Mon, 6 Jun 2011 17:15:37 +0100 Subject: busybox: adjust FILESPATH --- recipes/busybox/busybox_1.18.4.bbappend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/busybox/busybox_1.18.4.bbappend b/recipes/busybox/busybox_1.18.4.bbappend index 435ba43..cf980ab 100644 --- a/recipes/busybox/busybox_1.18.4.bbappend +++ b/recipes/busybox/busybox_1.18.4.bbappend @@ -1,4 +1,4 @@ -PR .= ".2" +PR .= ".3" THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" -FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}-${PV}"], d)}:" +FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}-${PV}", "${THISDIR}/files"], d)}:" -- cgit 1.2.3-korg