Browse Source

Merge branch 'master' of git+ssh://openadk.org/git/openadk

Waldemar Brodkorb 12 years ago
parent
commit
f2da09bcd1
2 changed files with 7 additions and 7 deletions
  1. 6 6
      package/glibc/Makefile
  2. 1 1
      scripts/create.sh

+ 6 - 6
package/glibc/Makefile

@@ -53,23 +53,23 @@ glibc-dev-install:
 	-cp ./files/libc.so.$(CPU_ARCH) $(IDIR_GLIBC_DEV)/usr/lib/libc.so
 	-cp ./files/libc.so.$(CPU_ARCH) $(IDIR_GLIBC_DEV)/usr/lib/libc.so
 ifeq ($(ADK_TARGET_ABI_O32),y)
 ifeq ($(ADK_TARGET_ABI_O32),y)
 ifeq ($(ADK_big),y)
 ifeq ($(ADK_big),y)
-	$(SED) "s#@@ELFFORMAT@@#elf32-tradbigmips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so
+	$(SED) "s#@@ELFTARGET@@#elf32-tradbigmips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so
 else
 else
-	$(SED) "s#@@ELFFORMAT@@#elf32-tradlittlemips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so
+	$(SED) "s#@@ELFTARGET@@#elf32-tradlittlemips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so
 endif
 endif
 endif
 endif
 ifeq ($(ADK_TARGET_ABI_N32),y)
 ifeq ($(ADK_TARGET_ABI_N32),y)
 ifeq ($(ADK_big),y)
 ifeq ($(ADK_big),y)
-	$(SED) "s#@@ELFFORMAT@@#elf32-ntradbigmips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so
+	$(SED) "s#@@ELFTARGET@@#elf32-ntradbigmips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so
 else
 else
-	$(SED) "s#@@ELFFORMAT@@#elf32-ntradlittlemips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so
+	$(SED) "s#@@ELFTARGET@@#elf32-ntradlittlemips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so
 endif
 endif
 endif
 endif
 ifeq ($(ADK_TARGET_ABI_N64),y)
 ifeq ($(ADK_TARGET_ABI_N64),y)
 ifeq ($(ADK_big),y)
 ifeq ($(ADK_big),y)
-	$(SED) "s#@@ELFFORMAT@@#elf64-tradbigmips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so
+	$(SED) "s#@@ELFTARGET@@#elf64-tradbigmips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so
 else
 else
-	$(SED) "s#@@ELFFORMAT@@#elf64-tradlittlemips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so
+	$(SED) "s#@@ELFTARGET@@#elf64-tradlittlemips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so
 endif
 endif
 endif
 endif
 	${CP} ${STAGING_TARGET_DIR}/usr/lib/crt* ${IDIR_GLIBC_DEV}/usr/lib
 	${CP} ${STAGING_TARGET_DIR}/usr/lib/crt* ${IDIR_GLIBC_DEV}/usr/lib

+ 1 - 1
scripts/create.sh

@@ -297,7 +297,7 @@ fi
 print "Creating ext2fs filesystem image..."
 print "Creating ext2fs filesystem image..."
 cd "$T"
 cd "$T"
 f=0
 f=0
-genext2fs -U -N 16384 -b $((partfssz)) -d src fsimg || f=1
+genext2fs -U -N 32768 -b $((partfssz)) -d src fsimg || f=1
 if (( !f )); then
 if (( !f )); then
 	# use bc(1): this may be over the shell’s 32-bit arithmetics
 	# use bc(1): this may be over the shell’s 32-bit arithmetics
 	wantsz=$($bc <<<"$((partfssz))*1024")
 	wantsz=$($bc <<<"$((partfssz))*1024")