diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-15 19:54:50 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-15 19:54:50 +0200 |
| commit | 3e377198a0453e9077f578357fca03ac82b11c1e (patch) | |
| tree | 98b24dae67f853992002493319ec5e291bbaf142 | |
| parent | f1c92599cc6ef9d6e526ce4a88053b2e736b9324 (diff) | |
| parent | 8e206204153b17085e9ae09d8b47e7095cfac22a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | mk/rootfs.mk | 6 | ||||
| -rw-r--r-- | package/bison/Makefile | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/mk/rootfs.mk b/mk/rootfs.mk index f5e2b74c5..5aba137da 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -31,6 +31,10 @@ ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y) ROOTFS:= root=/dev/sda1 rootwait endif +ifeq ($(ADK_TARGET_SYSTEM_FOXBOARD_LX),y) +ROOTFS:= root=/dev/mtdblock1 +endif + ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) USB:= rootwait else @@ -43,7 +47,7 @@ $(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)) -$(eval $(call rootfs_template,squashfs,SQUASHFS)) +$(eval $(call rootfs_template,squashfs,SQUASHFS,$(ROOTFS))) $(eval $(call rootfs_template,yaffs,YAFFS,$(MTDDEV) panic=3)) $(eval $(call rootfs_template,nfsroot,NFSROOT,root=/dev/nfs ip=dhcp init=/init)) $(eval $(call rootfs_template,encrypted,ENCRYPTED)) diff --git a/package/bison/Makefile b/package/bison/Makefile index f468e1576..a1326ece7 100644 --- a/package/bison/Makefile +++ b/package/bison/Makefile @@ -16,6 +16,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BISON,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +XAKE_FLAGS+= M4=m4 + post-install: ${INSTALL_DIR} ${IDIR_BISON}/usr/bin ${IDIR_BISON}/usr/share/bison ${INSTALL_BIN} ${WRKINST}/usr/bin/bison ${IDIR_BISON}/usr/bin |