Skip to contentSkip to conversation

Pull request for branch for-2012.05/misc-cleanups

GIT PULL New Thomas Petazzoni 5 participants 55 messages Apr 17, 2012 – Apr 26, 2012

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

The following changes since commit 2f41adabc5a12fcca1de5b6c296c2206b518abff:

New package: libdmtx (2012-04-17 00:21:39 +0200)

are available in the git repository at:
git://git.free-electrons.com/users/thomas-petazzoni/buildroot.git for-2012.05/misc-cleanups

Thomas Petazzoni (22):
Remove the DATE variable
Remove cc-option: not used anywhere
Remove filename extension crap for OS compatibility
kconfig: do not use HOST_LOADLIBES anymore
Rename Makefile.autotools.in to pkg-autotargets.mk
Rename Makefile.cmake.in to pkg-cmaketargets.mk
Split Makefile.package.in in pkg-download.mk, pkg-utils.mk and pkg-gentargets.mk pkg-*.mk: add some comments, update some existing comments
Remove unused .fakeroot.* mechanism
Move the manual build infrastructure to docs/manual/manual.mk
cmake: move creation of toolchain file to package/pkg-cmaketargets.mk
package: remove unused STRIP_DISCARD_ALL variable
Remove unused GNU_TARGET_SUFFIX
toolchain: remove useless indirect variables
gcc: remove unused EXTRA_GCC2_CONFIG_OPTIONS
gcc: remove unused EXTRA_GCC4_CONFIG_OPTIONS
gcc: remove unused ARCH_FPU_SUFFIX
gcc: move version/snap variables to gcc-uclibc-4.x.mk
toolchain: remove toolchain/Makefile.in and toolchain/gcc/Makefile.in
gcc: remove unused EXTRA_GCC1_CONFIG_OPTIONS
mklibs: remove support
xtensa: remove support for this architecture

 Makefile                                           |  117 +---
 boot/uboot/uboot.mk                                |    1 -
 docs/manual/manual.mk                              |   48 ++
 fs/common.mk                                       |    2 -
 fs/iso9660/iso9660.mk                              |    2 -
 linux/Config.in                                    |    2 +-
 package/Makefile.in                                |   12 +-
 package/Makefile.package.in                        |  750 --------------------
 package/binutils/binutils.mk                       |    2 +-
 package/ltrace/Config.in                           |    2 +-
 .../{Makefile.autotools.in => pkg-autotargets.mk}  |    4 +-
 package/{Makefile.cmake.in => pkg-cmaketargets.mk} |   22 +
 package/pkg-download.mk                            |  228 ++++++
 package/pkg-gentargets.mk                          |  456 ++++++++++++
 package/pkg-utils.mk                               |   85 +++
 support/kconfig/Makefile.br                        |    4 +-
 support/kconfig/patches/10-br-build-system.patch   |   12 +-
 target/Config.in.arch                              |   40 -
 target/device/xtensa/device_table.txt              |  189 -----
 target/xtensa/.gitignore                           |    1 -
 target/xtensa/Makefile.in                          |    1 -
 target/xtensa/defconfig                            |  129 ----
 target/xtensa/patch.in                             |   33 -
 target/xtensa/setup-config                         |   57 --
 target/xtensa/uClibc-0.9.30.config                 |  245 -------
 target/xtensa/uClibc.config                        |  190 -----
 target/xtensa/xt-buildroot-overlay-install         |  488 -------------
 toolchain/Makefile.in                              |    6 -
 toolchain/gcc/Makefile.in                          |   70 --
 toolchain/gcc/gcc-uclibc-4.x.mk                    |   87 ++-
 toolchain/gdb/gdb.mk                               |    5 -
 toolchain/mklibs/Config.in                         |    6 -
 toolchain/mklibs/mklibs.mk                         |   49 --
 toolchain/mklibs/mklibs.py                         |  597 ----------------
 toolchain/toolchain-buildroot.mk                   |    1 -
 toolchain/toolchain-buildroot/Config.in.2          |    1 -
 toolchain/toolchain-common.in                      |    2 +-
 toolchain/toolchain-crosstool-ng.mk                |    1 -
 toolchain/toolchain-external.mk                    |    1 -
 39 files changed, 935 insertions(+), 3013 deletions(-)
 create mode 100644 docs/manual/manual.mk
 delete mode 100644 package/Makefile.package.in
 rename package/{Makefile.autotools.in => pkg-autotargets.mk} (98%)
 rename package/{Makefile.cmake.in => pkg-cmaketargets.mk} (86%)
 create mode 100644 package/pkg-download.mk
 create mode 100644 package/pkg-gentargets.mk
 create mode 100644 package/pkg-utils.mk
 delete mode 100644 target/device/xtensa/device_table.txt
 delete mode 100644 target/xtensa/.gitignore
 delete mode 100644 target/xtensa/Makefile.in
 delete mode 100644 target/xtensa/defconfig
 delete mode 100644 target/xtensa/patch.in
 delete mode 100644 target/xtensa/setup-config
 delete mode 100644 target/xtensa/uClibc-0.9.30.config
 delete mode 100644 target/xtensa/uClibc.config
 delete mode 100644 target/xtensa/xt-buildroot-overlay-install
 delete mode 100644 toolchain/Makefile.in
 delete mode 100644 toolchain/gcc/Makefile.in
 delete mode 100644 toolchain/mklibs/Config.in
 delete mode 100644 toolchain/mklibs/mklibs.mk
 delete mode 100644 toolchain/mklibs/mklibs.py

Thanks,

Signature · 1 line
Thomas Petazzoni
#1 lore raw

PATCH 1/22 Remove the DATE variable

This variable was only used by uboot.mk to add a #define DATE into the U-Boot .h configuration file. But such a definition does not seem to be used by the mainline U-Boot, so there's no reason to keep it.

---
 Makefile            |    1 -
 boot/uboot/uboot.mk |    1 -
 2 files changed, 0 insertions(+), 2 deletions(-)
Makefile +0 -1
index 3a09417..f56c8ee 100644
@@ -39,7 +39,6 @@ endif
 TOPDIR:=$(shell pwd)
 CONFIG_CONFIG_IN=Config.in
 CONFIG=support/kconfig
-DATE:=$(shell date +%Y%m%d)
 
 # Compute the full local version string so packages can use it as-is
 # Need to export it, so it can be got from environment in children (eg. mconf)
boot/uboot/uboot.mk +0 -1
index db9de8d..83696be 100644
@@ -69,7 +69,6 @@ define UBOOT_CONFIGURE_CMDS
 	@echo "/* Add a wrapper around the values Buildroot sets. */" >> $(@D)/include/config.h
 	@echo "#ifndef __BR2_ADDED_CONFIG_H" >> $(@D)/include/config.h
 	@echo "#define __BR2_ADDED_CONFIG_H" >> $(@D)/include/config.h
-	$(call insert_define,DATE,$(DATE))
 	$(call insert_define,CONFIG_LOAD_SCRIPTS,1)
 	$(call insert_define,CONFIG_IPADDR,$(BR2_TARGET_UBOOT_IPADDR))
 	$(call insert_define,CONFIG_GATEWAYIP,$(BR2_TARGET_UBOOT_GATEWAY))
Signature · 1 line
1.7.4.1
#2 lore raw

PATCH 1/22 Remove the DATE variable

Quoted 5 lines · On Tuesday 17 April 2012 16:45:13 Thomas Petazzoni wrote:

This variable was only used by uboot.mk to add a #define DATE into the U-Boot .h configuration file. But such a definition does not seem to be used by the mainline U-Boot, so there's no reason to keep it.

This patch could be considered risky, because the DATE thing may be used
by some custom U-Boot source. But then, the only way to find out if it is is to commit it and see if anyone complains :-)

Regards,
Arnout

Signature · 6 lines
Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
Essensium/Mind                                     http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium                BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#3 lore raw

PATCH 1/22 Remove the DATE variable

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Arnout" == Arnout Vandecappelle <[email protected]> writes:

Quoted 5 lines · Arnout> On Tuesday 17 April 2012 16:45:13 Thomas Petazzoni wrote:
Quoted 5 lines

This variable was only used by uboot.mk to add a #define DATE into the U-Boot .h configuration file. But such a definition does not seem to be used by the mainline U-Boot, so there's no reason to keep it.

Arnout> Acked-by: Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Arnout> This patch could be considered risky, because the DATE thing Arnout> may be used by some custom U-Boot source. But then, the only Arnout> way to find out if it is is to commit it and see if anyone Arnout> complains :-)

I know we have been (are?) using it at work to add some info about the build date and name some files with the date.

Chances are others might have been doing the same, so I'm hessitating about removing it (which is why I didn't commit it right away). It doesn't really cost us much to keep it (single line).

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 1/22 Remove the DATE variable

Le Sun, 22 Apr 2012 10:23:15 +0200,
Peter Korsgaard <[email protected]> a ?crit :

Quoted 6 lines

I know we have been (are?) using it at work to add some info about the build date and name some files with the date.

Chances are others might have been doing the same, so I'm hessitating about removing it (which is why I didn't commit it right away). It doesn't really cost us much to keep it (single line).

Well, it's just that I don't very much like to have unused variables here and there. One way to make it useful is for example to store the build date into some file in the target filesystem.

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#5 lore raw

PATCH 1/22 Remove the DATE variable

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hi,

Thomas> Well, it's just that I don't very much like to have unused Thomas> variables here and there. One way to make it useful is for Thomas> example to store the build date into some file in the target Thomas> filesystem.

True. We could perhaps add it to /etc/os-release?

http://www.freedesktop.org/software/systemd/man/os-release.html

Signature · 1 line
Bye, Peter Korsgaard
#6 lore raw

PATCH 1/22 Remove the DATE variable

Quoted 4 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hi,

Quoted 9 lines

?Thomas> Well, it's just that I don't very much like to have unused ?Thomas> variables here and there. One way to make it useful is for ?Thomas> example to store the build date into some file in the target ?Thomas> filesystem.

True. We could perhaps add it to /etc/os-release?

http://www.freedesktop.org/software/systemd/man/os-release.html

A disadvantage of adding changing variables like DATE is that two builds that are built from the exact same set of sources, are not binary equal. You cannot simply compare the rootfs image and expect no differences.
You'd have to unpack the rootfs and compare file by file, leaving out files like /etc/os-release that would contain a date.

I haven't yet looked at which binaries inside a typical rootfs do contain such changing variables, but I will do that for my configuration in the near future. My intention is to ensure binary equality for the entire rootfs.

With this in mind, I would not favor adding a DATE of some kind to a file in buildroot just to mark a variable as used, unless we provide a way to override DATE in the config file (in the Linux kernel, the 'user' and 'machine' etc. build variables are also overridable.

Best regards,
Thomas

#7 lore raw

PATCH 1/22 Remove the DATE variable

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas De Schampheleire <[email protected]> writes:

Hi,

Thomas> A disadvantage of adding changing variables like DATE is that Thomas> two builds that are built from the exact same set of sources, Thomas> are not binary equal. You cannot simply compare the rootfs Thomas> image and expect no differences. You'd have to unpack the Thomas> rootfs and compare file by file, leaving out files like Thomas> /etc/os-release that would contain a date.

Thomas> I haven't yet looked at which binaries inside a typical rootfs do Thomas> contain such changing variables, but I will do that for my Thomas> configuration in the near future. My intention is to ensure binary Thomas> equality for the entire rootfs.

I think you'll find that this is quite common. From the top of my head I know that atleast the Linux kernel and busybox adds the build time to the binary, so I doubt this will really work.

Thomas> With this in mind, I would not favor adding a DATE of some kind Thomas> to a file in buildroot just to mark a variable as used, unless Thomas> we provide a way to override DATE in the config file (in the Thomas> Linux kernel, the 'user' and 'machine' etc. build variables are Thomas> also overridable.

You can always build with make DATE=foo

Signature · 1 line
Bye, Peter Korsgaard
#8 lore raw

PATCH 2/22 Remove cc-option: not used anywhere

In reply to Thomas Petazzoni
---
 Makefile |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)
Makefile +0 -7
index f56c8ee..90c2086 100644
@@ -177,13 +177,6 @@ BUILD_DIR:=$(BASE_DIR)/build
 
 ifeq ($(BR2_HAVE_DOT_CONFIG),y)
 
-# cc-option
-# Usage: cflags-y+=$(call cc-option, -march=winchip-c6, -march=i586)
-# sets -march=winchip-c6 if supported else falls back to -march=i586
-# without checking the latter.
-cc-option=$(shell if $(TARGET_CC) $(TARGET_CFLAGS) $(1) -S -o /dev/null -xc /dev/null \
-	> /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;)
-
 #############################################################
 #
 # Hide troublesome environment variables from sub processes
Signature · 1 line
1.7.4.1
#9 lore raw

PATCH 2/22 Remove cc-option: not used anywhere

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#10 lore raw

PATCH 3/22 Remove filename extension crap for OS compatibility

In reply to Thomas Petazzoni

The only variable that is used is HOST_LOADLIBES, defined for the cygwin case in the kconfig build. Since we don't support cygwin, simply get rid of this.

---
 Makefile |   28 ----------------------------
 1 files changed, 0 insertions(+), 28 deletions(-)
Makefile +0 -28
index 90c2086..e03fed5 100644
@@ -194,34 +194,6 @@ unexport CONFIG_SITE
 
 GNU_HOST_NAME:=$(shell support/gnuconfig/config.guess)
 
-#############################################################
-#
-# Setup the proper filename extensions for the host
-#
-##############################################################
-ifneq ($(findstring linux,$(GNU_HOST_NAME)),)
-HOST_EXEEXT:=
-HOST_LIBEXT:=.a
-HOST_SHREXT:=.so
-endif
-ifneq ($(findstring apple,$(GNU_HOST_NAME)),)
-HOST_EXEEXT:=
-HOST_LIBEXT:=.a
-HOST_SHREXT:=.dylib
-endif
-ifneq ($(findstring cygwin,$(GNU_HOST_NAME)),)
-HOST_EXEEXT:=.exe
-HOST_LIBEXT:=.lib
-HOST_SHREXT:=.dll
-HOST_LOADLIBES=-lcurses -lintl
-export HOST_LOADLIBES
-endif
-ifneq ($(findstring mingw,$(GNU_HOST_NAME)),)
-HOST_EXEEXT:=.exe
-HOST_LIBEXT:=.lib
-HOST_SHREXT:=.dll
-endif
-
 ##############################################################
 #
 # The list of stuff to build for the target toolchain
Signature · 1 line
1.7.4.1
#11 lore raw

PATCH 3/22 Remove filename extension crap for OS compatibility

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> The only variable that is used is HOST_LOADLIBES, defined for the Thomas> cygwin case in the kconfig build. Since we don't support cygwin, Thomas> simply get rid of this.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#12 lore raw

PATCH 4/22 kconfig: do not use HOST_LOADLIBES anymore

In reply to Thomas Petazzoni
---
 support/kconfig/Makefile.br                      |    4 ++--
 support/kconfig/patches/10-br-build-system.patch |   12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)
support/kconfig/Makefile.br +2 -2
index c24b6b5..2f8b6ba 100644
@@ -22,10 +22,10 @@ host-cxxobjs := $(addprefix $(obj)/,$(sort $(foreach m,$(__hostprogs),$($(m)-cxx
 HOST_EXTRACFLAGS += -I$(obj)
 
 $(host-csingle): %: %.c
-	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $< $(HOST_LOADLIBES) -o $(obj)/$@
+	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $< -o $(obj)/$@
 
 $(host-cmulti): %: $(host-cobjs) $(host-cshlib)
-	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $(addprefix $(obj)/,$($(@F)-objs)) $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) -o $(obj)/$@
+	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $(addprefix $(obj)/,$($(@F)-objs)) $(HOSTLOADLIBES_$(@F)) -o $(obj)/$@
 
 $(host-cxxmulti): %: $(host-cxxobjs) $(host-cobjs) $(host-cshlib)
 	$(HOSTCXX) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCXXFLAGS_$@) $(addprefix $(obj)/,$($(@F)-objs) $($(@F)-cxxobjs)) $(HOSTLOADLIBES_$(@F)) -o $(obj)/$@
support/kconfig/patches/10-br-build-system.patch +6 -6
index 85125e5..c5d9a75 100644
@@ -3,10 +3,10 @@
  foo.h       |   12 ++++++++++++
  2 files changed, 65 insertions(+)
 
-Index: config/Makefile.br
+Index: kconfig/Makefile.br
 ===================================================================
 --- /dev/null
-+++ config/Makefile.br
++++ kconfig/Makefile.br
 @@ -0,0 +1,53 @@
 +src := .
 +top_srcdir=../../
@@ -32,10 +32,10 @@ Index: config/Makefile.br
 +HOST_EXTRACFLAGS += -I$(obj)
 +
 +$(host-csingle): %: %.c
-+	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $< $(HOST_LOADLIBES) -o $(obj)/$@
++	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $< -o $(obj)/$@
 +
 +$(host-cmulti): %: $(host-cobjs) $(host-cshlib)
-+	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $(addprefix $(obj)/,$($(@F)-objs)) $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) -o $(obj)/$@
++	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $(addprefix $(obj)/,$($(@F)-objs)) $(HOSTLOADLIBES_$(@F)) -o $(obj)/$@
 +
 +$(host-cxxmulti): %: $(host-cxxobjs) $(host-cobjs) $(host-cshlib)
 +	$(HOSTCXX) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCXXFLAGS_$@) $(addprefix $(obj)/,$($(@F)-objs) $($(@F)-cxxobjs)) $(HOSTLOADLIBES_$(@F)) -o $(obj)/$@
@@ -61,10 +61,10 @@ Index: config/Makefile.br
 +
 +FORCE:
 +.PHONY: FORCE clean distclean
-Index: config/foo.h
+Index: kconfig/foo.h
 ===================================================================
 --- /dev/null
-+++ config/foo.h
++++ kconfig/foo.h
 @@ -0,0 +1,12 @@
 +#ifndef __KCONFIG_FOO_H
 +#define __KCONFIG_FOO_H
Signature · 1 line
1.7.4.1
#13 lore raw

PATCH 4/22 kconfig: do not use HOST_LOADLIBES anymore

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#14 lore raw

PATCH 5/22 Rename Makefile.autotools.in to pkg-autotargets.mk

In reply to Thomas Petazzoni
---
 package/Makefile.in                                |    2 +-
 .../{Makefile.autotools.in => pkg-autotargets.mk}  |    0
 2 files changed, 1 insertions(+), 1 deletions(-)
 rename package/{Makefile.autotools.in => pkg-autotargets.mk} (100%)
package/Makefile.in +1 -1
index c344c6b..20fac9a 100644
@@ -299,6 +299,6 @@ else
 SHARED_STATIC_LIBS_OPTS=--enable-static --enable-shared
 endif
 
-include package/Makefile.autotools.in
+include package/pkg-autotargets.mk
 include package/Makefile.cmake.in
 include package/Makefile.package.in
package/pkg-autotargets.mk renamed from package/Makefile.autotools.in +0 -0
similarity index 100%
rename from package/Makefile.autotools.in
rename to package/pkg-autotargets.mk
Signature · 1 line
1.7.4.1
#15 lore raw

PATCH 5/22 Rename Makefile.autotools.in to pkg-autotargets.mk

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#16 lore raw

PATCH 6/22 Rename Makefile.cmake.in to pkg-cmaketargets.mk

In reply to Thomas Petazzoni
---
 package/Makefile.in                                |    2 +-
 package/{Makefile.cmake.in => pkg-cmaketargets.mk} |    0
 2 files changed, 1 insertions(+), 1 deletions(-)
 rename package/{Makefile.cmake.in => pkg-cmaketargets.mk} (100%)
package/Makefile.in +1 -1
index 20fac9a..ab5ea48 100644
@@ -300,5 +300,5 @@ SHARED_STATIC_LIBS_OPTS=--enable-static --enable-shared
 endif
 
 include package/pkg-autotargets.mk
-include package/Makefile.cmake.in
+include package/pkg-cmaketargets.mk
 include package/Makefile.package.in
package/pkg-cmaketargets.mk renamed from package/Makefile.cmake.in +0 -0
similarity index 100%
rename from package/Makefile.cmake.in
rename to package/pkg-cmaketargets.mk
Signature · 1 line
1.7.4.1
#17 lore raw

PATCH 6/22 Rename Makefile.cmake.in to pkg-cmaketargets.mk

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#18 lore raw

PATCH 7/22 Split Makefile.package.in in pkg-download.mk, pkg-utils.mk and pkg-gentargets.mk

In reply to Thomas Petazzoni
---
 package/Makefile.in         |    4 +-
 package/Makefile.package.in |  750 -------------------------------------------
 package/pkg-download.mk     |  219 +++++++++++++
 package/pkg-gentargets.mk   |  458 ++++++++++++++++++++++++++
 package/pkg-utils.mk        |   72 ++++
 5 files changed, 752 insertions(+), 751 deletions(-)
 delete mode 100644 package/Makefile.package.in
 create mode 100644 package/pkg-download.mk
 create mode 100644 package/pkg-gentargets.mk
 create mode 100644 package/pkg-utils.mk
package/Makefile.in +3 -1
index ab5ea48..943017b 100644
@@ -299,6 +299,8 @@ else
 SHARED_STATIC_LIBS_OPTS=--enable-static --enable-shared
 endif
 
+include package/pkg-utils.mk
+include package/pkg-download.mk
 include package/pkg-autotargets.mk
 include package/pkg-cmaketargets.mk
-include package/Makefile.package.in
+include package/pkg-gentargets.mk
package/Makefile.package.in deleted +0 -750

750 lines not on this page · raw message

package/pkg-download.mk new file +219 -0

219 lines not on this page · raw message

package/pkg-gentargets.mk new file +458 -0

458 lines not on this page · raw message

package/pkg-utils.mk new file +72 -0

72 lines not on this page · raw message

Signature · 1 line
1.7.4.1
#19 lore raw

PATCH 7/22 Split Makefile.package.in in pkg-download.mk, pkg-utils.mk and pkg-gentargets.mk

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#20 lore raw

PATCH 8/22 pkg-*.mk: add some comments, update some existing comments

In reply to Thomas Petazzoni
---
 package/pkg-autotargets.mk |    4 +---
 package/pkg-download.mk    |    9 +++++++++
 package/pkg-gentargets.mk  |   10 ++++------
 package/pkg-utils.mk       |   13 +++++++++++++
 4 files changed, 27 insertions(+), 9 deletions(-)
package/pkg-autotargets.mk +1 -3
index fd118dc..c9887c2 100644
@@ -3,9 +3,7 @@
 #
 # This file implements an infrastructure that eases development of
 # package .mk files for autotools packages. It should be used for all
-# packages that use the autotools as their build system. Non-autotools
-# packages should use the generic infrastructure in
-# package/Makefile.package.in.
+# packages that use the autotools as their build system.
 #
 # See the Buildroot documentation for details on the usage of this
 # infrastructure
package/pkg-download.mk +9 -0
index a565ae6..ccf819e 100644
@@ -1,3 +1,12 @@
+############################################################################
+#
+# This file contains the download helpers for the various package
+# infrastructures. It is used to handle downloads from HTTP servers,
+# FTP servers, Git repositories, Subversion repositories, Mercurial
+# repositories, Bazaar repositories, and SCP servers.
+#
+############################################################################
+
 # Download method commands
 WGET:=$(call qstrip,$(BR2_WGET)) $(QUIET)
 SVN:=$(call qstrip,$(BR2_SVN))
package/pkg-gentargets.mk +4 -6
index a535681..1c9b458 100644
@@ -2,9 +2,10 @@
 # Generic package infrastructure
 #
 # This file implements an infrastructure that eases development of
-# package .mk files. It should be used for all non-autotools based
-# packages. Autotools-based packages should use the specialized
-# autotools infrastructure in package/Makefile.autotools.in.
+# package .mk files. It should be used for packages that do not rely
+# on a well-known build system for which Buildroot has a dedicated
+# infrastructure (so far, Buildroot has special support for
+# autotools-based and CMake-based packages).
 #
 # See the Buildroot documentation for details on the usage of this
 # infrastructure
@@ -17,9 +18,6 @@
 #
 #   2. Description of the commands to be executed to configure, build
 #      and install the package
-#
-# The autotools infrastructure specializes this generic infrastructure
-# by already implementing the configure, build and install steps.
 ################################################################################
 
 ################################################################################
package/pkg-utils.mk +13 -0
index 729f8bb..953dbc9 100644
@@ -1,3 +1,10 @@
+############################################################################
+#
+# This file contains various utility functions used by the package
+# infrastructure, or by the packages themselves.
+#
+############################################################################
+
 # UPPERCASE Macro -- transform its argument to uppercase and replace dots and
 # hyphens to underscores
 
@@ -16,6 +23,12 @@ UPPERCASE = $(strip $(eval __tmp := $1) \
 			$(__tmp)))) \
      $(__tmp))
 
+#
+# Manipulation of .config files based on the Kconfig
+# infrastructure. Used by the Busybox package, the Linux kernel
+# package, and more.
+#
+
 define KCONFIG_ENABLE_OPT
        $(SED) "/\\<$(1)\\>/d" $(2)
        echo "$(1)=y" >> $(2)
Signature · 1 line
1.7.4.1
#21 lore raw

PATCH 8/22 pkg-*.mk: add some comments, update some existing comments

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#22 lore raw

PATCH 9/22 Remove unused .fakeroot.* mechanism

In reply to Thomas Petazzoni

There used to be a mechanism using which packages could leave a .fakeroot.<something> file which could contain commands to be executed within the fakeroot environment. Since this mechanism is no longer used by any package, remove it from the common infrastructure.

The latest user was nfs-utils, which used this mechanism to do the "make install" as root, since doing otherwise was not supported. But since 16e7b8255c82815126a2c502c3787d442d254a86, nfs-utils has been upgraded and converted to the package infrastructure, and this hack is no longer necessary. Another past user was the ltp-testsuite package, for the same reason, and since a72a670489547a3ca645ff7c3a0d9c3fb66eab51, the fakeroot hack is no longer needed.

---
 Makefile              |    6 ------
 fs/common.mk          |    2 --
 fs/iso9660/iso9660.mk |    2 --
 3 files changed, 0 insertions(+), 10 deletions(-)
Makefile +0 -6
index e03fed5..a65848d 100644
@@ -301,8 +301,6 @@ endif
 
 include fs/common.mk
 
-TARGETS+=erase-fakeroots
-
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
 TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS) $(BASE_TARGETS))
 TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS))
@@ -391,7 +389,6 @@ $(BUILD_DIR)/.root:
 		if [ -d "$(TARGET_SKELETON)" ]; then \
 			cp -fa $(TARGET_SKELETON)/* $(TARGET_DIR)/; \
 		fi; \
-		touch $(STAGING_DIR)/.fakeroot.00000; \
 	fi
 	-find $(TARGET_DIR) -type d -name CVS -print0 -o -name .svn -print0 | xargs -0 rm -rf
 	-find $(TARGET_DIR) -type f \( -name .empty -o -name '*~' \) -print0 | xargs -0 rm -rf
@@ -399,9 +396,6 @@ $(BUILD_DIR)/.root:
 
 $(TARGET_DIR): $(BUILD_DIR)/.root
 
-erase-fakeroots:
-	rm -f $(BUILD_DIR)/.fakeroot*
-
 target-finalize:
 ifeq ($(BR2_HAVE_DEVFILES),y)
 	( support/scripts/copy.sh $(STAGING_DIR) $(TARGET_DIR) )
fs/common.mk +0 -2
index d426f37..debf7db 100644
@@ -45,8 +45,6 @@ $(BINARIES_DIR)/rootfs.$(1): $(ROOTFS_$(2)_DEPENDENCIES)
 	@$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
 	$(foreach hook,$(ROOTFS_$(2)_PRE_GEN_HOOKS),$(call $(hook))$(sep))
 	rm -f $(FAKEROOT_SCRIPT)
-	touch $(BUILD_DIR)/.fakeroot.00000
-	cat $(BUILD_DIR)/.fakeroot* > $(FAKEROOT_SCRIPT)
 	echo "chown -R 0:0 $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT)
 ifneq ($(ROOTFS_DEVICE_TABLES),)
 	cat $(ROOTFS_DEVICE_TABLES) > $(FULL_DEVICE_TABLE)
fs/iso9660/iso9660.mk +0 -2
index afebafc..f51b6ee 100644
@@ -25,8 +25,6 @@ $(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux rootfs-ext2 grub
 	cp $(BINARIES_DIR)/rootfs.ext2 $(ISO9660_TARGET_DIR)/initrd
 	# Use fakeroot to pretend all target binaries are owned by root
 	rm -f $(FAKEROOT_SCRIPT)
-	touch $(BUILD_DIR)/.fakeroot.00000
-	cat $(BUILD_DIR)/.fakeroot* > $(FAKEROOT_SCRIPT)
 	echo "chown -R 0:0 $(ISO9660_TARGET_DIR)" >> $(FAKEROOT_SCRIPT)
 	# Use fakeroot so mkisofs believes the previous fakery
 	echo "$(HOST_DIR)/usr/bin/genisoimage -R -b boot/grub/stage2_eltorito -no-emul-boot " \
Signature · 1 line
1.7.4.1
#23 lore raw

PATCH 9/22 Remove unused .fakeroot.* mechanism

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> There used to be a mechanism using which packages could leave a Thomas> .fakeroot.<something> file which could contain commands to be executed Thomas> within the fakeroot environment. Since this mechanism is no longer Thomas> used by any package, remove it from the common infrastructure.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#24 lore raw

PATCH 10/22 Move the manual build infrastructure to docs/manual/manual.mk

In reply to Thomas Petazzoni
---
 Makefile              |   49 +------------------------------------------------
 docs/manual/manual.mk |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 48 deletions(-)
 create mode 100644 docs/manual/manual.mk
Makefile +1 -48
index a65848d..3e7fa22 100644
@@ -684,54 +684,7 @@ release:
 print-version:
 	@echo $(BR2_VERSION_FULL)
 
-################################################################################
-# GENDOC -- generates the make targets needed to build a specific type of
-#           asciidoc documentation.
-#
-#  argument 1 is the name of the document and must be a subdirectory of docs/;
-#             the top-level asciidoc file must have the same name
-#  argument 2 is the type of document to generate (-f argument of a2x)
-#  argument 3 is the document type as used in the make target
-#  argument 4 is the output file extension for the document type
-#  argument 5 is the human text for the document type
-#  argument 6 (optional) are extra arguments for a2x
-#
-# The variable <DOCUMENT_NAME>_SOURCES defines the dependencies.
-################################################################################
-define GENDOC_INNER
-$(1): $(1)-$(3)
-.PHONY: $(1)-$(3)
-$(1)-$(3): $$(O)/docs/$(1)/$(1).$(4)
-
-$$(O)/docs/$(1)/$(1).$(4): docs/$(1)/$(1).txt $$($(call UPPERCASE,$(1))_SOURCES)
-	@echo "Generating $(5) $(1)..."
-	$(Q)mkdir -p $$(@D)
-	$(Q)a2x $(6) -f $(2) -d book -L -r $(TOPDIR)/docs/images \
-	  -D $$(@D) $$<
-endef
-
-################################################################################
-# GENDOC -- generates the make targets needed to build asciidoc documentation.
-#
-#  argument 1 is the name of the document and must be a subdirectory of docs/;
-#             the top-level asciidoc file must have the same name
-#
-# The variable <DOCUMENT_NAME>_SOURCES defines the dependencies.
-################################################################################
-define GENDOC
-$(call GENDOC_INNER,$(1),xhtml,html,html,HTML)
-$(call GENDOC_INNER,$(1),chunked,split-html,chunked,Split HTML)
-$(call GENDOC_INNER,$(1),pdf,pdf,pdf,PDF,--dblatex-opts "-P latex.output.revhistory=0")
-$(call GENDOC_INNER,$(1),text,txt,text,Text)
-$(call GENDOC_INNER,$(1),epub,epub,epub,EPUB)
-clean: clean-$(1)
-clean-$(1):
-	$(Q)$(RM) -rf $(O)/docs/$(1)
-.PHONY: $(1) clean-$(1)
-endef
-
-MANUAL_SOURCES = $(wildcard docs/manual/*.txt) $(wildcard docs/images/*)
-$(eval $(call GENDOC,manual))
+include docs/manual/manual.mk
 
 .PHONY: $(noconfig_targets)
 
docs/manual/manual.mk new file +48 -0

48 lines not on this page · raw message

Signature · 1 line
1.7.4.1
#25 lore raw

PATCH 10/22 Move the manual build infrastructure to docs/manual/manual.mk

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#26 lore raw

PATCH 11/22 cmake: move creation of toolchain file to package/pkg-cmaketargets.mk

In reply to Thomas Petazzoni

This also requires moving a few include directives below the "all:" target in the main Makefile, otherwise the new target to create the toolchain file in pkg-cmaketargets.mk gets used as the default make target instead of "all:".

---
 Makefile                    |   22 ++--------------------
 package/pkg-cmaketargets.mk |   22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 20 deletions(-)
Makefile +2 -20
index 3e7fa22..4f29cba 100644
@@ -255,9 +255,6 @@ HOSTCC  := $(CCACHE) $(HOSTCC)
 HOSTCXX := $(CCACHE) $(HOSTCXX)
 endif
 
-include toolchain/Makefile.in
-include package/Makefile.in
-
 #############################################################
 #
 # You should probably leave this stuff alone unless you know
@@ -267,6 +264,8 @@ include package/Makefile.in
 
 all: world
 
+include toolchain/Makefile.in
+include package/Makefile.in
 include support/dependencies/dependencies.mk
 
 # We also need the various per-package makefiles, which also add
@@ -339,23 +338,6 @@ prepare: $(BUILD_DIR)/buildroot-config/auto.conf
 
 world: prepare dirs dependencies $(BASE_TARGETS) $(TARGETS_ALL)
 
-$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake:
-	mkdir -p $(@D)
-	@echo -en "\
-	set(CMAKE_SYSTEM_NAME Linux)\n\
-	set(CMAKE_C_COMPILER $(TARGET_CC_NOCCACHE))\n\
-	set(CMAKE_CXX_COMPILER $(TARGET_CXX_NOCCACHE))\n\
-	set(CMAKE_C_FLAGS \"\$${CMAKE_C_FLAGS} $(TARGET_CFLAGS)\" CACHE STRING \"Buildroot CFLAGS\" FORCE)\n\
-	set(CMAKE_CXX_FLAGS \"\$${CMAKE_CXX_FLAGS} $(TARGET_CXXFLAGS)\" CACHE STRING \"Buildroot CXXFLAGS\" FORCE)\n\
-	set(CMAKE_INSTALL_SO_NO_EXE 0)\n\
-	set(CMAKE_PROGRAM_PATH \"$(HOST_DIR)/usr/bin\")\n\
-	set(CMAKE_FIND_ROOT_PATH \"$(STAGING_DIR)\")\n\
-	set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)\n\
-	set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)\n\
-	set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)\n\
-	set(ENV{PKG_CONFIG_SYSROOT_DIR} \"$(STAGING_DIR)\")\n\
-	" > $@
-
 .PHONY: all world dirs clean distclean source outputmakefile \
 	$(BASE_TARGETS) $(TARGETS) $(TARGETS_ALL) \
 	$(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) \
package/pkg-cmaketargets.mk +22 -0
index 1cd65e4..371ab11 100644
@@ -197,3 +197,25 @@ else
 $(call CMAKETARGETS_INNER,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target)
 endif
 endef
+
+################################################################################
+# Generation of the CMake toolchain file
+################################################################################
+
+$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake:
+	@mkdir -p $(@D)
+	@echo -en "\
+	set(CMAKE_SYSTEM_NAME Linux)\n\
+	set(CMAKE_C_COMPILER $(TARGET_CC_NOCCACHE))\n\
+	set(CMAKE_CXX_COMPILER $(TARGET_CXX_NOCCACHE))\n\
+	set(CMAKE_C_FLAGS \"\$${CMAKE_C_FLAGS} $(TARGET_CFLAGS)\" CACHE STRING \"Buildroot CFLAGS\" FORCE)\n\
+	set(CMAKE_CXX_FLAGS \"\$${CMAKE_CXX_FLAGS} $(TARGET_CXXFLAGS)\" CACHE STRING \"Buildroot CXXFLAGS\" FORCE)\n\
+	set(CMAKE_INSTALL_SO_NO_EXE 0)\n\
+	set(CMAKE_PROGRAM_PATH \"$(HOST_DIR)/usr/bin\")\n\
+	set(CMAKE_FIND_ROOT_PATH \"$(STAGING_DIR)\")\n\
+	set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)\n\
+	set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)\n\
+	set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)\n\
+	set(ENV{PKG_CONFIG_SYSROOT_DIR} \"$(STAGING_DIR)\")\n\
+	" > $@
+
Signature · 1 line
1.7.4.1
#27 lore raw

PATCH 11/22 cmake: move creation of toolchain file to package/pkg-cmaketargets.mk

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> This also requires moving a few include directives below the "all:" Thomas> target in the main Makefile, otherwise the new target to create the Thomas> toolchain file in pkg-cmaketargets.mk gets used as the default make Thomas> target instead of "all:".

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#28 lore raw

PATCH 12/22 package: remove unused STRIP_DISCARD_ALL variable

In reply to Thomas Petazzoni
---
 package/Makefile.in |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
package/Makefile.in +0 -2
index 943017b..7c75406 100644
@@ -126,7 +126,6 @@ TARGET_CXX := $(CCACHE) $(TARGET_CXX)
 endif
 
 ifeq ($(BR2_STRIP_strip),y)
-STRIP_DISCARD_ALL:=--discard-all
 STRIP_STRIP_UNNEEDED:=--strip-unneeded
 STRIP_STRIP_ALL:=--strip-all
 TARGET_STRIP=$(TARGET_CROSS)strip
@@ -134,7 +133,6 @@ STRIPCMD=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note
 KSTRIPCMD=$(STRIPCMD) $(STRIP_STRIP_UNNEEDED)
 endif
 ifeq ($(BR2_STRIP_sstrip),y)
-STRIP_DISCARD_ALL:=
 STRIP_STRIP_UNNEEDED:=
 STRIP_STRIP_ALL:=
 TARGET_STRIP=$(HOST_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-sstrip
Signature · 1 line
1.7.4.1
#29 lore raw

PATCH 12/22 package: remove unused STRIP_DISCARD_ALL variable

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#30 lore raw

PATCH 13/22 Remove unused GNU_TARGET_SUFFIX

In reply to Thomas Petazzoni
---
 Makefile |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
Makefile +0 -2
index 4f29cba..a48fb87 100644
@@ -235,8 +235,6 @@ BZCAT:=$(call qstrip,$(BR2_BZCAT))
 XZCAT:=$(call qstrip,$(BR2_XZCAT))
 TAR_OPTIONS=$(call qstrip,$(BR2_TAR_OPTIONS)) -xf
 
-GNU_TARGET_SUFFIX:=-$(call qstrip,$(BR2_GNU_TARGET_SUFFIX))
-
 # packages compiled for the host go here
 HOST_DIR:=$(call qstrip,$(BR2_HOST_DIR))
 
Signature · 1 line
1.7.4.1
#31 lore raw

PATCH 13/22 Remove unused GNU_TARGET_SUFFIX

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#32 lore raw

PATCH 14/22 toolchain: remove useless indirect variables

In reply to Thomas Petazzoni

The BR2_CONFIGURE_DEVEL_SYSROOT, BR2_CONFIGURE_STAGING_SYSROOT and BR2_CONFIGURE_BUILD_TOOLS were used only in a few places, and it is in fact clearer to just use their value in the various places they are used.

The ultimate goal is to get rid of the toolchain/Makefile.in file.

---
 package/binutils/binutils.mk    |    2 +-
 toolchain/Makefile.in           |    4 ----
 toolchain/gcc/gcc-uclibc-4.x.mk |    8 ++++----
 3 files changed, 5 insertions(+), 9 deletions(-)
package/binutils/binutils.mk +1 -1
index 8632d67..0a5a948 100644
@@ -37,7 +37,7 @@ endif
 HOST_BINUTILS_CONF_OPT = --disable-multilib --disable-werror \
 			--target=$(REAL_GNU_TARGET_NAME) \
 			--disable-shared --enable-static \
-			$(BR2_CONFIGURE_STAGING_SYSROOT) \
+			--with-sysroot=$(STAGING_DIR) \
 			$(BINUTILS_EXTRA_CONFIG_OPTIONS)
 
 HOST_BINUTILS_DEPENDENCIES =
toolchain/Makefile.in +0 -4
index a7ca558..5f32f82 100644
@@ -1,6 +1,2 @@
-BR2_CONFIGURE_DEVEL_SYSROOT=--with-sysroot=$(TOOLCHAIN_DIR)/uClibc_dev/
-BR2_CONFIGURE_STAGING_SYSROOT=--with-sysroot=$(STAGING_DIR)
-BR2_CONFIGURE_BUILD_TOOLS=--with-build-time-tools=$(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin
-
 # gcc has a bunch of needed stuff....
 include toolchain/gcc/Makefile.in
toolchain/gcc/gcc-uclibc-4.x.mk +4 -4
index ae734e8..7cdba0e 100644
@@ -223,7 +223,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
 		--host=$(GNU_HOST_NAME) \
 		--target=$(REAL_GNU_TARGET_NAME) \
 		--enable-languages=c \
-		$(BR2_CONFIGURE_DEVEL_SYSROOT) \
+		--with-sysroot=$(TOOLCHAIN_DIR)/uClibc_dev/ \
 		--disable-__cxa_atexit \
 		$(GCC_OPTSPACE) \
 		$(GCC_QUADMATH) \
@@ -291,7 +291,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched
 		--host=$(GNU_HOST_NAME) \
 		--target=$(REAL_GNU_TARGET_NAME) \
 		--enable-languages=c \
-		$(BR2_CONFIGURE_DEVEL_SYSROOT) \
+		--with-sysroot=$(TOOLCHAIN_DIR)/uClibc_dev/ \
 		--disable-__cxa_atexit \
 		$(GCC_OPTSPACE) \
 		$(GCC_QUADMATH) \
@@ -369,8 +369,8 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ)
 		--host=$(GNU_HOST_NAME) \
 		--target=$(REAL_GNU_TARGET_NAME) \
 		--enable-languages=$(GCC_CROSS_LANGUAGES) \
-		$(BR2_CONFIGURE_STAGING_SYSROOT) \
-		$(BR2_CONFIGURE_BUILD_TOOLS) \
+		--with-sysroot=$(STAGING_DIR) \
+		--with-build-time-tools=$(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin \
 		--disable-__cxa_atexit \
 		$(GCC_OPTSPACE) \
 		$(GCC_QUADMATH) \
Signature · 1 line
1.7.4.1
#33 lore raw

PATCH 14/22 toolchain: remove useless indirect variables

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> The BR2_CONFIGURE_DEVEL_SYSROOT, BR2_CONFIGURE_STAGING_SYSROOT and Thomas> BR2_CONFIGURE_BUILD_TOOLS were used only in a few places, and it is in Thomas> fact clearer to just use their value in the various places they are Thomas> used.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#34 lore raw

PATCH 15/22 gcc: remove unused EXTRA_GCC2_CONFIG_OPTIONS

In reply to Thomas Petazzoni
---
 toolchain/gcc/gcc-uclibc-4.x.mk |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
toolchain/gcc/gcc-uclibc-4.x.mk +0 -2
index 7cdba0e..305270f 100644
@@ -311,7 +311,6 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched
 		$(SOFT_FLOAT_CONFIG_OPTION) \
 		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) $(GCC_WITH_CPU) \
 		$(EXTRA_GCC_CONFIG_OPTIONS) \
-		$(EXTRA_GCC2_CONFIG_OPTIONS) \
 		$(QUIET) \
 	)
 	touch $@
@@ -390,7 +389,6 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ)
 		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) $(GCC_WITH_CPU) \
 		$(DISABLE_LARGEFILE) \
 		$(EXTRA_GCC_CONFIG_OPTIONS) \
-		$(EXTRA_GCC2_CONFIG_OPTIONS) \
 	)
 	touch $@
 
Signature · 1 line
1.7.4.1
#35 lore raw

PATCH 15/22 gcc: remove unused EXTRA_GCC2_CONFIG_OPTIONS

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#36 lore raw

PATCH 16/22 gcc: remove unused EXTRA_GCC4_CONFIG_OPTIONS

In reply to Thomas Petazzoni
---
 toolchain/gcc/gcc-uclibc-4.x.mk |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
toolchain/gcc/gcc-uclibc-4.x.mk +0 -1
index 305270f..212660c 100644
@@ -525,7 +525,6 @@ $(GCC_BUILD_DIR4)/.configured: $(GCC_BUILD_DIR4)/.prepared
 		$(DISABLE_LARGEFILE) \
 		$(EXTRA_GCC_CONFIG_OPTIONS) \
 		$(EXTRA_TARGET_GCC_CONFIG_OPTIONS) \
-		$(EXTRA_GCC4_CONFIG_OPTIONS) \
 	)
 	touch $@
 
Signature · 1 line
1.7.4.1
#37 lore raw

PATCH 16/22 gcc: remove unused EXTRA_GCC4_CONFIG_OPTIONS

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#38 lore raw

PATCH 17/22 gcc: remove unused ARCH_FPU_SUFFIX

In reply to Thomas Petazzoni
---
 toolchain/gcc/Makefile.in |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
toolchain/gcc/Makefile.in +0 -2
index d9efcf0..c3f4576 100644
@@ -20,11 +20,9 @@ TARGET_SOFT_FLOAT:=-mfloat-abi=soft
 else
 TARGET_SOFT_FLOAT:=-msoft-float
 endif
-ARCH_FPU_SUFFIX:=_nofpu
 else # no softfloat support
 SOFT_FLOAT_CONFIG_OPTION:=
 TARGET_SOFT_FLOAT:=
-ARCH_FPU_SUFFIX:=
 endif
 
 # some additional defaults
Signature · 1 line
1.7.4.1
#39 lore raw

PATCH 17/22 gcc: remove unused ARCH_FPU_SUFFIX

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#40 lore raw

PATCH 18/22 gcc: move version/snap variables to gcc-uclibc-4.x.mk

In reply to Thomas Petazzoni
---
 toolchain/gcc/Makefile.in       |    6 ------
 toolchain/gcc/gcc-uclibc-4.x.mk |    8 ++++++++
 2 files changed, 8 insertions(+), 6 deletions(-)
toolchain/gcc/Makefile.in +0 -6
index c3f4576..3e82a32 100644
@@ -3,15 +3,9 @@
 # So include them in this file and arrange to include it
 # soon after invoking make from the top level.
 
-GCC_VERSION:=$(call qstrip,$(BR2_GCC_VERSION))
 TARGET_OPTIMIZATION:=$(call qstrip,$(BR2_TARGET_OPTIMIZATION))
 EXTRA_GCC_CONFIG_OPTIONS:=$(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS))
 
-ifeq ($(call qstrip,$(BR2_GCC_VERSION_SNAP)),y)
-GCC_SNAP_DATE:=$(call qstrip,$(BR2_GCC_SNAP_DATE))
-else
-GCC_SNAP_DATE:=
-endif
 
 ifeq ($(BR2_SOFT_FLOAT),y)
 SOFT_FLOAT_CONFIG_OPTION:=--with-float=soft
toolchain/gcc/gcc-uclibc-4.x.mk +8 -0
index 212660c..3d0228d 100644
@@ -17,6 +17,14 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
+GCC_VERSION:=$(call qstrip,$(BR2_GCC_VERSION))
+
+ifeq ($(BR2_GCC_VERSION_SNAP),y)
+GCC_SNAP_DATE:=$(call qstrip,$(BR2_GCC_SNAP_DATE))
+else
+GCC_SNAP_DATE:=
+endif
+
 ifneq ($(GCC_SNAP_DATE),)
  GCC_SITE:=ftp://sources.redhat.com/pub/gcc/snapshots/$(GCC_VERSION)
 else ifeq ($(findstring avr32,$(GCC_VERSION)),avr32)
Signature · 1 line
1.7.4.1
#41 lore raw

PATCH 18/22 gcc: move version/snap variables to gcc-uclibc-4.x.mk

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#42 lore raw

PATCH 19/22 toolchain: remove toolchain/Makefile.in and toolchain/gcc/Makefile.in

In reply to Thomas Petazzoni

Re-integrate in gcc-uclibc-4.x.mk things from toolchain/gcc/Makefile.in that were completely gcc-specific. There was no reason to pull that when building with other backends than the internal one.

---
 Makefile                        |    1 -
 package/Makefile.in             |    2 +
 toolchain/Makefile.in           |    2 -
 toolchain/gcc/Makefile.in       |   62 ---------------------------------------
 toolchain/gcc/gcc-uclibc-4.x.mk |   62 +++++++++++++++++++++++++++++++++++++++
 5 files changed, 64 insertions(+), 65 deletions(-)
 delete mode 100644 toolchain/Makefile.in
 delete mode 100644 toolchain/gcc/Makefile.in
Makefile +0 -1
index a48fb87..0ed323e 100644
@@ -262,7 +262,6 @@ endif
 
 all: world
 
-include toolchain/Makefile.in
 include package/Makefile.in
 include support/dependencies/dependencies.mk
 
package/Makefile.in +2 -0
index 7c75406..2be933b 100644
@@ -50,6 +50,8 @@ REAL_GNU_TARGET_NAME=$(ARCH)-unknown-linux-$(LIBC)$(ABI)
 
 STAGING_DIR=$(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sysroot
 
+TARGET_OPTIMIZATION:=$(call qstrip,$(BR2_TARGET_OPTIMIZATION))
+
 ifeq ($(BR2_OPTIMIZE_0),y)
 TARGET_OPTIMIZATION+=-O0
 endif
toolchain/Makefile.in deleted +0 -2
deleted file mode 100644
index 5f32f82..0000000
@@ -1,2 +0,0 @@
-# gcc has a bunch of needed stuff....
-include toolchain/gcc/Makefile.in
toolchain/gcc/Makefile.in deleted +0 -62

62 lines not on this page · raw message

toolchain/gcc/gcc-uclibc-4.x.mk +62 -0

71 lines not on this page · raw message

Signature · 1 line
1.7.4.1
#43 lore raw

PATCH 19/22 toolchain: remove toolchain/Makefile.in and toolchain/gcc/Makefile.in

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Re-integrate in gcc-uclibc-4.x.mk things from
Thomas> toolchain/gcc/Makefile.in that were completely gcc-specific. There was Thomas> no reason to pull that when building with other backends than the Thomas> internal one.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#44 lore raw

PATCH 20/22 gcc: remove unused EXTRA_GCC1_CONFIG_OPTIONS

In reply to Thomas Petazzoni
---
 toolchain/gcc/gcc-uclibc-4.x.mk |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
toolchain/gcc/gcc-uclibc-4.x.mk +0 -1
index 3f97a47..a4faf4f 100644
@@ -310,7 +310,6 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
 		$(SOFT_FLOAT_CONFIG_OPTION) \
 		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) $(GCC_WITH_CPU) \
 		$(EXTRA_GCC_CONFIG_OPTIONS) \
-		$(EXTRA_GCC1_CONFIG_OPTIONS) \
 		$(QUIET) \
 	)
 	touch $@
Signature · 1 line
1.7.4.1
#45 lore raw

PATCH 20/22 gcc: remove unused EXTRA_GCC1_CONFIG_OPTIONS

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#46 lore raw

PATCH 21/22 mklibs: remove support

In reply to Thomas Petazzoni

The support for mklibs has been marked broken since more than a year and nobody cared to bring it up to a working state.

---
 toolchain/mklibs/Config.in                |    6 -
 toolchain/mklibs/mklibs.mk                |   49 ---
 toolchain/mklibs/mklibs.py                |  597 -----------------------------
 toolchain/toolchain-buildroot.mk          |    1 -
 toolchain/toolchain-buildroot/Config.in.2 |    1 -
 toolchain/toolchain-crosstool-ng.mk       |    1 -
 toolchain/toolchain-external.mk           |    1 -
 7 files changed, 0 insertions(+), 656 deletions(-)
 delete mode 100644 toolchain/mklibs/Config.in
 delete mode 100644 toolchain/mklibs/mklibs.mk
 delete mode 100644 toolchain/mklibs/mklibs.py
toolchain/mklibs/Config.in deleted +0 -6
deleted file mode 100644
index c065866..0000000
@@ -1,6 +0,0 @@
-config BR2_MKLIBS
-	bool "Run mklibs on the built root filesystem"
-	depends on BROKEN
-	help
-	  Recompiles all the shared libraries to only include the
-	  symbols actually needed to run the binaries on the target
toolchain/mklibs/mklibs.mk deleted +0 -49

49 lines not on this page · raw message

toolchain/mklibs/mklibs.py deleted +0 -597

597 lines not on this page · raw message

toolchain/toolchain-buildroot.mk +0 -1
index f21cefd..adab0f7 100644
@@ -4,5 +4,4 @@ include toolchain/elf2flt/elf2flt.mk
 include toolchain/gcc/gcc-uclibc-4.x.mk
 include toolchain/gdb/gdb.mk
 include toolchain/kernel-headers/kernel-headers.mk
-include toolchain/mklibs/mklibs.mk
 include toolchain/uClibc/uclibc.mk
toolchain/toolchain-buildroot/Config.in.2 +0 -1
index 7f2f68f..7580946 100644
@@ -97,7 +97,6 @@ choice
 endchoice
 
 source "toolchain/elf2flt/Config.in"
-source "toolchain/mklibs/Config.in"
 
 config BR2_VFP_FLOAT
 	bool "Use ARM Vector Floating Point unit"
toolchain/toolchain-crosstool-ng.mk +0 -1
index f6cc2b9..d677256 100644
@@ -6,5 +6,4 @@ include toolchain/elf2flt/elf2flt.mk
 include toolchain/gcc/gcc-uclibc-4.x.mk
 include toolchain/gdb/gdb.mk
 include toolchain/toolchain-crosstool-ng/crosstool-ng.mk
-include toolchain/mklibs/mklibs.mk
 include toolchain/uClibc/uclibc.mk
toolchain/toolchain-external.mk +0 -1
index d5b2aac..4292d85 100644
@@ -5,6 +5,5 @@ include toolchain/elf2flt/elf2flt.mk
 include toolchain/gcc/gcc-uclibc-4.x.mk
 include toolchain/gdb/gdb.mk
 include toolchain/kernel-headers/kernel-headers.mk
-include toolchain/mklibs/mklibs.mk
 include toolchain/toolchain-external/ext-tool.mk
 include toolchain/uClibc/uclibc.mk
Signature · 1 line
1.7.4.1
#47 lore raw

PATCH 21/22 mklibs: remove support

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> The support for mklibs has been marked broken since more than a Thomas> year and nobody cared to bring it up to a working state.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#48 lore raw

PATCH 22/22 xtensa: remove support for this architecture

In reply to Thomas Petazzoni

The support for Xtensa has been added in July 2009, and no updates have ever been done to it, and it requires some special handling, in gcc/gdb, has some special Perl scripts, etc.

---
 Makefile                                   |    3 -
 linux/Config.in                            |    2 +-
 package/ltrace/Config.in                   |    2 +-
 target/Config.in.arch                      |   40 ---
 target/device/xtensa/device_table.txt      |  189 -----------
 target/xtensa/.gitignore                   |    1 -
 target/xtensa/Makefile.in                  |    1 -
 target/xtensa/defconfig                    |  129 --------
 target/xtensa/patch.in                     |   33 --
 target/xtensa/setup-config                 |   57 ----
 target/xtensa/uClibc-0.9.30.config         |  245 --------------
 target/xtensa/uClibc.config                |  190 -----------
 target/xtensa/xt-buildroot-overlay-install |  488 ----------------------------
 toolchain/gcc/gcc-uclibc-4.x.mk            |    5 -
 toolchain/gdb/gdb.mk                       |    5 -
 toolchain/toolchain-common.in              |    2 +-
 16 files changed, 3 insertions(+), 1389 deletions(-)
 delete mode 100644 target/device/xtensa/device_table.txt
 delete mode 100644 target/xtensa/.gitignore
 delete mode 100644 target/xtensa/Makefile.in
 delete mode 100644 target/xtensa/defconfig
 delete mode 100644 target/xtensa/patch.in
 delete mode 100644 target/xtensa/setup-config
 delete mode 100644 target/xtensa/uClibc-0.9.30.config
 delete mode 100644 target/xtensa/uClibc.config
 delete mode 100644 target/xtensa/xt-buildroot-overlay-install
Makefile +0 -3
index 0ed323e..424d1ad 100644
@@ -217,9 +217,6 @@ QUIET:=$(if $(findstring s,$(MAKEFLAGS)),-q)
 
 # Strip off the annoying quoting
 ARCH:=$(call qstrip,$(BR2_ARCH))
-ifeq ($(ARCH),xtensa)
-ARCH:=$(ARCH)_$(call qstrip,$(BR2_xtensa_core_name))
-endif
 
 KERNEL_ARCH:=$(shell echo "$(ARCH)" | sed -e "s/-.*//" \
 	-e s/i.86/i386/ -e s/sun4u/sparc64/ \
linux/Config.in +1 -1
index 5a2d287..c84db57 100644
@@ -145,7 +145,7 @@ config BR2_LINUX_KERNEL_BZIMAGE
 
 config BR2_LINUX_KERNEL_ZIMAGE
 	bool "zImage"
-	depends on BR2_arm || BR2_armeb || BR2_powerpc || BR2_sparc || BR2_sh || BR2_sh64 || BR2_xtensa
+	depends on BR2_arm || BR2_armeb || BR2_powerpc || BR2_sparc || BR2_sh || BR2_sh64
 
 config BR2_LINUX_KERNEL_VMLINUX_BIN
 	bool "vmlinux.bin"
package/ltrace/Config.in +1 -1
index 9e71d82..a65ca48 100644
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LTRACE
 	bool "ltrace"
-	depends on !(BR2_avr32 || BR2_mips || BR2_mipsel || BR2_sh || BR2_sh64 || BR2_xtensa)
+	depends on !(BR2_avr32 || BR2_mips || BR2_mipsel || BR2_sh || BR2_sh64)
 	select BR2_PACKAGE_LIBELF
 	help
 	  Debugging program which runs a specified command until it exits.
target/Config.in.arch +0 -40
index f8ab84e..e949764 100644
@@ -122,12 +122,6 @@ config BR2_x86_64
 	  architecture compatible microprocessor).
 	  http://en.wikipedia.org/wiki/X86_64
 
-config BR2_xtensa
-	bool "Xtensa"
-	help
-	  Xtensa is a Tensilica processor IP architecture.
-	  http://en.wikipedia.org/wiki/Xtensa
-	  http://www.tensilica.com/
 endchoice
 
 config BR2_microblaze
@@ -461,38 +455,6 @@ config BR2_SPARC_TYPE
 
 choice
 	prompt "Target Architecture Variant"
-	depends on BR2_xtensa
-	default BR2_xtensa_dc232b
-	help
-	  Specific CPU variant to use
-
-config BR2_xtensa_custom
-	bool "Custom Xtensa processor configuration"
-config BR2_xtensa_dc232a
-	bool "dc232a - Diamond 232L Standard Core Rev.A (LE)"
-config BR2_xtensa_dc232b
-	bool "dc232b - Diamond 232L Standard Core Rev.B (LE)"
-#config BR2_xtensa_s5000
-#	bool "s5000 - Stretch S5000"
-endchoice
-
-config BR2_xtensa_custom_name
-	string "Custom Xtensa processor configuration name"
-	depends on BR2_xtensa_custom
-	default ""
-	help
-	  Name given to a custom Xtensa processor configuration.
-	  This is used to select the correct overlay.
-
-config BR2_xtensa_core_name
-	string
-	default BR2_xtensa_custom_name	if BR2_xtensa_custom
-	default "dc232a"		if BR2_xtensa_dc232a
-	default "dc232b"		if BR2_xtensa_dc232b
-#	default "s5000"			if BR2_xtensa_s5000
-
-choice
-	prompt "Target Architecture Variant"
 	depends on BR2_powerpc
 	default BR2_generic_powerpc
 	help
@@ -632,8 +594,6 @@ config BR2_ARCH
 	default "x86_64"	if BR2_x86_64_opteron
 	default "x86_64"	if BR2_x86_64_opteron_sse3
 	default "x86_64"	if BR2_x86_64_barcelona
-	default "xtensa"	if BR2_xtensa
-
 
 config BR2_ENDIAN
 	string
target/device/xtensa/device_table.txt deleted +0 -189

189 lines not on this page · raw message

target/xtensa/.gitignore deleted +0 -1
deleted file mode 100644
index cff61bf..0000000
@@ -1 +0,0 @@
-/busybox-config
target/xtensa/Makefile.in deleted +0 -1
deleted file mode 100644
index 8a654b9..0000000
@@ -1 +0,0 @@
--include target/xtensa/*/*.mk
target/xtensa/defconfig deleted +0 -129

129 lines not on this page · raw message

target/xtensa/patch.in deleted +0 -33
deleted file mode 100644
index 3fe5cc8..0000000
@@ -1,33 +0,0 @@
-ifneq ($(filter xtensa%,$(ARCH)),)
-#############################################################
-#
-#  Xtensa processor architecture (including Diamond Standard cores)
-#
-#############################################################
-
-#  The following defines a function to be used like this:
-#	$(call XTENSA_PATCH, <module>, <patchdir>, <relative dir list...>)
-#  which returns the first overlay patch file for <module> found
-#  in the list of directories <relative dir list...> which are
-#  relative to <patchdir> (itself either absolute or relative to the
-#  current directory).  The returned filename is relative to <patchdir>.
-#  For example:
-#	$(call XTENSA_PATCH, binutils, some/dir/path, . ..)
-#  (no commas between directory paths in the list).
-#
-#  A selected overlay patch must exist ("fsf" means no specific
-#  overlay is selected).  So the function emits a Makefile error
-#  if a selected patch file is not found.
-
-XTENSA_CORENAME:=$(call qstrip,$(BR2_xtensa_core_name))
-ifeq ($(XTENSA_CORENAME),fsf)
-XTENSA_PATCH =
-else
-XTENSA_PATCH_SUFFIX = $(1)-xtensa_$(XTENSA_CORENAME).tgz
-XTENSA_PATCH_FILE = $(firstword $(wildcard $(patsubst %,$(2)/%/*$(XTENSA_PATCH_SUFFIX),$(3))))
-# FULLPATH = $(if $(filter /%,$(1)),$(1),$(PWD)/$(1))
-XTENSA_PATCH = $(if $(XTENSA_PATCH_FILE),$(patsubst $(2)/%,%,$(XTENSA_PATCH_FILE)),\
-	$(error Missing $(1) patch for Xtensa $(XTENSA_CORENAME) processor (*$(XTENSA_PATCH_SUFFIX) in $(addprefix $(2)/,$(3)))))
-endif
-
-endif
target/xtensa/setup-config deleted +0 -57

57 lines not on this page · raw message

target/xtensa/uClibc-0.9.30.config deleted +0 -245

245 lines not on this page · raw message

target/xtensa/uClibc.config deleted +0 -190

190 lines not on this page · raw message

target/xtensa/xt-buildroot-overlay-install deleted +0 -488

488 lines not on this page · raw message

toolchain/gcc/gcc-uclibc-4.x.mk +0 -5
index a4faf4f..06e4f67 100644
@@ -33,11 +33,6 @@ else
  GCC_SITE:=$(BR2_GNU_MIRROR)/gcc/gcc-$(GCC_VERSION)
 endif
 
-ifneq ($(filter xtensa%,$(ARCH)),)
-include target/xtensa/patch.in
-GCC_PATCH_EXTRA:=$(call XTENSA_PATCH,gcc,$(GCC_PATCH_DIR),. ..)
-endif
-
 GCC_SOURCE:=gcc-$(GCC_VERSION).tar.bz2
 GCC_PATCH_DIR:=toolchain/gcc/$(GCC_VERSION)
 GCC_DIR:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)
toolchain/gdb/gdb.mk +0 -5
index b5c085b..b8f49e5 100644
@@ -16,11 +16,6 @@ else
  GDB_PATCH_DIR:=toolchain/gdb/$(GDB_VERSION)
 endif
 
-ifneq ($(filter xtensa%,$(ARCH)),)
-include target/xtensa/patch.in
-GDB_PATCH_EXTRA:=$(call XTENSA_PATCH,gdb,$(GDB_PATCH_DIR),. ..)
-endif
-
 GDB_DIR:=$(TOOLCHAIN_DIR)/gdb-$(GDB_VERSION)
 
 $(DL_DIR)/$(GDB_SOURCE):
toolchain/toolchain-common.in +1 -1
index fb87a88..3c3fd0d 100644
@@ -75,7 +75,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_mips || BR2_mipsel || BR2_sh
 	default y if !BR2_bfin
 	help
 	  If your target has a MMU, you should say Y here.  If you
Signature · 1 line
1.7.4.1
#49 lore raw

PATCH 22/22 xtensa: remove support for this architecture

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> The support for Xtensa has been added in July 2009, and no updates Thomas> have ever been done to it, and it requires some special handling, in Thomas> gcc/gdb, has some special Perl scripts, etc.

As discussed on IRC, I would prefer to simply mark Xtensa as deprecated for now, and then remove in the next cycle if nothing happens.

Signature · 1 line
Bye, Peter Korsgaard
#50 lore raw

PATCH 22/22 xtensa: remove support for this architecture

Le Wed, 25 Apr 2012 10:44:38 +0200,
Peter Korsgaard <[email protected]> a ?crit :

Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> The support for Xtensa has been added in July 2009, and no updates Thomas> have ever been done to it, and it requires some special handling, in Thomas> gcc/gdb, has some special Perl scripts, etc.

As discussed on IRC, I would prefer to simply mark Xtensa as deprecated for now, and then remove in the next cycle if nothing happens.

I am fine with this decision, and will send a patch that implements it. My patch removing Xtensa support was mainly to get the discussion started.

Thanks,

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#51 lore raw

PATCH 22/22 xtensa: remove support for this architecture

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Le Wed, 25 Apr 2012 10:44:38 +0200, Thomas> Peter Korsgaard <[email protected]> a ?crit :

Quoted 2 lines
Quoted 2 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> The support for Xtensa has been added in July 2009, and no updates Thomas> have ever been done to it, and it requires some special handling, in Thomas> gcc/gdb, has some special Perl scripts, etc.

Quoted 3 lines
Quoted 3 lines

As discussed on IRC, I would prefer to simply mark Xtensa as deprecated for now, and then remove in the next cycle if nothing happens.

Thomas> I am fine with this decision, and will send a patch that implements it. Thomas> My patch removing Xtensa support was mainly to get the discussion Thomas> started.

Good. I already added the BR2_DEPRECATED (555c2585b).

Signature · 1 line
Bye, Peter Korsgaard
#52 lore raw

PATCH 22/22 xtensa: remove support for this architecture

Le Wed, 25 Apr 2012 11:21:56 +0200,
Peter Korsgaard <[email protected]> a ?crit :

Quoted 5 lines

Thomas> I am fine with this decision, and will send a patch that implements it. Thomas> My patch removing Xtensa support was mainly to get the discussion Thomas> started.

Good. I already added the BR2_DEPRECATED (555c2585b).

Ok, thanks!

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#53 lore raw

PATCH 22/22 xtensa: remove support for this architecture

In reply to Thomas Petazzoni
Quoted 12 lines · Thomas Petazzoni

Le Wed, 25 Apr 2012 10:44:38 +0200,
Peter Korsgaard <[email protected]> a ?crit :

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni

Quoted 7 lines · <[email protected]> writes:

Thomas> The support for Xtensa has been added in July Thomas> 2009, and no updates
Thomas> have ever been done to it, and it requires some Thomas> special handling, in
Thomas> gcc/gdb, has some special Perl scripts, etc.

Quoted 8 lines
Quoted 3 lines

As discussed on IRC, I would prefer to simply mark Xtensa as deprecated
for now, and then remove in the next cycle if nothing happens.

I am fine with this decision, and will send a patch that implements it.
My patch removing Xtensa support was mainly to get the discussion started.

Thanks for the reprieve. How far is that "next cycle"?

-Marc

#54 lore raw

PATCH 22/22 xtensa: remove support for this architecture

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Marc" == Marc Gauthier <[email protected]> writes:

Hi,

Quoted 3 lines
Quoted 3 lines

I am fine with this decision, and will send a patch that implements it. My patch removing Xtensa support was mainly to get the discussion started.

Marc> Thanks for the reprieve. How far is that "next cycle"?

Buildroot gets released every 3 months. The next release is for end of May, so June->August.

Signature · 1 line
Bye, Peter Korsgaard