diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-22 21:55:42 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-22 21:55:42 +0100 |
| commit | db7ee5f68d81651baa6d48e6bcd4eaf1662c4619 (patch) | |
| tree | 65d5d622d7733c53e47b0817d49d865d672cdb53 | |
| parent | 844e6bdbb81fe3213e39621b81d48f33534c3f47 (diff) | |
| parent | 6647520d52d800175545414c027d75ac39c07ecc (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
112 files changed, 3068 insertions, 237 deletions
@@ -16,5 +16,6 @@ - microblaze: add cfgfs partition to dts, add partition to spartan dts - evaluate libguestfs for image creation - port w3m +- port msmtp - rutorrent porting - lms perl diff --git a/mk/build.mk b/mk/build.mk index 41d482272..8f28b8e55 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -169,7 +169,7 @@ endif ${STAGING_TARGET_DIR} ${STAGING_TARGET_DIR}/etc ${STAGING_HOST_DIR}: mkdir -p ${STAGING_TARGET_DIR}/{bin,etc,lib,usr/bin,usr/include,usr/lib/pkgconfig} \ - ${STAGING_HOST_DIR}/{bin,lib,usr/bin,usr/lib,usr/include} + ${STAGING_HOST_DIR}/{usr/bin,usr/lib,usr/include} for i in lib64 lib32 libx32;do \ cd ${STAGING_TARGET_DIR}/; ln -sf lib $$i; \ cd ${STAGING_TARGET_DIR}/usr; ln -sf lib $$i; \ @@ -476,17 +476,18 @@ bulktoolchain: ( \ echo === building $$arch $$libc toolchain-$$arch on $$(date); \ tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#hf##"); \ - if [ -f ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz ];then exit;fi; \ + carch=$$(echo $$arch|sed -e "s#hf##" -e "s#mips64.*#mips64#"); \ $(GMAKE) prereq && \ $(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \ - $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; break;fi; \ - if [ $$arch = "armhf" ];then arch=arm; else arch=$$arch;fi; \ tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\ + if [ $$arch = "armhf" ];then arch=arm; else arch=$$arch;fi; \ if [ -z $$tabi ];then abi="";else abi=_$$tabi;fi; \ - tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}$${abi}.tar.xz toolchain_${GNU_HOST_NAME} target_$${arch}_$${libc}$${abi}; \ + if [ -f ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}$${abi}.tar.xz ];then exit;fi; \ + $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; break;fi; \ + tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}$${abi}.tar.xz toolchain_${GNU_HOST_NAME} target_$${carch}_$${libc}$${abi}; \ $(GMAKE) cleantoolchain; \ rm .config; \ - ) 2>&1 | tee $(TOPDIR)/firmware/toolchain_build.log; \ + ) 2>&1 | tee -a $(TOPDIR)/firmware/toolchain_build.log; \ if [ -f .exit ];then break;fi \ done <${TOPDIR}/target/tarch.lst ;\ if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \ diff --git a/mk/image.mk b/mk/image.mk index ff95c5cb0..8ae7e087e 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -157,7 +157,7 @@ ${BUILD_DIR}/root.squashfs: ${TARGET_DIR} -nopad -noappend -root-owned $(MAKE_TRACE) ${FW_DIR}/${ROOTFSJFFS2}: ${TARGET_DIR} - ${STAGING_HOST_DIR}/usr/bin/mkfs.jffs2 $(ADK_JFFS2_OPTS) -q -r ${TARGET_DIR} \ + ${STAGING_HOST_DIR}/usr/bin/mkfs.jffs2 $(ADK_JFFS2_OPTS) -X zlib -r ${TARGET_DIR} \ --pad=$(ADK_TARGET_MTD_SIZE) -o ${FW_DIR}/${ROOTFSJFFS2} $(MAKE_TRACE) createinitramfs: ${STAGING_TARGET_DIR}/${INITRAMFS}_list diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 7c0a7f1a7..417c3d09f 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:= 75 +PKG_RELEASE:= 76 PKG_SECTION:= base PKG_DESCR:= basic files and scripts PKG_BUILDDEP:= pkgconf-host file-host diff --git a/package/base-files/src/etc/init.d/boot b/package/base-files/src/etc/init.d/boot index f52e8dc78..2e7215fb8 100644 --- a/package/base-files/src/etc/init.d/boot +++ b/package/base-files/src/etc/init.d/boot @@ -19,6 +19,8 @@ mount -o remount,nosuid,nodev,mode=1777,size=${size}k -t tmpfs tmpfs /tmp # start mdev dynamic device node management echo >/dev/mdev.seq echo "/sbin/mdev" >/proc/sys/kernel/hotplug +# creates f.e. /dev/root +mdev -s # seed some random cat /etc/.rnd >/dev/urandom 2>&1 diff --git a/package/dbus-python/Makefile b/package/dbus-python/Makefile index 9645f7269..b73d43a6c 100644 --- a/package/dbus-python/Makefile +++ b/package/dbus-python/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP:= dbus dbus-glib PKG_URL:= http://dbus.freedesktop.org/doc/dbus-python/ PKG_SITES:= http://dbus.freedesktop.org/releases/dbus-python/ +PKG_CFLINE_DBUS_PYTHON:= depends on ADK_BROKEN + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,DBUS_PYTHON,dbus-python,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/ethtool/Makefile b/package/ethtool/Makefile index f6be14fb9..73bd1d886 100644 --- a/package/ethtool/Makefile +++ b/package/ethtool/Makefile @@ -4,12 +4,14 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ethtool -PKG_VERSION:= 2.6.36 +PKG_VERSION:= 3.13 PKG_RELEASE:= 1 -PKG_MD5SUM:= 3b2322695e9ee7bf447ebcdb85f93e83 -PKG_DESCR:= Display or change ethernet card settings +PKG_MD5SUM:= dcb8f345d44ee79108282e7d0bdf5013 +PKG_DESCR:= display or change ethernet card settings PKG_SECTION:= net -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=gkernel/} +PKG_SITES:= https://www.kernel.org/pub/software/network/ethtool/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz include ${TOPDIR}/mk/package.mk diff --git a/package/ethtool/patches/patch-internal_h b/package/ethtool/patches/patch-internal_h |