* [Buildroot] Pull request buildroot.git (vapier branch)
@ 2011-01-20 3:10 Mike Frysinger
2011-01-20 3:10 ` [Buildroot] [PATCH 1/4] libpcap: update static handling Mike Frysinger
0 siblings, 1 reply; 15+ messages in thread
From: Mike Frysinger @ 2011-01-20 3:10 UTC (permalink / raw)
To: buildroot
The following changes since commit c2abc61d028b9e9cc602108ce1ad03942092bed2:
tcpdump: add patch for nommu systems (2011-01-19 22:52:30 +0100)
are available in the git repository at:
git://sources.blackfin.uclinux.org/git/users/vapier/buildroot.git vapier
Mike Frysinger (4):
libpcap: update static handling
debugging: do not require no stripping
initial support for Blackfin processors
gdb: add support for Blackfin gdbserver
Config.in | 4 +-
Makefile | 1 +
boot/u-boot/Config.in | 4 +
boot/u-boot/u-boot.mk | 2 +
linux/Config.in | 2 +-
linux/linux.mk | 5 +
package/libpcap/libpcap.mk | 6 +-
target/Config.in.arch | 19 ++-
toolchain/gdb/6.6/gdb-6.6-bfin-gdbserver.patch | 238 ++++++++++++++++++++++++
toolchain/gdb/Config.in | 7 +-
toolchain/toolchain-common.in | 2 +-
11 files changed, 277 insertions(+), 13 deletions(-)
create mode 100644 toolchain/gdb/6.6/gdb-6.6-bfin-gdbserver.patch
^ permalink raw reply [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 1/4] libpcap: update static handling 2011-01-20 3:10 [Buildroot] Pull request buildroot.git (vapier branch) Mike Frysinger @ 2011-01-20 3:10 ` Mike Frysinger 2011-01-20 3:10 ` [Buildroot] [PATCH 2/4] debugging: do not require no stripping Mike Frysinger ` (4 more replies) 0 siblings, 5 replies; 15+ messages in thread From: Mike Frysinger @ 2011-01-20 3:10 UTC (permalink / raw) To: buildroot The new version of libpcap changed how its install targets work. The main "install" target now always depends on "install-shared", so we need to force the DYEXT variable to "none" in order to bypass shared. Signed-off-by: Mike Frysinger <vapier@gentoo.org> --- package/libpcap/libpcap.mk | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index eebfc03..1c5f6e6 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -8,12 +8,8 @@ LIBPCAP_VERSION:=1.1.1 LIBPCAP_SITE:=http://www.tcpdump.org/release LIBPCAP_SOURCE:=libpcap-$(LIBPCAP_VERSION).tar.gz LIBPCAP_INSTALL_STAGING:=YES -# doesn't have an install-strip -LIBPCAP_INSTALL_TARGET_OPT= DESTDIR="$(TARGET_DIR)" \ - $(if $(BR2_PREFER_STATIC_LIB),install,install-shared) -LIBPCAP_INSTALL_STAGING_OPT= DESTDIR="$(STAGING_DIR)" install \ - $(if $(BR2_PREFER_STATIC_LIB),,install-shared) LIBPCAP_DEPENDENCIES:=zlib +LIBPCAP_MAKE_OPT:=DYEXT=none LIBPCAP_CONF_ENV:=ac_cv_linux_vers=$(firstword $(subst .,$(space),$(firstword $(call qstrip,$(BR2_DEFAULT_KERNEL_HEADERS))))) \ ac_cv_header_linux_wireless_h=yes # configure misdetects this LIBPCAP_CONF_OPT:=--disable-yydebug --with-pcap=linux -- 1.7.4.rc2 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 2/4] debugging: do not require no stripping 2011-01-20 3:10 ` [Buildroot] [PATCH 1/4] libpcap: update static handling Mike Frysinger @ 2011-01-20 3:10 ` Mike Frysinger 2011-01-20 3:10 ` [Buildroot] [PATCH 3/4] initial support for Blackfin processors Mike Frysinger ` (3 subsequent siblings) 4 siblings, 0 replies; 15+ messages in thread From: Mike Frysinger @ 2011-01-20 3:10 UTC (permalink / raw) To: buildroot The stripping options operate on the final image and not the intermediate builds, so requiring stripping to be disabled just to enable debugging options doesn't make much sense. Especially when working with gdbserver: only the host needs the debugging information to be available. The board can run & debug perfectly fine without it. Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> --- Config.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.in b/Config.in index df0c7ce..a1cc57a 100644 --- a/Config.in +++ b/Config.in @@ -209,14 +209,14 @@ choice config BR2_STRIP_strip bool "strip" - depends on !BR2_ENABLE_DEBUG && !BR2_ELF2FLT + depends on !BR2_ELF2FLT help strip is the normal strip command config BR2_STRIP_sstrip bool "sstrip" select BR2_PACKAGE_SSTRIP_HOST - depends on !BR2_ENABLE_DEBUG && !BR2_ELF2FLT + depends on !BR2_ELF2FLT help sstrip is a strip that discards more than the normal strip -- 1.7.4.rc2 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 3/4] initial support for Blackfin processors 2011-01-20 3:10 ` [Buildroot] [PATCH 1/4] libpcap: update static handling Mike Frysinger 2011-01-20 3:10 ` [Buildroot] [PATCH 2/4] debugging: do not require no stripping Mike Frysinger @ 2011-01-20 3:10 ` Mike Frysinger 2011-01-20 3:10 ` [Buildroot] [PATCH 4/4] gdb: add support for Blackfin gdbserver Mike Frysinger ` (2 subsequent siblings) 4 siblings, 0 replies; 15+ messages in thread From: Mike Frysinger @ 2011-01-20 3:10 UTC (permalink / raw) To: buildroot Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> --- Makefile | 1 + boot/u-boot/Config.in | 4 ++++ boot/u-boot/u-boot.mk | 2 ++ linux/Config.in | 2 +- linux/linux.mk | 5 +++++ target/Config.in.arch | 19 ++++++++++++++++++- toolchain/toolchain-common.in | 2 +- 7 files changed, 32 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index cf2a7dc..f39a355 100644 --- a/Makefile +++ b/Makefile @@ -263,6 +263,7 @@ endif KERNEL_ARCH:=$(shell echo "$(ARCH)" | sed -e "s/-.*//" \ -e s/i.86/i386/ -e s/sun4u/sparc64/ \ -e s/arm.*/arm/ -e s/sa110/arm/ \ + -e s/bfin/blackfin/ \ -e s/parisc64/parisc/ \ -e s/powerpc64/powerpc/ \ -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ diff --git a/boot/u-boot/Config.in b/boot/u-boot/Config.in index 60aeb1a..78c03ff 100644 --- a/boot/u-boot/Config.in +++ b/boot/u-boot/Config.in @@ -75,6 +75,10 @@ config BR2_TARGET_UBOOT_FORMAT_KWB depends on BR2_arm bool "u-boot.kwb (Marvell)" +config BR2_TARGET_UBOOT_FORMAT_LDR + depends on BR2_bfin + bool "u-boot.ldr" + endchoice config BR2_TARGET_UBOOT_TOOL_MKIMAGE diff --git a/boot/u-boot/u-boot.mk b/boot/u-boot/u-boot.mk index d520bb8..7c67d97 100644 --- a/boot/u-boot/u-boot.mk +++ b/boot/u-boot/u-boot.mk @@ -31,6 +31,8 @@ U_BOOT_CAT:=$(BZCAT) ifeq ($(BR2_TARGET_UBOOT_FORMAT_KWB),y) U_BOOT_BIN:=u-boot.kwb U_BOOT_MAKE_OPT:=$(U_BOOT_BIN) +else ifeq ($(BR2_TARGET_UBOOT_FORMAT_LDR),y) +U_BOOT_BIN:=u-boot.ldr else U_BOOT_BIN:=u-boot.bin endif diff --git a/linux/Config.in b/linux/Config.in index 17aa29a..bdb1abe 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -115,7 +115,7 @@ choice config BR2_LINUX_KERNEL_UIMAGE bool "uImage" - depends on BR2_arm || BR2_armeb || BR2_powerpc || BR2_avr32 || BR2_sh || BR2_sh64 + depends on BR2_arm || BR2_armeb || BR2_bfin || BR2_powerpc || BR2_avr32 || BR2_sh || BR2_sh64 config BR2_LINUX_KERNEL_BZIMAGE bool "bzImage" diff --git a/linux/linux.mk b/linux/linux.mk index d3c06db..68b43d3 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -31,7 +31,12 @@ LINUX26_MAKE_FLAGS = \ LINUX26_VERSION_PROBED = $(shell $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) --no-print-directory -s kernelrelease) ifeq ($(BR2_LINUX_KERNEL_UIMAGE),y) +ifeq ($(KERNEL_ARCH),blackfin) +# a uImage, but with a diff file name +LINUX26_IMAGE_NAME=vmImage +else LINUX26_IMAGE_NAME=uImage +endif LINUX26_DEPENDENCIES+=$(MKIMAGE) else ifeq ($(BR2_LINUX_KERNEL_BZIMAGE),y) LINUX26_IMAGE_NAME=bzImage diff --git a/target/Config.in.arch b/target/Config.in.arch index 0774d55..7c80945 100644 --- a/target/Config.in.arch +++ b/target/Config.in.arch @@ -14,6 +14,8 @@ config BR2_armeb config BR2_avr32 bool "avr32" select BR2_SOFT_FLOAT +config BR2_bfin + bool "bfin" config BR2_i386 bool "i386" config BR2_m68k @@ -128,6 +130,20 @@ config BR2_ARM_OABI endchoice choice + prompt "Target ABI" + depends on BR2_bfin + default BR2_BFIN_FLAT +config BR2_BFIN_FDPIC + bool "FDPIC" +config BR2_BFIN_FLAT + bool "FLAT" +config BR2_BFIN_FLAT_SEP_DATA + bool "FLAT (Separate data)" +config BR2_BFIN_SHARED_FLAT + bool "Shared FLAT" +endchoice + +choice prompt "Target Architecture Variant" depends on BR2_mips || BR2_mipsel default BR2_mips_3 if BR2_mips @@ -444,6 +460,7 @@ config BR2_ARCH default "arm" if BR2_arm default "armeb" if BR2_armeb default "avr32" if BR2_avr32 + default "bfin" if BR2_bfin default "i386" if BR2_x86_i386 default "i486" if BR2_x86_i486 default "i586" if BR2_x86_i586 @@ -485,7 +502,7 @@ config BR2_ARCH config BR2_ENDIAN string - default "LITTLE" if BR2_arm || BR2_i386 || BR2_mipsel || \ + default "LITTLE" if BR2_arm || BR2_bfin || BR2_i386 || BR2_mipsel || \ BR2_sh3 || BR2_sh4 || BR2_x86_64 || BR2_sh64 default "BIG" if BR2_armeb || BR2_avr32 || BR2_m68k || BR2_mips || \ BR2_powerpc || BR2_sh2a_nofpueb || BR2_sh2eb || \ diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in index eb3628a..cdfd56a 100644 --- a/toolchain/toolchain-common.in +++ b/toolchain/toolchain-common.in @@ -67,7 +67,7 @@ config BR2_NEEDS_GETTEXT_IF_LOCALE default y if (BR2_NEEDS_GETTEXT && BR2_ENABLE_LOCALE) config BR2_USE_MMU - bool "Enable MMU support" if BR2_arm || BR2_armeb || BR2_mips || BR2_mipsel || BR2_sh || BR2_xtensa + bool "Enable MMU support" if BR2_arm || BR2_armeb || BR2_bfin || BR2_mips || BR2_mipsel || BR2_sh || BR2_xtensa default y help If your target has a MMU, you should say Y here. If you -- 1.7.4.rc2 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 4/4] gdb: add support for Blackfin gdbserver 2011-01-20 3:10 ` [Buildroot] [PATCH 1/4] libpcap: update static handling Mike Frysinger 2011-01-20 3:10 ` [Buildroot] [PATCH 2/4] debugging: do not require no stripping Mike Frysinger 2011-01-20 3:10 ` [Buildroot] [PATCH 3/4] initial support for Blackfin processors Mike Frysinger @ 2011-01-20 3:10 ` Mike Frysinger 2011-01-23 10:17 ` [Buildroot] [PATCH 1/4] libpcap: update static handling Peter Korsgaard 2011-01-24 16:11 ` Thomas Petazzoni 4 siblings, 0 replies; 15+ messages in thread From: Mike Frysinger @ 2011-01-20 3:10 UTC (permalink / raw) To: buildroot This requires removing "deprecated" markings from gdb-6.6, but this isn't that big of a deal. That is the last version with Blackfin support at the moment and we're in the process of getting mainlined. Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> --- toolchain/gdb/6.6/gdb-6.6-bfin-gdbserver.patch | 238 ++++++++++++++++++++++++ toolchain/gdb/Config.in | 7 +- 2 files changed, 242 insertions(+), 3 deletions(-) create mode 100644 toolchain/gdb/6.6/gdb-6.6-bfin-gdbserver.patch diff --git a/toolchain/gdb/6.6/gdb-6.6-bfin-gdbserver.patch b/toolchain/gdb/6.6/gdb-6.6-bfin-gdbserver.patch new file mode 100644 index 0000000..65c4b90 --- /dev/null +++ b/toolchain/gdb/6.6/gdb-6.6-bfin-gdbserver.patch @@ -0,0 +1,238 @@ +--- gdb-6.6/gdb/gdbserver/configure.srv ++++ gdb-6.6/gdb/gdbserver/configure.srv +@@ -23,6 +23,11 @@ case "${target}" in + srv_linux_usrregs=yes + srv_linux_thread_db=yes + ;; ++ bfin-*-*) srv_regobj=reg-bfin.o ++ srv_tgtobj="linux-low.o linux-bfin-low.o" ++ srv_linux_usrregs=yes ++ srv_linux_thread_db=yes ++ ;; + crisv32-*-linux*) srv_regobj=reg-crisv32.o + srv_tgtobj="linux-low.o linux-crisv32-low.o" + srv_linux_regsets=yes +--- gdb-6.6/gdb/gdbserver/linux-bfin-low.c ++++ gdb-6.6/gdb/gdbserver/linux-bfin-low.c +@@ -0,0 +1,101 @@ ++/* GNU/Linux/BFIN specific low level interface, for the remote server for GDB. ++ ++ Copyright (C) 2005 Free Software Foundation, Inc. ++ Contributed by Analog Devices. ++ ++ This file is part of GDB. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ Boston, MA 02110-1301, USA. */ ++ ++#include "server.h" ++#include "linux-low.h" ++#include <asm/ptrace.h> ++ ++static int bfin_regmap[] = ++{ ++ PT_R0, PT_R1, PT_R2, PT_R3, PT_R4, PT_R5, PT_R6, PT_R7, ++ PT_P0, PT_P1, PT_P2, PT_P3, PT_P4, PT_P5, PT_USP, PT_FP, ++ PT_I0, PT_I1, PT_I2, PT_I3, PT_M0, PT_M1, PT_M2, PT_M3, ++ PT_B0, PT_B1, PT_B2, PT_B3, PT_L0, PT_L1, PT_L2, PT_L3, ++ PT_A0X, PT_A0W, PT_A1X, PT_A1W, PT_ASTAT, PT_RETS, ++ PT_LC0, PT_LT0, PT_LB0, PT_LC1, PT_LT1, PT_LB1, ++ -1 /* PT_CYCLES */, -1 /* PT_CYCLES2 */, ++ -1 /* PT_USP */, PT_SEQSTAT, PT_SYSCFG, PT_PC, PT_RETX, PT_RETN, PT_RETE, ++ PT_PC, -1 /* PT_CC */, PT_TEXT_ADDR, PT_TEXT_END_ADDR, PT_DATA_ADDR, ++ PT_FDPIC_EXEC, PT_FDPIC_INTERP, ++ PT_IPEND ++}; ++ ++#define bfin_num_regs (sizeof(bfin_regmap) / sizeof(bfin_regmap[0])) ++ ++static int ++bfin_cannot_store_register (int regno) ++{ ++ return (regno >= bfin_num_regs); ++} ++ ++static int ++bfin_cannot_fetch_register (int regno) ++{ ++ return (regno >= bfin_num_regs); ++} ++ ++static CORE_ADDR ++bfin_get_pc () ++{ ++ unsigned long pc; ++ collect_register_by_name ("pc", &pc); ++ return pc; ++} ++ ++static void ++bfin_set_pc (CORE_ADDR pc) ++{ ++ unsigned long newpc = pc; ++ supply_register_by_name ("pc", &newpc); ++} ++ ++#define bfin_breakpoint_len 2 ++static const unsigned char bfin_breakpoint[bfin_breakpoint_len]={0xa1, 0x00}; ++ ++static int ++bfin_breakpoint_at (CORE_ADDR where) ++{ ++ unsigned char insn[bfin_breakpoint_len]; ++ ++ read_inferior_memory(where, insn, bfin_breakpoint_len); ++ if (insn[0] == bfin_breakpoint[0] ++ && insn[1] == bfin_breakpoint[1]) ++ return 1; ++ ++ /* If necessary, recognize more trap instructions here. GDB only uses the ++ one. */ ++ return 0; ++} ++ ++struct linux_target_ops the_low_target = { ++ bfin_num_regs, ++ bfin_regmap, ++ bfin_cannot_fetch_register, ++ bfin_cannot_store_register, ++ bfin_get_pc, ++ bfin_set_pc, ++ bfin_breakpoint, ++ bfin_breakpoint_len, ++ 0, ++ 2, ++ bfin_breakpoint_at, ++}; +--- gdb-6.6/gdb/gdbserver/linux-low.c ++++ gdb-6.6/gdb/gdbserver/linux-low.c +@@ -1592,6 +1592,10 @@ linux_stopped_data_address (void) + #define PT_TEXT_ADDR 49*4 + #define PT_DATA_ADDR 50*4 + #define PT_TEXT_END_ADDR 51*4 ++#elif defined(BFIN) ++#define PT_TEXT_ADDR 220 ++#define PT_TEXT_END_ADDR 224 ++#define PT_DATA_ADDR 228 + #endif + + /* Under uClinux, programs are loaded at non-zero offsets, which we need +--- gdb-6.6/gdb/gdbserver/Makefile.in ++++ gdb-6.6/gdb/gdbserver/Makefile.in +@@ -119,9 +119,9 @@ SFILES= $(srcdir)/gdbreplay.c $(srcdir)/ + $(srcdir)/mem-break.c $(srcdir)/proc-service.c $(srcdir)/regcache.c \ + $(srcdir)/remote-utils.c $(srcdir)/server.c $(srcdir)/target.c \ + $(srcdir)/thread-db.c $(srcdir)/utils.c \ +- $(srcdir)/linux-arm-low.c $(srcdir)/linux-cris-low.c \ +- $(srcdir)/linux-crisv32-low.c $(srcdir)/linux-i386-low.c \ +- $(srcdir)/i387-fp.c \ ++ $(srcdir)/linux-arm-low.c $(srcdir)/linux-bfin-low.c \ ++ $(srcdir)/linux-cris-low.c $(srcdir)/linux-crisv32-low.c \ ++ $(srcdir)/linux-i386-low.c $(srcdir)/i387-fp.c \ + $(srcdir)/linux-ia64-low.c $(srcdir)/linux-low.c \ + $(srcdir)/linux-m32r-low.c \ + $(srcdir)/linux-m68k-low.c $(srcdir)/linux-mips-low.c \ +@@ -207,6 +207,7 @@ clean: + rm -f reg-arm.c reg-i386.c reg-ia64.c reg-m32r.c reg-m68k.c reg-mips.c + rm -f reg-ppc.c reg-sh.c reg-spu.c reg-x86-64.c reg-i386-linux.c + rm -f reg-cris.c reg-crisv32.c reg-x86-64-linux.c ++ rm -f reg-bfin.c + + maintainer-clean realclean distclean: clean + rm -f nm.h tm.h xm.h config.status config.h stamp-h config.log +@@ -272,6 +273,7 @@ linux-low.o: linux-low.c $(linux_low_h) + + linux-arm-low.o: linux-arm-low.c $(linux_low_h) $(server_h) \ + $(gdb_proc_service_h) ++linux-bfin-low.o: linux-bfin-low.c $(linux_low_h) $(server_h) + linux-cris-low.o: linux-cris-low.c $(linux_low_h) $(server_h) + linux-crisv32-low.o: linux-crisv32-low.c $(linux_low_h) $(server_h) + linux-i386-low.o: linux-i386-low.c $(linux_low_h) $(server_h) \ +@@ -294,6 +297,9 @@ spu-low.o: spu-low.c $(server_h) + reg-arm.o : reg-arm.c $(regdef_h) + reg-arm.c : $(srcdir)/../regformats/reg-arm.dat $(regdat_sh) + sh $(regdat_sh) $(srcdir)/../regformats/reg-arm.dat reg-arm.c ++reg-bfin.o : reg-bfin.c $(regdef_h) ++reg-bfin.c : $(srcdir)/../regformats/reg-bfin.dat $(regdat_sh) ++ sh $(regdat_sh) $(srcdir)/../regformats/reg-bfin.dat reg-bfin.c + reg-cris.o : reg-cris.c $(regdef_h) + reg-cris.c : $(srcdir)/../regformats/reg-cris.dat $(regdat_sh) + sh $(regdat_sh) $(srcdir)/../regformats/reg-cris.dat reg-cris.c +--- gdb-6.6/gdb/regformats/reg-bfin.dat ++++ gdb-6.6/gdb/regformats/reg-bfin.dat +@@ -0,0 +1,63 @@ ++name:bfin ++expedite:pc,sp,fp ++32:r0 ++32:r1 ++32:r2 ++32:r3 ++32:r4 ++32:r5 ++32:r6 ++32:r7 ++32:p0 ++32:p1 ++32:p2 ++32:p3 ++32:p4 ++32:p5 ++32:sp ++32:fp ++32:i0 ++32:i1 ++32:i2 ++32:i3 ++32:m0 ++32:m1 ++32:m2 ++32:m3 ++32:b0 ++32:b1 ++32:b2 ++32:b3 ++32:l0 ++32:l1 ++32:l2 ++32:l3 ++32:a0x ++32:a0w ++32:a1x ++32:a1w ++32:astat ++32:rets ++32:lc0 ++32:lt0 ++32:lb0 ++32:lc1 ++32:lt1 ++32:lb1 ++32:cycles ++32:cycles2 ++32:usp ++32:seqstat ++32:syscfg ++32:reti ++32:retx ++32:retn ++32:rete ++32:pc ++32:cc ++32:text_addr ++32:text_end_addr ++32:data_addr ++32:fdpic_exec ++32:fdpic_interp ++32:ipend diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in index b45de9a..f7347ad 100644 --- a/toolchain/gdb/Config.in +++ b/toolchain/gdb/Config.in @@ -35,10 +35,9 @@ choice config BR2_GDB_VERSION_6_6 bool "gdb 6.6" depends on !BR2_avr32 - depends on BR2_DEPRECATED config BR2_GDB_VERSION_6_7_1 - depends on !BR2_avr32 + depends on !(BR2_avr32 || BR2_bfin) bool "gdb 6.7.1" config BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 @@ -47,14 +46,16 @@ choice config BR2_GDB_VERSION_6_8 bool "gdb 6.8" - depends on !BR2_avr32 + depends on !(BR2_avr32 || BR2_bfin) config BR2_GDB_VERSION_7_0_1 bool "gdb 7.0.1" + depends on !BR2_bfin select BR2_PTHREAD_DEBUG if !BR2_PTHREADS_NONE config BR2_GDB_VERSION_7_1 bool "gdb 7.1" + depends on !BR2_bfin select BR2_PTHREAD_DEBUG if !BR2_PTHREADS_NONE endchoice -- 1.7.4.rc2 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 1/4] libpcap: update static handling 2011-01-20 3:10 ` [Buildroot] [PATCH 1/4] libpcap: update static handling Mike Frysinger ` (2 preceding siblings ...) 2011-01-20 3:10 ` [Buildroot] [PATCH 4/4] gdb: add support for Blackfin gdbserver Mike Frysinger @ 2011-01-23 10:17 ` Peter Korsgaard 2011-01-23 21:07 ` Mike Frysinger 2011-01-24 16:11 ` Thomas Petazzoni 4 siblings, 1 reply; 15+ messages in thread From: Peter Korsgaard @ 2011-01-23 10:17 UTC (permalink / raw) To: buildroot >>>>> "Mike" == Mike Frysinger <vapier@gentoo.org> writes: Mike> The new version of libpcap changed how its install targets work. The Mike> main "install" target now always depends on "install-shared", so we Mike> need to force the DYEXT variable to "none" in order to bypass shared. Does that then still install the shared lib for normal (!PREFER_STATIC_LIB) builds, or should this only be passed for the static case? Mike> +++ b/package/libpcap/libpcap.mk Mike> @@ -8,12 +8,8 @@ LIBPCAP_VERSION:=1.1.1 Mike> LIBPCAP_SITE:=http://www.tcpdump.org/release Mike> LIBPCAP_SOURCE:=libpcap-$(LIBPCAP_VERSION).tar.gz Mike> LIBPCAP_INSTALL_STAGING:=YES Mike> -# doesn't have an install-strip Mike> -LIBPCAP_INSTALL_TARGET_OPT= DESTDIR="$(TARGET_DIR)" \ Mike> - $(if $(BR2_PREFER_STATIC_LIB),install,install-shared) Mike> -LIBPCAP_INSTALL_STAGING_OPT= DESTDIR="$(STAGING_DIR)" install \ Mike> - $(if $(BR2_PREFER_STATIC_LIB),,install-shared) Mike> LIBPCAP_DEPENDENCIES:=zlib Mike> +LIBPCAP_MAKE_OPT:=DYEXT=none -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 1/4] libpcap: update static handling 2011-01-23 10:17 ` [Buildroot] [PATCH 1/4] libpcap: update static handling Peter Korsgaard @ 2011-01-23 21:07 ` Mike Frysinger 2011-01-24 16:16 ` Thomas Petazzoni 0 siblings, 1 reply; 15+ messages in thread From: Mike Frysinger @ 2011-01-23 21:07 UTC (permalink / raw) To: buildroot On Sunday, January 23, 2011 05:17:43 Peter Korsgaard wrote: > >>>>> "Mike" == Mike Frysinger <vapier@gentoo.org> writes: > Mike> The new version of libpcap changed how its install targets work. > The Mike> main "install" target now always depends on "install-shared", so > we Mike> need to force the DYEXT variable to "none" in order to bypass > shared. > > Does that then still install the shared lib for normal > (!PREFER_STATIC_LIB) builds, or should this only be passed for the > static case? hmm, well Thomas' suggestion before doesnt work ... the current autotools Makefile only adds $(PKG)_MAKE_OPT to the build step instead of all the steps. so ignore this patch until that can be fixed. the other 3 patches in this set dont require this one -mike -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: This is a digitally signed message part. URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20110123/70542dc5/attachment.asc> ^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 1/4] libpcap: update static handling 2011-01-23 21:07 ` Mike Frysinger @ 2011-01-24 16:16 ` Thomas Petazzoni 2011-01-24 16:27 ` Peter Korsgaard 2011-01-24 21:48 ` Mike Frysinger 0 siblings, 2 replies; 15+ messages in thread From: Thomas Petazzoni @ 2011-01-24 16:16 UTC (permalink / raw) To: buildroot On Sun, 23 Jan 2011 16:07:30 -0500 Mike Frysinger <vapier@gentoo.org> wrote: > hmm, well Thomas' suggestion before doesnt work ... the current autotools > Makefile only adds $(PKG)_MAKE_OPT to the build step instead of all the steps. > so ignore this patch until that can be fixed. For the moment: $(PKG)_MAKE_OPT is passed at build time for target and host packages (maybe we should rename it $(PKG)_BUILD_MAKE_OPT, or pass it during all steps) $(PKG)_INSTALL_STAGING_OPT is passed at staging installation time for target packages $(PKG)_INSTALL_TARGET_OPT is passed at target installation time for target packages So in your case you probably need to do something like: LIBPCAP_INSTALL_STAGING_OPT = DYEXT=none DESTDIR="$(STAGING_DIR)" install LIBPCAP_INSTALL_TARGET_OPT = DYEXT=none DESTDIR="$(TARGET_DIR)" install Regards, Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: not available URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20110124/4e46cae6/attachment.asc> ^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 1/4] libpcap: update static handling 2011-01-24 16:16 ` Thomas Petazzoni @ 2011-01-24 16:27 ` Peter Korsgaard 2011-01-24 21:48 ` Mike Frysinger 1 sibling, 0 replies; 15+ messages in thread From: Peter Korsgaard @ 2011-01-24 16:27 UTC (permalink / raw) To: buildroot >>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: Hi, Thomas> So in your case you probably need to do something like: Thomas> LIBPCAP_INSTALL_STAGING_OPT = DYEXT=none DESTDIR="$(STAGING_DIR)" install Thomas> LIBPCAP_INSTALL_TARGET_OPT = DYEXT=none DESTDIR="$(TARGET_DIR)" install And presumably only for the BR2_PREFER_STATIC_LIB case. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 1/4] libpcap: update static handling 2011-01-24 16:16 ` Thomas Petazzoni 2011-01-24 16:27 ` Peter Korsgaard @ 2011-01-24 21:48 ` Mike Frysinger 2011-01-24 21:59 ` Peter Korsgaard 2011-01-25 8:36 ` Thomas Petazzoni 1 sibling, 2 replies; 15+ messages in thread From: Mike Frysinger @ 2011-01-24 21:48 UTC (permalink / raw) To: buildroot On Monday, January 24, 2011 11:16:42 Thomas Petazzoni wrote: > On Sun, 23 Jan 2011 16:07:30 -0500 Mike Frysinger wrote: > > hmm, well Thomas' suggestion before doesnt work ... the current autotools > > Makefile only adds $(PKG)_MAKE_OPT to the build step instead of all the > > steps. so ignore this patch until that can be fixed. > > For the moment: > > $(PKG)_MAKE_OPT is passed at build time for target and host packages > (maybe we should rename it $(PKG)_BUILD_MAKE_OPT, or pass it during all > steps) > > $(PKG)_INSTALL_STAGING_OPT is passed at staging installation time for > target packages > > $(PKG)_INSTALL_TARGET_OPT is passed at target installation time for > target packages > > So in your case you probably need to do something like: > > LIBPCAP_INSTALL_STAGING_OPT = DYEXT=none DESTDIR="$(STAGING_DIR)" install > LIBPCAP_INSTALL_TARGET_OPT = DYEXT=none DESTDIR="$(TARGET_DIR)" install yes, that would make it work, but that just makes me want to cry. it makes a lot more sense imo to have $(PKG)_MAKE_OPT be passed for all steps (and grepping the tree doesnt show any cases where this would be a problem). if people still want a hook specific to the build step, then it'd make sense to add $(PKG)_BUILD_OPT or something similiar. -mike -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: This is a digitally signed message part. URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20110124/29accfff/attachment.asc> ^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 1/4] libpcap: update static handling 2011-01-24 21:48 ` Mike Frysinger @ 2011-01-24 21:59 ` Peter Korsgaard 2011-01-25 8:36 ` Thomas Petazzoni 1 sibling, 0 replies; 15+ messages in thread From: Peter Korsgaard @ 2011-01-24 21:59 UTC (permalink / raw) To: buildroot >>>>> "Mike" == Mike Frysinger <vapier@gentoo.org> writes: >> LIBPCAP_INSTALL_STAGING_OPT = DYEXT=none DESTDIR="$(STAGING_DIR)" install >> LIBPCAP_INSTALL_TARGET_OPT = DYEXT=none DESTDIR="$(TARGET_DIR)" install Mike> yes, that would make it work, but that just makes me want to cry. Mike> it makes a lot more sense imo to have $(PKG)_MAKE_OPT be passed Mike> for all steps (and grepping the tree doesnt show any cases where Mike> this would be a problem). if people still want a hook specific Mike> to the build step, then it'd make sense to add $(PKG)_BUILD_OPT Mike> or something similiar. Yeah, similar to the recent patch to pass $PKG_MAKE_ENV for host packages Thomas sent earlier today. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 1/4] libpcap: update static handling 2011-01-24 21:48 ` Mike Frysinger 2011-01-24 21:59 ` Peter Korsgaard @ 2011-01-25 8:36 ` Thomas Petazzoni 1 sibling, 0 replies; 15+ messages in thread From: Thomas Petazzoni @ 2011-01-25 8:36 UTC (permalink / raw) To: buildroot On Mon, 24 Jan 2011 16:48:15 -0500 Mike Frysinger <vapier@gentoo.org> wrote: > yes, that would make it work, but that just makes me want to cry. it makes a > lot more sense imo to have $(PKG)_MAKE_OPT be passed for all steps (and > grepping the tree doesnt show any cases where this would be a problem). if > people still want a hook specific to the build step, then it'd make sense to > add $(PKG)_BUILD_OPT or something similiar. Yes, this makes sense. Regards, Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: not available URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20110125/60578555/attachment.asc> ^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 1/4] libpcap: update static handling 2011-01-20 3:10 ` [Buildroot] [PATCH 1/4] libpcap: update static handling Mike Frysinger ` (3 preceding siblings ...) 2011-01-23 10:17 ` [Buildroot] [PATCH 1/4] libpcap: update static handling Peter Korsgaard @ 2011-01-24 16:11 ` Thomas Petazzoni 2011-01-24 16:25 ` Peter Korsgaard 4 siblings, 1 reply; 15+ messages in thread From: Thomas Petazzoni @ 2011-01-24 16:11 UTC (permalink / raw) To: buildroot Hello, Completely unrelated to Mike's change, but still spotted while looking at the patch context: On Wed, 19 Jan 2011 22:10:29 -0500 Mike Frysinger <vapier@gentoo.org> wrote: > LIBPCAP_CONF_ENV:=ac_cv_linux_vers=$(firstword $(subst .,$(space),$(firstword $(call qstrip,$(BR2_DEFAULT_KERNEL_HEADERS))))) \ Both libpcap and tcpdump use this and I never noticed, but this is completely broken with external toolchains and the Crosstool-NG backend, since BR2_DEFAULT_KERNEL_HEADERS is only set with internal toolchains. I haven't thought of what the right fix would be, but it's definitely not that one. Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 1/4] libpcap: update static handling 2011-01-24 16:11 ` Thomas Petazzoni @ 2011-01-24 16:25 ` Peter Korsgaard 2011-01-24 21:46 ` Mike Frysinger 0 siblings, 1 reply; 15+ messages in thread From: Peter Korsgaard @ 2011-01-24 16:25 UTC (permalink / raw) To: buildroot >>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: Thomas> Hello, Thomas> Completely unrelated to Mike's change, but still spotted while looking Thomas> at the patch context: Thomas> On Wed, 19 Jan 2011 22:10:29 -0500 Thomas> Mike Frysinger <vapier@gentoo.org> wrote: >> LIBPCAP_CONF_ENV:=ac_cv_linux_vers=$(firstword $(subst .,$(space),$(firstword $(call qstrip,$(BR2_DEFAULT_KERNEL_HEADERS))))) \ Thomas> Both libpcap and tcpdump use this and I never noticed, but this Thomas> is completely broken with external toolchains and the Thomas> Crosstool-NG backend, since BR2_DEFAULT_KERNEL_HEADERS is only Thomas> set with internal toolchains. Thomas> I haven't thought of what the right fix would be, but it's definitely Thomas> not that one. True. The question is why they need this info? Perhaps we can just lie and simply say 2.6.x? -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 1/4] libpcap: update static handling 2011-01-24 16:25 ` Peter Korsgaard @ 2011-01-24 21:46 ` Mike Frysinger 0 siblings, 0 replies; 15+ messages in thread From: Mike Frysinger @ 2011-01-24 21:46 UTC (permalink / raw) To: buildroot On Monday, January 24, 2011 11:25:25 Peter Korsgaard wrote: > >>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: > Thomas> Hello, > Thomas> Completely unrelated to Mike's change, but still spotted while > looking Thomas> at the patch context: > > Thomas> On Wed, 19 Jan 2011 22:10:29 -0500 > > Thomas> Mike Frysinger <vapier@gentoo.org> wrote: > >> LIBPCAP_CONF_ENV:=ac_cv_linux_vers=$(firstword $(subst > >> .,$(space),$(firstword $(call qstrip,$(BR2_DEFAULT_KERNEL_HEADERS))))) > >> \ > > Thomas> Both libpcap and tcpdump use this and I never noticed, but this > Thomas> is completely broken with external toolchains and the > Thomas> Crosstool-NG backend, since BR2_DEFAULT_KERNEL_HEADERS is only > Thomas> set with internal toolchains. > > Thomas> I haven't thought of what the right fix would be, but it's > definitely Thomas> not that one. > > True. The question is why they need this info? Perhaps we can just lie > and simply say 2.6.x? ive noticed this in all my builds, but ive just ignored it. it isnt a matter of picking "linux 2.6" over "linux 2.4". you simply need to pick linux-2.x over linux-1.x or linux-0.x. we've long used this in Gentoo/uclinux-dist: export ac_cv_linux_vers=2 -mike -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: This is a digitally signed message part. URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20110124/1881ed86/attachment.asc> ^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2011-01-25 8:36 UTC | newest] Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2011-01-20 3:10 [Buildroot] Pull request buildroot.git (vapier branch) Mike Frysinger 2011-01-20 3:10 ` [Buildroot] [PATCH 1/4] libpcap: update static handling Mike Frysinger 2011-01-20 3:10 ` [Buildroot] [PATCH 2/4] debugging: do not require no stripping Mike Frysinger 2011-01-20 3:10 ` [Buildroot] [PATCH 3/4] initial support for Blackfin processors Mike Frysinger 2011-01-20 3:10 ` [Buildroot] [PATCH 4/4] gdb: add support for Blackfin gdbserver Mike Frysinger 2011-01-23 10:17 ` [Buildroot] [PATCH 1/4] libpcap: update static handling Peter Korsgaard 2011-01-23 21:07 ` Mike Frysinger 2011-01-24 16:16 ` Thomas Petazzoni 2011-01-24 16:27 ` Peter Korsgaard 2011-01-24 21:48 ` Mike Frysinger 2011-01-24 21:59 ` Peter Korsgaard 2011-01-25 8:36 ` Thomas Petazzoni 2011-01-24 16:11 ` Thomas Petazzoni 2011-01-24 16:25 ` Peter Korsgaard 2011-01-24 21:46 ` Mike Frysinger
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.