diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-08-14 14:44:53 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-08-14 14:44:53 +0200 |
| commit | c8854df6c34109b16020a9f739ad71667a3f922b (patch) | |
| tree | 7f8364edbf4cf6e9f8589eb347d72718379ca997 | |
| parent | 2bdcee2f9aa927118e23f4fb37bcc28adbe1a941 (diff) | |
| parent | ea9849456a34a6143acb5330cfd8359e9ff93ede (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | package/base-files/Makefile | 4 | ||||
| -rw-r--r-- | package/bcm2835-vc/Makefile | 3 | ||||
| -rw-r--r-- | package/nfs-utils/Makefile | 5 | ||||
| -rw-r--r-- | target/config/Config.in | 3 |
4 files changed, 9 insertions, 6 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index c70bf6a5c..605922737 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:= 58 +PKG_RELEASE:= 59 PKG_SECTION:= base PKG_DESCR:= basic files and scripts @@ -26,7 +26,7 @@ do-install: ifeq (${ADK_TARGET_ROOTFS_NFSROOT},y) @echo "#" > $(IDIR_BASE_FILES)/etc/network/interfaces endif - $(SED) 's,@ARCH@,$(ADK_TARGET_ARCH),g' $(IDIR_BASE_FILES)/etc/ipkg.conf + $(SED) 's,@ARCH@,$(ADK_TARGET_CPU_ARCH),g' $(IDIR_BASE_FILES)/etc/ipkg.conf $(SED) 's,@SYSTEM@,$(ADK_TARGET_SYSTEM),g' $(IDIR_BASE_FILES)/etc/ipkg.conf $(SED) 's,@LIBC@,$(ADK_TARGET_LIBC),g' $(IDIR_BASE_FILES)/etc/ipkg.conf $(SED) 's,@HOST@,$(ADK_HOST),g' $(IDIR_BASE_FILES)/etc/ipkg.conf diff --git a/package/bcm2835-vc/Makefile b/package/bcm2835-vc/Makefile index 8df9cb6bb..aa5a1fad8 100644 --- a/package/bcm2835-vc/Makefile +++ b/package/bcm2835-vc/Makefile @@ -5,10 +5,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bcm2835-vc PKG_VERSION:= 0.2 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= d16840805c020af92cd2268a0291228b PKG_DESCR:= vc tools for raspberry pi (bcm2835) PKG_SECTION:= base +PKG_DEPENDS:= libpthread PKG_SITES:= http://openadk.org/distfiles/ PKG_LIBC_DEPENDS:= eglibc glibc diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index 04adb4910..122b1f28a 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -13,7 +13,10 @@ PKG_DEPENDS:= kmod-nfsd keyutils libtirpc rpcbind libdevmapper PKG_DEPENDS+= libpthread PKG_BUILDDEP:= keyutils libtirpc lvm PKG_URL:= http://sourceforge.net/projects/nfs -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=nfs/} +# as long as there are tar archives of nfs-utils with object files +# on some sourceforge mirrors +PKG_SITES:= http://openadk.org/distfiles/ +#PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=nfs/} PKG_FLAVOURS_NFS_UTILS:=WITH_KERBEROS PKGFD_WITH_KERBEROS:= enable Kerberos support (MIT) diff --git a/target/config/Config.in b/target/config/Config.in index 84ea8fe68..a14ef5b7a 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -584,7 +584,6 @@ config ADK_TARGET_LIB_UCLIBC depends on \ !ADK_LINUX_SPARC64 && \ !ADK_LINUX_PPC64 && \ - !ADK_TARGET_SYSTEM_RASPBERRY_PI && \ !ADK_LINUX_NATIVE help http://uclibc.org @@ -626,7 +625,6 @@ config ADK_TARGET_LIB_GLIBC ADK_LINUX_SPARC64 || \ ADK_LINUX_X86 || \ ADK_LINUX_X86_64 - depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI help http://www.gnu.org/libc @@ -657,6 +655,7 @@ config ADK_TARGET_SUFFIX default "gnueabihf" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_EABIHF default "gnueabi" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_EABI default "gnu" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && !ADK_EABI + default "uclibcgnueabihf" if ADK_TARGET_LIB_UCLIBC && ADK_EABIHF default "uclibcgnueabi" if ADK_TARGET_LIB_UCLIBC && ADK_EABI default "uclibc" if ADK_TARGET_LIB_UCLIBC && !ADK_EABI default "muslgnueabihf" if ADK_TARGET_LIB_MUSL && ADK_EABIHF |