summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/strace/Makefile14
-rw-r--r--package/strace/patches/patch-Makefile_in21
-rw-r--r--package/strace/patches/patch-net_c10
-rw-r--r--package/strace/src/linux/crisv32/ioctlent.h.in1
-rw-r--r--package/strace/src/linux/crisv32/syscallent.h1
-rw-r--r--target/cris/Makefile15
-rw-r--r--target/cris/sys-available/qemu-crisv32 (renamed from target/cris/sys-available/qemu-cris)2
-rw-r--r--target/cris/uclibc.config.v3213
-rw-r--r--toolchain/gdb/Makefile.inc4
9 files changed, 42 insertions, 39 deletions
diff --git a/package/strace/Makefile b/package/strace/Makefile
index 8a0bfb694..548891921 100644
--- a/package/strace/Makefile
+++ b/package/strace/Makefile
@@ -4,23 +4,27 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= strace
-PKG_VERSION:= 4.5.20
+PKG_VERSION:= 4.6
PKG_RELEASE:= 1
-PKG_MD5SUM:= 64dfe10d9db0c1e34030891695ffca4b
+PKG_MD5SUM:= e537b2b1afeec70c0e6e27a0d0fd671e
PKG_DESCR:= System call trace program
PKG_SECTION:= debug
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=strace/}
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,STRACE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+ifeq ($(ADK_STATIC),y)
+TARGET_CFLAGS+= -static
+endif
+
INSTALL_STYLE:= manual
do-install:
- ${INSTALL_DIR} ${IDIR_STRACE}/usr/sbin/
- ${INSTALL_BIN} ${WRKBUILD}/strace ${IDIR_STRACE}/usr/sbin/
+ ${INSTALL_DIR} ${IDIR_STRACE}/usr/sbin
+ ${INSTALL_BIN} ${WRKBUILD}/strace ${IDIR_STRACE}/usr/sbin
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/strace/patches/patch-Makefile_in b/package/strace/patches/patch-Makefile_in
index c93da1102..38329e3ac 100644
--- a/package/strace/patches/patch-Makefile_in
+++ b/package/strace/patches/patch-Makefile_in
@@ -1,10 +1,11 @@
---- strace-4.5.20.orig/Makefile.in 2010-04-14 21:41:05.000000000 +0200
-+++ strace-4.5.20/Makefile.in 2010-12-28 22:43:17.000000000 +0100
-@@ -242,6 +242,7 @@ EXTRA_DIST = $(man_MANS) errnoent.sh sig
- linux/ioctlent.h linux/errnoent.h linux/signalent.h \
- linux/syscall.h linux/dummy.h \
- linux/i386/syscallent.h \
-+ linux/cris/syscallent.h \
- linux/alpha/errnoent.h linux/alpha/ioctlent.h \
- linux/alpha/signalent.h linux/alpha/syscallent.h \
- linux/arm/syscallent.h linux/arm/syscallent1.h \
+--- strace-4.6.orig/Makefile.in 2011-03-15 19:23:18.000000000 +0100
++++ strace-4.6/Makefile.in 2011-09-02 09:14:19.198484990 +0200
+@@ -270,7 +270,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = tests
++SUBDIRS =
+ man_MANS = strace.1
+ bin_SCRIPTS = strace-graph
+
diff --git a/package/strace/patches/patch-net_c b/package/strace/patches/patch-net_c
deleted file mode 100644
index a0dc31029..000000000
--- a/package/strace/patches/patch-net_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- strace-4.5.19.orig/net.c 2009-09-01 21:53:29.000000000 +0200
-+++ strace-4.5.19/net.c 2009-12-03 23:35:36.000000000 +0100
-@@ -53,6 +53,7 @@
- #include <net/if.h>
- #if defined(LINUX)
- #include <asm/types.h>
-+#include <linux/netlink.h>
- #if defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC__ + __GLIBC_MINOR__ >= 3)
- # include <netipx/ipx.h>
- #else
diff --git a/package/strace/src/linux/crisv32/ioctlent.h.in b/package/strace/src/linux/crisv32/ioctlent.h.in
new file mode 100644
index 000000000..52ac99ba0
--- /dev/null
+++ b/package/strace/src/linux/crisv32/ioctlent.h.in
@@ -0,0 +1 @@
+#include "../i386/ioctlent.h.in"
diff --git a/package/strace/src/linux/crisv32/syscallent.h b/package/strace/src/linux/crisv32/syscallent.h
new file mode 100644
index 000000000..d8dd9f7ab
--- /dev/null
+++ b/package/strace/src/linux/crisv32/syscallent.h
@@ -0,0 +1 @@
+#include "i386/syscallent.h"
diff --git a/target/cris/Makefile b/target/cris/Makefile
index 6b744a806..21cf33c85 100644
--- a/target/cris/Makefile
+++ b/target/cris/Makefile
@@ -7,7 +7,8 @@ include $(TOPDIR)/mk/modules.mk
include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
-KERNEL:=$(LINUX_DIR)/arch/cris/boot/zImage
+ZKERNEL:=$(LINUX_DIR)/arch/cris/boot/zImage
+KERNEL:=$(LINUX_DIR)/vmlinux
tools-compile:
$(MAKE) -C ../tools/mkfimage all
@@ -18,7 +19,7 @@ endif
$(INSTALL_BIN) ../tools/boot_linux $(BIN_DIR)/
kernel-install: tools-compile
- PATH='${TARGET_PATH}' mkfimage $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) $(MAKE_TRACE)
+ PATH='${TARGET_PATH}' mkfimage $(ZKERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) $(MAKE_TRACE)
${BUILD_DIR}/${ROOTFSSQUASHFS}: ${BUILD_DIR}/root.squashfs
cat ${BUILD_DIR}/${TARGET_KERNEL} ${BUILD_DIR}/root.squashfs \
@@ -47,6 +48,12 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
@echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_CRIS),y)
+ @echo "Use following command to create a QEMU Image:"
+ @echo "sudo ./scripts/create-image.sh -f ${ADK_TARGET_ROOTFS} qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
+ @echo "Start qemu with following command line:"
+ @echo 'qemu-system-cris -M axis-dev88 -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
+endif
endif
ifeq ($(ADK_TARGET_FS),initramfs)
imageinstall: $(BIN_DIR)/$(INITRAMFS)
@@ -55,7 +62,7 @@ imageinstall: $(BIN_DIR)/$(INITRAMFS)
@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
ifeq ($(ADK_TARGET_SYSTEM_QEMU_CRIS),y)
@echo "Start qemu with following command line:"
- @echo 'qemu-system-cris -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}'
+ @echo 'qemu-system-cris -M axis-dev88 -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}'
endif
endif
ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
@@ -64,6 +71,6 @@ imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs
@echo 'The kernel+initramfs file is: $(BIN_DIR)/${TARGET_KERNEL}'
ifeq ($(ADK_TARGET_SYSTEM_QEMU_CRIS),y)
@echo "Start qemu with following command line:"
- @echo 'qemu-system-cris -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL)'
+ @echo 'qemu-system-cris -M axis-dev88 -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL)'
endif
endif
diff --git a/target/cris/sys-available/qemu-cris b/target/cris/sys-available/qemu-crisv32
index 050fa1ce0..37ecbf9e8 100644
--- a/target/cris/sys-available/qemu-cris
+++ b/target/cris/sys-available/qemu-crisv32
@@ -5,11 +5,11 @@ config ADK_TARGET_SYSTEM_QEMU_CRIS
select ADK_CPU_CRIS_V32
select ADK_KERNEL_ETRAXFS
select ADK_KERNEL_MTD_MTDRAM
- select ADK_HARDWARE_QEMU
select ADK_TARGET_WITH_INPUT
select ADK_TARGET_WITH_PCI
select ADK_TARGET_WITH_HDD
select ADK_TARGET_WITH_MTD
+ select ADK_HARDWARE_QEMU
help
Support for Qemu Emulator (CRIS).
diff --git a/target/cris/uclibc.config.v32 b/target/cris/uclibc.config.v32
index e2c710242..8fab98eef 100644
--- a/target/cris/uclibc.config.v32
+++ b/target/cris/uclibc.config.v32
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Version: 0.9.32
-# Wed Aug 24 20:05:46 2011
+# Fri Sep 2 09:36:34 2011
#
# TARGET_alpha is not set
# TARGET_arm is not set
@@ -229,12 +229,11 @@ UCLIBC_BUILD_NOEXECSTACK=y
#
CROSS_COMPILER_PREFIX=""
UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-# DODEBUG_PT is not set
-DOSTRIP=y
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
+DODEBUG=y
+DODEBUG_PT=y
+DOASSERTS=y
+SUPPORT_LD_DEBUG=y
+SUPPORT_LD_DEBUG_EARLY=y
# UCLIBC_MALLOC_DEBUGGING is not set
# UCLIBC_HAS_BACKTRACE is not set
WARNINGS="-Wall"
diff --git a/toolchain/gdb/Makefile.inc b/toolchain/gdb/Makefile.inc
index c5d571a06..f5a40133e 100644
--- a/toolchain/gdb/Makefile.inc
+++ b/toolchain/gdb/Makefile.inc
@@ -2,8 +2,8 @@
# material, please see the LICENCE file in the top-level directory.
PKG_NAME:= gdb
-PKG_VERSION:= 7.1
-PKG_MD5SUM:= 21dce610476c054687b52770d2ddc657
+PKG_VERSION:= 7.3
+PKG_MD5SUM:= 485022b8df7ba2221f217e128f479fe7
PKG_RELEASE:= 1
PKG_SITES:= ${MASTER_SITE_GNU:=gdb/}
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-25 13:37:33 +0000