aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/bitbake.conf4
-rw-r--r--conf/distro/openslug.conf3
-rw-r--r--conf/distro/openzaurus-3.5.3.conf2
3 files changed, 5 insertions, 4 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 76cab50ca7..2b99e29b0a 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -166,7 +166,7 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
${EXTRA_IMAGECMD}"
IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}"
IMAGE_CMD_ext2 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}"
-IMAGE_CMD_ext2.gz = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.new ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.new; mv ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.new.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz"
+IMAGE_CMD_ext2.gz = "mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz"
IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend"
IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ."
EXTRA_IMAGECMD = ""
@@ -245,7 +245,7 @@ export BUILD_LDFLAGS = "-L${STAGING_DIR}/${BUILD_SYS}/lib \
export LDFLAGS = "${TARGET_LDFLAGS}"
export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
-Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib \
- -Wl,-rpath,${libdir} -Wl,-O1"
+ -Wl,-O1"
# Which flags to leave by strip-flags() in bin/build/oebuild.sh ?
ALLOWED_FLAGS = "-O -mcpu -march -pipe"
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index eb39766950..d0ce898056 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -3,12 +3,13 @@
#@DESCRIPTION: OpenSlug Linux Distribution for the NSLU2
DISTRO_NAME = "OpenSlug"
-DISTRO_VERSION = "1.6-beta"
+DISTRO_VERSION = "1.7-beta"
TARGET_FPU = "soft"
TARGET_OS = "linux"
USE_NLS ?= "no"
+USE_NLS_glib-2.0 = "yes"
INHERIT += " package_ipk debian nslu2_flashimg"
diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf
index 7a8c5750c9..f8c6486f5d 100644
--- a/conf/distro/openzaurus-3.5.3.conf
+++ b/conf/distro/openzaurus-3.5.3.conf
@@ -13,7 +13,7 @@ FEED_URIS += " \
console##http://openzaurus.org/official/unstable/3.5.2/feed/console \
devel##http://openzaurus.org/official/unstable/3.5.2/feed/devel"
-CVSDATE = "20050305"
+CVSDATE = "20050313"
#
# Zaurus