diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-07-11 16:09:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-07-11 16:09:29 +0200 |
| commit | 4a9a3f1a06b2d180b80a4ec17f0c4b4003773316 (patch) | |
| tree | 99864452e0488fb691cef8626cc4331e8f0c5c6a /package | |
| parent | 9961e5898f70db51ffc4f093e5d0777bb9b287ff (diff) | |
fix cifs mounts on bootup, mount -a after network initialization. add LD_LIBRARY_PATH for raspberry pi special vc tools
Diffstat (limited to 'package')
| -rw-r--r-- | package/base-files/Makefile | 7 | ||||
| -rw-r--r-- | package/base-files/src/etc/init.d/boot | 4 | ||||
| -rw-r--r-- | package/base-files/src/etc/init.d/mount | 10 | ||||
| -rw-r--r-- | package/eglibc/Makefile | 3 |
4 files changed, 17 insertions, 7 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 2f89753c5..41ead5331 100644 --- a/package/base-files/Makefile +++ b/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},) diff --git a/package/base-files/src/etc/init.d/boot b/package/base-files/src/etc/init.d/boot index e30360142..ed55ccc88 100644 --- a/package/base-files/src/etc/init.d/boot +++ b/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 diff --git a/package/base-files/src/etc/init.d/mount b/package/base-files/src/etc/init.d/mount new file mode 100644 index 000000000..f0df597e5 --- /dev/null +++ b/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 diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index d9acdb8fd..4fcc6bf4b 100644 --- a/package/eglibc/Makefile +++ b/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); \ |