From 92d36cfac4527b4912eda4080b2c5e0741fdeac6 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 17 Apr 2011 05:27:11 +0200
Subject: use rootdelay only for lemote yeelong

---
 mk/rootfs.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'mk')

diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index 2da69d017..241a237fa 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -25,9 +25,15 @@ ifeq ($(ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20),y)
 ROOTFS:=	root=/dev/mmcblk0p2 rootwait
 endif
 
+ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
+USB:=		rootwait
+else
+USB:=		rootdelay=2
+endif
+
 $(eval $(call rootfs_template,cf,CF,$(ROOTFS)))
 $(eval $(call rootfs_template,mmc,MMC,$(ROOTFS)))
-$(eval $(call rootfs_template,usb,USB,rootwait))
+$(eval $(call rootfs_template,usb,USB,$(USB)))
 $(eval $(call rootfs_template,archive,ARCHIVE,$(ROOTFS)))
 $(eval $(call rootfs_template,initramfs,INITRAMFS))
 $(eval $(call rootfs_template,initramfs-piggyback,INITRAMFS_PIGGYBACK))
-- 
cgit v1.2.3


From 66a6c153d5db95eb0f35861269a7f5459f387e55 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 17 Apr 2011 05:31:54 +0200
Subject: add basic locale support to OpenADK

---
 mk/pkg-bottom.mk | 2 +-
 mk/vars.mk       | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'mk')

diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 0735a8c14..954539764 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -82,11 +82,11 @@ else ifeq ($(strip ${CONFIG_STYLE}),)
 	    --libexecdir=/usr/libexec \
 	    --localstatedir=/var \
 	    --sysconfdir=/etc \
-	    --disable-nls \
 	    --enable-shared \
 	    --enable-static \
 	    --disable-dependency-tracking \
 	    --disable-libtool-lock \
+	    $(NLS) \
 	    ${CONFIGURE_ARGS} $(MAKE_TRACE)
 else
 	@echo "Invalid CONFIG_STYLE '${CONFIG_STYLE}'" >&2
diff --git a/mk/vars.mk b/mk/vars.mk
index bb66a5e32..5dc08a7a9 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -209,4 +209,10 @@ ifeq ($(ADK_HOST_CYGWIN),y)
 EXEEXT:=		.exe
 endif
 
+ifeq ($(ADK_LOCALES),y)
+NLS:=			--enable-nls
+else
+NLS:=			--disable-nls
+endif
+
 include $(TOPDIR)/mk/mirrors.mk
-- 
cgit v1.2.3