Browse Source

fix cifs mounts on bootup, mount -a after network initialization. add LD_LIBRARY_PATH for raspberry pi special vc tools

Waldemar Brodkorb 12 years ago
parent
commit
4a9a3f1a06

+ 4 - 3
package/base-files/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		54
+PKG_RELEASE:=		55
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 
@@ -83,8 +83,9 @@ ifneq (${ADK_PACKAGE_CONFIG_IN_ETC},)
 	gzip -9c ${TOPDIR}/.config >$(IDIR_BASE_FILES)/etc/adkconfig.gz
 	chmod 600 $(IDIR_BASE_FILES)/etc/adkconfig.gz
 endif
-
-
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
+	echo 'export LD_LIBRARY_PATH=/opt/vc/lib' >> $(IDIR_BASE_FILES)/etc/profile
+endif
 
 # simple network configuration
 ifneq (${ADK_SIMPLE_NETWORK_CONFIG},)

+ 0 - 4
package/base-files/src/etc/init.d/boot

@@ -26,8 +26,4 @@ for f in /etc/modules.d/*; do
 done
 # settle down, after module load
 sleep 2
-# any lvm volumes to activate?
-[ -x /usr/sbin/lvm ] && { lvm vgscan; lvm vgchange -ay;}
-# check and mount all filesystems not /
-[ -f /etc/fstab ] && { fsck -p >/dev/null; mount -a; swapon -a;}
 exit 0

+ 10 - 0
package/base-files/src/etc/init.d/mount

@@ -0,0 +1,10 @@
+#!/bin/sh
+#INIT 99
+[[ $1 = autostart ]] || exit 0
+
+# any lvm volumes to activate?
+[ -x /usr/sbin/lvm ] && { lvm vgscan; lvm vgchange -ay;}
+# check and mount all filesystems not /
+[ -f /etc/fstab ] && { fsck -p >/dev/null; mount -a; swapon -a;}
+
+exit 0

+ 3 - 0
package/eglibc/Makefile

@@ -38,6 +38,9 @@ else
 	${INSTALL_DIR} $(IDIR_EGLIBC)/$(ADK_TARGET_LIBC_PATH) \
 	    $(IDIR_EGLIBC)/usr/lib $(IDIR_EGLIBC)/usr/bin
 	$(CP) $(STAGING_TARGET_DIR)/lib/ld* $(IDIR_EGLIBC)/$(ADK_TARGET_LIBC_PATH)
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
+	(cd $(IDIR_EGLIBC)/$(ADK_TARGET_LIBC_PATH); ln -sf ld-linux.so.3 ld-linux-armhf.so.3)
+endif
 	-for file in libc libcrypt libdl libm libresolv libutil libnsl libnss_dns libnss_files; do \
 		$(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_EGLIBC)/$(ADK_TARGET_LIBC_PATH); \
 		$(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_EGLIBC)/$(ADK_TARGET_LIBC_PATH); \