diff options
| author |   Phil Blundell <philb@brightsign.biz> | 2011-06-10 16:35:24 +0100 |
|---|---|---|
| committer | Phil Blundell <philb@brightsign.biz> | 2011-06-10 16:35:24 +0100 |
| commit | f9368839a43ed54b9920eb3185532cfd8ce673d5 (patch) | |
| tree | 538b3f755bb3ae572da0ec003bbc3c9c6c38a513 | |
| parent | b40a1f32524e2c2fe6809f15527928d135286c41 (diff) | |
| parent | 9271a8c4ec730661b78155c4e642254c5f7be30f (diff) | |
| download | meta-micro-f9368839a43ed54b9920eb3185532cfd8ce673d5.tar.gz | |
Merge branch 'master' of git.openembedded.org:meta-micro
| -rw-r--r-- | conf/distro/micro.conf | 3 | ||||
| -rw-r--r-- | recipes/base-files/base-files_3.0.14.bb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf index 56171b9..30bf4ae 100644 --- a/conf/distro/micro.conf +++ b/conf/distro/micro.conf @@ -33,6 +33,8 @@ INHERIT += "debian recipe_sanity" 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 @@ -63,7 +65,6 @@ MACHINE_KERNEL_VERSION = "2.6" TCLIBC ?= "eglibc" PREFERRED_VERSION_eglibc = "2.13" PREFERRED_ARM_INSTRUCTION_SET ?= "thumb" -#FULL_OPTIMIZATION = "-O2 ${DEBUG_FLAGS}" require conf/distro/include/arm-thumb.inc ############################################################################# diff --git a/recipes/base-files/base-files_3.0.14.bb b/recipes/base-files/base-files_3.0.14.bb index bc2dfcc..7345b7d 100644 --- a/recipes/base-files/base-files_3.0.14.bb +++ b/recipes/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r104" +PR = "r105" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://licenses/GPL-2;md5=94d55d512a9ba36caa9b7df079bae19f" |