summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/build.mk2
-rw-r--r--package/bc/Makefile7
-rw-r--r--package/cmake/Makefile6
-rw-r--r--package/e2fsprogs/Makefile8
-rw-r--r--package/flex/Makefile7
-rw-r--r--package/glibc/Makefile12
-rw-r--r--package/glibc/files/libc.so.i5865
-rw-r--r--package/glibc/files/libc.so.i6865
-rw-r--r--package/glibc/files/libc.so.mips5
-rw-r--r--package/glibc/files/libc.so.mips645
-rw-r--r--package/glibc/files/libc.so.mips64el5
-rw-r--r--package/glibc/files/libc.so.mipsel5
-rwxr-xr-xscripts/create.sh2
-rw-r--r--target/config/Config.in2
-rw-r--r--target/config/Config.in.runtime1
-rw-r--r--toolchain/musl/patches/mips64.patch12
16 files changed, 77 insertions, 12 deletions
diff --git a/mk/build.mk b/mk/build.mk
index a025b1396..75a1a914c 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -101,7 +101,7 @@ POSTCONFIG= -@\
touch .rebuild.busybox;\
rebuild=1;\
fi; \
- for i in ADK_RUNTIME_PASSWORD ADK_RUNTIME_HOSTNAME ADK_TARGET_ROOTFS ADK_RUNTIME_CONSOLE;do \
+ for i in ADK_RUNTIME_PASSWORD ADK_RUNTIME_TMPFS_SIZE ADK_RUNTIME_HOSTNAME ADK_TARGET_ROOTFS ADK_RUNTIME_CONSOLE;do \
if [ "$$(grep ^$$i .config|md5sum)" != "$$(grep ^$$i .config.old|md5sum)" ];then \
touch .rebuild.base-files;\
rebuild=1;\
diff --git a/package/bc/Makefile b/package/bc/Makefile
index 3ee37411b..d4af2f264 100644
--- a/package/bc/Makefile
+++ b/package/bc/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= d44b5dddebd8a7a7309aea6c36fda117
PKG_DESCR:= An arbitrary precision calculator language
PKG_SECTION:= utils
+PKG_BUILDDEP:= flex-host
PKG_URL:= http://www.gnu.org/software/bc/
PKG_SITES:= http://ftp.gnu.org/pub/gnu/bc/
@@ -19,11 +20,11 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,BC,bc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,DC,dc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
- # bc
+bc-install:
${INSTALL_DIR} ${IDIR_BC}/usr/bin
${INSTALL_BIN} ${WRKBUILD}/bc/bc ${IDIR_BC}/usr/bin/bc
- # dc
+
+dc-install:
${INSTALL_DIR} ${IDIR_DC}/usr/bin
${INSTALL_BIN} ${WRKBUILD}/dc/dc ${IDIR_DC}/usr/bin/dc
diff --git a/package/cmake/Makefile b/package/cmake/Makefile
index 322f8878f..3b33ee165 100644
--- a/package/cmake/Makefile
+++ b/package/cmake/Makefile
@@ -5,18 +5,20 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= cmake
PKG_VERSION:= 2.8.12
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 105bc6d21cc2e9b6aff901e43c53afea
PKG_DESCR:= cmake utility
PKG_SECTION:= lang
PKG_URL:= http://www.cmake.org/
PKG_SITES:= http://www.cmake.org/files/v2.8/
+PKG_TARGET_DEPENDS:= native
+
include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
$(eval $(call HOST_template,CMAKE,cmake,$(PKG_VERSION)-${PKG_RELEASE}))
-#$(eval $(call PKG_template,CMAKE,cmake,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CMAKE,cmake,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
HOST_STYLE:= manual
CONFIG_STYLE:= manual
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index d7b44621a..4b7342197 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -30,16 +30,16 @@ PKGSD_E2FSCK_STATIC:= Static build of e2fsck
PKGSC_E2FSCK_STATIC:= fs
PKGSD_RESIZE2FS:= Resize FS utility
PKGSC_RESIZE2FS:= fs
-PKGSS_RESIZE2FS:= libe2fs
+PKGSS_RESIZE2FS:= libe2fs libcom-err libblkid
PKGSD_TUNE2FS:= Tune2FS utility
PKGSC_TUNE2FS:= fs
-PKGSS_TUNE2FS:= libe2fs
+PKGSS_TUNE2FS:= libe2fs libcom-err libblkid libuuid
PKGSD_E2FSCK:= E2fsck utility
PKGSC_E2FSCK:= fs
-PKGSS_E2FSCK:= libe2fs
+PKGSS_E2FSCK:= libe2fs libcom-err libblkid libuuid
PKGSD_MKE2FS:= Mke2fs utility
PKGSC_MKE2FS:= fs
-PKGSS_MKE2FS:= libe2fs
+PKGSS_MKE2FS:= libe2fs libcom-err libblkid libuuid
include ${TOPDIR}/mk/package.mk
diff --git a/package/flex/Makefile b/package/flex/Makefile
index 221f8b5bf..84bfb9c38 100644
--- a/package/flex/Makefile
+++ b/package/flex/Makefile
@@ -9,15 +9,19 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 201d3f38758d95436cbc64903386de0b
PKG_DESCR:= fast lexical analyzer
PKG_SECTION:= lang
-PKG_BUILDDEP:= m4-host
+PKG_BUILDDEP:= m4-host flex-host
PKG_URL:= http://flex.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
PKG_OPTS:= dev
+include ${TOPDIR}/mk/host.mk
include ${TOPDIR}/mk/package.mk
+$(eval $(call HOST_template,FLEX,flex,${PKG_VERSION}-${PKG_RELEASE}))
$(eval $(call PKG_template,FLEX,flex,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+HOST_STYLE:= auto
+
flex-install:
${INSTALL_DIR} ${IDIR_FLEX}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/flex ${IDIR_FLEX}/usr/bin
@@ -26,4 +30,5 @@ flex-install:
${CP} ${WRKINST}/usr/lib/libfl.a \
${IDIR_FLEX_DEV}/usr/lib
+include ${TOPDIR}/mk/host-bottom.mk
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index af70e125f..d6d1bf3ce 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -52,14 +52,26 @@ glibc-dev-install:
# install linker script
-cp ./files/libc.so.$(CPU_ARCH) $(IDIR_GLIBC_DEV)/usr/lib/libc.so
ifeq ($(ADK_TARGET_ABI_O32),y)
+ifeq ($(ADK_big),y)
+ $(SED) "s#@@ELFFORMAT@@#elf32-tradbigmips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so
+else
$(SED) "s#@@ELFFORMAT@@#elf32-tradlittlemips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so
endif
+endif
ifeq ($(ADK_TARGET_ABI_N32),y)
+ifeq ($(ADK_big),y)
+ $(SED) "s#@@ELFFORMAT@@#elf32-ntradbigmips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so
+else
$(SED) "s#@@ELFFORMAT@@#elf32-ntradlittlemips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so
endif
+endif
ifeq ($(ADK_TARGET_ABI_N64),y)
+ifeq ($(ADK_big),y)
+ $(SED) "s#@@ELFFORMAT@@#elf64-tradbigmips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so
+else
$(SED) "s#@@ELFFORMAT@@#elf64-tradlittlemips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so
endif
+endif
${CP} ${STAGING_TARGET_DIR}/usr/lib/crt* ${IDIR_GLIBC_DEV}/usr/lib
${CP} ${STAGING_TARGET_DIR}/usr/lib/libc_nonshared.a ${IDIR_GLIBC_DEV}/usr/lib
-for file in libcrypt libdl libm libresolv libutil; do \
diff --git a/package/glibc/files/libc.so.i586 b/package/glibc/files/libc.so.i586
new file mode 100644
index 000000000..cd8724cc5
--- /dev/null
+++ b/package/glibc/files/libc.so.i586
@@ -0,0 +1,5 @@
+/* GNU ld script
+ Use the shared library, but some functions are only in
+ the static library, so try that secondarily. */
+OUTPUT_FORMAT(elf32-i386)
+GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.2 ) )
diff --git a/package/glibc/files/libc.so.i686 b/package/glibc/files/libc.so.i686
new file mode 100644
index 000000000..cd8724cc5
--- /dev/null
+++ b/package/glibc/files/libc.so.i686
@@ -0,0 +1,5 @@
+/* GNU ld script
+ Use the shared library, but some functions are only in
+ the static library, so try that secondarily. */
+OUTPUT_FORMAT(elf32-i386)
+GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.2 ) )
diff --git a/package/glibc/files/libc.so.mips b/package/glibc/files/libc.so.mips
new file mode 100644
index 000000000..9e73ea39c
--- /dev/null
+++ b/package/glibc/files/libc.so.mips
@@ -0,0 +1,5 @@
+/* GNU ld script
+ Use the shared library, but some functions are only in
+ the static library, so try that secondarily. */
+ OUTPUT_FORMAT(@@ELFTARGET@@)
+ GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld.so.1 ) )
diff --git a/package/glibc/files/libc.so.mips64 b/package/glibc/files/libc.so.mips64
new file mode 100644
index 000000000..9e73ea39c
--- /dev/null
+++ b/package/glibc/files/libc.so.mips64
@@ -0,0 +1,5 @@
+/* GNU ld script
+ Use the shared library, but some functions are only in
+ the static library, so try that secondarily. */
+ OUTPUT_FORMAT(@@ELFTARGET@@)
+ GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld.so.1 ) )
diff --git a/package/glibc/files/libc.so.mips64el b/package/glibc/files/libc.so.mips64el
new file mode 100644
index 000000000..9e73ea39c
--- /dev/null
+++ b/package/glibc/files/libc.so.mips64el
@@ -0,0 +1,5 @@
+/* GNU ld script
+ Use the shared library, but some functions are only in
+ the static library, so try that secondarily. */
+ OUTPUT_FORMAT(@@ELFTARGET@@)
+ GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld.so.1 ) )
diff --git a/package/glibc/files/libc.so.mipsel b/package/glibc/files/libc.so.mipsel
new file mode 100644
index 000000000..9e73ea39c
--- /dev/null
+++ b/package/glibc/files/libc.so.mipsel
@@ -0,0 +1,5 @@
+/* GNU ld script
+ Use the shared library, but some functions are only in
+ the static library, so try that secondarily. */
+ OUTPUT_FORMAT(@@ELFTARGET@@)
+ GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld.so.1 ) )
diff --git a/scripts/create.sh b/scripts/create.sh
index ef6e644ab..08800f0aa 100755
--- a/scripts/create.sh
+++ b/scripts/create.sh
@@ -297,7 +297,7 @@ fi
print "Creating ext2fs filesystem image..."
cd "$T"
f=0
-genext2fs -U -b $((partfssz)) -d src fsimg || f=1
+genext2fs -U -N 16384 -b $((partfssz)) -d src fsimg || f=1
if (( !f )); then
# use bc(1): this may be over the shell’s 32-bit arithmetics
wantsz=$($bc <<<"$((partfssz))*1024")
diff --git a/target/config/Config.in b/target/config/Config.in
index 9a40efa83..1995ec091 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -91,6 +91,7 @@ depends on ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS
config ADK_TARGET_ABI_N32
boolean "N32 ABI (new)"
select ADK_n32
+ depends on !ADK_TARGET_LIB_MUSL
config ADK_TARGET_ABI_O32
boolean "O32 ABI (old)"
@@ -99,6 +100,7 @@ config ADK_TARGET_ABI_O32
config ADK_TARGET_ABI_N64
boolean "N64 ABI"
select ADK_n64
+ depends on !ADK_TARGET_LIB_MUSL
endchoice
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 4532d4442..51b2dde0c 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -22,6 +22,7 @@ config ADK_RUNTIME_PASSWORD
config ADK_RUNTIME_TMPFS_SIZE
string "size of /tmp in memory (kB)"
+ default "16384" if ADK_HARDWARE_QEMU
default "32768" if ADK_TARGET_SYSTEM_IBM_X40
default "32768" if ADK_TARGET_SYSTEM_RASPBERRY_PI
default "2048"
diff --git a/toolchain/musl/patches/mips64.patch b/toolchain/musl/patches/mips64.patch
new file mode 100644
index 000000000..fdeb5017b
--- /dev/null
+++ b/toolchain/musl/patches/mips64.patch
@@ -0,0 +1,12 @@
+diff -Nur musl-0.9.14.orig/configure musl-0.9.14/configure
+--- musl-0.9.14.orig/configure 2013-09-23 23:01:11.000000000 +0200
++++ musl-0.9.14/configure 2013-11-09 20:16:14.000000000 +0100
+@@ -225,7 +225,7 @@
+ arm*) ARCH=arm ;;
+ i?86*) ARCH=i386 ;;
+ x86_64*) ARCH=x86_64 ;;
+-mips-*|mipsel-*) ARCH=mips ;;
++mips-*|mipsel-*|mips64-*|mips64el-*) ARCH=mips ;;
+ microblaze-*) ARCH=microblaze ;;
+ powerpc-*) ARCH=powerpc ;;
+ unknown) fail "$0: unable to detect target arch; try $0 --target=..." ;;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-13 05:55:30 +0000