* [Buildroot] [PATCH 01/13] configs/freescale_p1010rdb_pa: remove U-Boot build
2016-10-15 14:50 [Buildroot] Deprecate BR2_DEPRECATED Arnout Vandecappelle
@ 2016-10-15 14:50 ` Arnout Vandecappelle
2016-10-15 18:01 ` Peter Korsgaard
2016-10-15 14:50 ` [Buildroot] [PATCH 02/13] configs/freescale_mpc8315erdb: " Arnout Vandecappelle
` (11 subsequent siblings)
12 siblings, 1 reply; 29+ messages in thread
From: Arnout Vandecappelle @ 2016-10-15 14:50 UTC (permalink / raw)
To: buildroot
Binutils was locked down to 2.24 because U-Boot 2014.01 didn't build
with more recent binutils. However, this doesn't work anymore because
binutils 2.24 is deprecated.
Current U-Boot 2016.09.01 does build successfully, but we don't have a
board anymore to test it.
Since updating U-Boot is generally not needed anyway, we just remove
the U-Boot support.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
board/freescale/p1010rdb/readme.txt | 45 +++------------------------------
configs/freescale_p1010rdb_pa_defconfig | 8 ------
2 files changed, 4 insertions(+), 49 deletions(-)
diff --git a/board/freescale/p1010rdb/readme.txt b/board/freescale/p1010rdb/readme.txt
index b119f9a..025c97e 100644
--- a/board/freescale/p1010rdb/readme.txt
+++ b/board/freescale/p1010rdb/readme.txt
@@ -1,28 +1,3 @@
-
-******************** WARNING ********************
-The compiled U-Boot binary is intended for NOR flash only!
-It won't work for NAND or SPI and will brick those bootloaders!
-
-Also don't go playing around with different U-boot versions or flash targets
-unless you've got the necessary hardware and/or know-how to unbrick your kit.
-
-2014.01 is known good for NOR on the P1010RDB-PA kit.
-
-Freescale released a revised version of the kit with a faster processor and
-some other hardware changes named P1010RDB-PB. U-Boot needs to be configured
-differently for this kit hence this default config WILL NOT WORK.
-This is ONLY related to U-Boot, otherwise the configuration is the same,
-you can perfectly use the generated kernel and rootfs.
-
-IF you want to build an U-Boot for the new kit just change
-BR2_TARGET_UBOOT_BOARDNAME from P1010RDB-PA_NOR to P1010RDB-PB_NOR.
-!!!!! THIS IS COMPLETELY UNTESTED BY BR DEVS SO YOU ARE ON YOUR OWN !!!!!
-If it works we'd like to know so drop an email to the mailing list. Thanks.
-
-If your kit doesn't mention PA nor PB in their shipping inventory then it's
-the old version (PA).
-******************** WARNING ********************
-
You'll need to program the files created by buildroot into the flash.
The fast way is to tftp transfer the files via one of the network interfaces.
@@ -31,37 +6,25 @@ file transfer from your terminal program by using a "loady" command
from the u-boot prompt instead of the "tftp ..." commands stated below.
Beware that serial console file transfers are quite slow!
-Remember to set the P1010RDB switches to NOR boot if you want to use
-your newly built U-Boot.
-
-1. Program the new U-Boot binary to NOR flash (optional)
- If you don't feel confident upgrading your bootloader then don't do it,
- it's unnecessary most of the time.
-
- => tftp $loadaddr u-boot.bin
- => protect off 0xeff80000 +$filesize
- => erase 0xeff80000 +$filesize
- => cp.b $loadaddr 0xeff80000 $filesize
-
-2. Program the DTB to NOR flash
+1. Program the DTB to NOR flash
=> tftp $loadaddr p1010rdb-pa.dtb
=> erase 0xee000000 +$filesize
=> cp.b $loadaddr 0xee000000 $filesize
-3. Program the kernel to NOR flash
+2. Program the kernel to NOR flash
=> tftp $loadaddr uImage
=> erase 0xee080000 +$filesize
=> cp.b $loadaddr 0xee080000 $filesize
-4. Program the root filesystem to NOR flash
+3. Program the root filesystem to NOR flash
=> tftp $loadaddr rootfs.jffs2
=> erase 0xee800000 0xeff5ffff
=> cp.b $loadaddr 0xee800000 $filesize
-5. Booting your new system
+4. Booting your new system
=> setenv norboot 'setenv bootargs root=/dev/mtdblock2 rootfstype=jffs2 console=$consoledev,$baudrate;bootm 0xee080000 - 0xee000000'
diff --git a/configs/freescale_p1010rdb_pa_defconfig b/configs/freescale_p1010rdb_pa_defconfig
index 7f48248..3497275 100644
--- a/configs/freescale_p1010rdb_pa_defconfig
+++ b/configs/freescale_p1010rdb_pa_defconfig
@@ -25,11 +25,3 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="p1010rdb-pa"
# Serial port config
BR2_TARGET_GENERIC_GETTY=y
BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
-
-# Bootloader
-# Lock down binutils to <2.25 to avoid U-Boot build failure
-BR2_BINUTILS_VERSION_2_24_X=y
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="P1010RDB-PA_NOR"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.01"
--
2.9.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 01/13] configs/freescale_p1010rdb_pa: remove U-Boot build
2016-10-15 14:50 ` [Buildroot] [PATCH 01/13] configs/freescale_p1010rdb_pa: remove U-Boot build Arnout Vandecappelle
@ 2016-10-15 18:01 ` Peter Korsgaard
0 siblings, 0 replies; 29+ messages in thread
From: Peter Korsgaard @ 2016-10-15 18:01 UTC (permalink / raw)
To: buildroot
>>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> writes:
> Binutils was locked down to 2.24 because U-Boot 2014.01 didn't build
> with more recent binutils. However, this doesn't work anymore because
> binutils 2.24 is deprecated.
> Current U-Boot 2016.09.01 does build successfully, but we don't have a
> board anymore to test it.
> Since updating U-Boot is generally not needed anyway, we just remove
> the U-Boot support.
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 02/13] configs/freescale_mpc8315erdb: remove U-Boot build
2016-10-15 14:50 [Buildroot] Deprecate BR2_DEPRECATED Arnout Vandecappelle
2016-10-15 14:50 ` [Buildroot] [PATCH 01/13] configs/freescale_p1010rdb_pa: remove U-Boot build Arnout Vandecappelle
@ 2016-10-15 14:50 ` Arnout Vandecappelle
2016-10-15 18:02 ` Peter Korsgaard
2016-10-15 14:50 ` [Buildroot] [PATCH 03/13] binutils: remove deprecated 2.24.X Arnout Vandecappelle
` (10 subsequent siblings)
12 siblings, 1 reply; 29+ messages in thread
From: Arnout Vandecappelle @ 2016-10-15 14:50 UTC (permalink / raw)
To: buildroot
Binutils was locked down to 2.24 because U-Boot 2014.01 didn't build
with more recent binutils. However, this doesn't work anymore because
binutils 2.24 is deprecated.
Current U-Boot 2016.09.01 doesn't work out of the box because the
u-boot-nand.img support has been removed.
Since updating U-Boot is generally not needed anyway, we just remove
the U-Boot support.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
Gustavo still has this board to test again, so when he has time, he
will try to revive with current U-Boot.
---
board/freescale/mpc8315erdb/readme.txt | 30 ++++--------------------------
configs/freescale_mpc8315erdb_defconfig | 9 ---------
2 files changed, 4 insertions(+), 35 deletions(-)
diff --git a/board/freescale/mpc8315erdb/readme.txt b/board/freescale/mpc8315erdb/readme.txt
index 446bd39..b4c87b4 100644
--- a/board/freescale/mpc8315erdb/readme.txt
+++ b/board/freescale/mpc8315erdb/readme.txt
@@ -1,14 +1,3 @@
-
-******************** WARNING ********************
-The compiled U-Boot binary is intended for NAND flash only!
-It won't work for NOR and will brick that bootloader!
-
-Also don't go playing around with different U-boot versions or flash targets
-unless you've got the necessary hardware and/or know-how to unbrick your kit.
-
-2014.04 is known good for NAND.
-******************** WARNING ********************
-
You'll need to program the files created by buildroot into the flash.
The fast way is to tftp transfer the files via one of the network interfaces.
@@ -17,36 +6,25 @@ file transfer from your terminal program by using a "loady" command
from the u-boot prompt instead of the "tftp ..." commands stated below.
Beware that serial console file transfers are quite slow!
-Remember to set the MPC8315ERDB switches to NAND boot if you want to use
-your newly built U-Boot.
-
-1. Program the new U-Boot binary to NAND flash (optional)
- If you don't feel confident upgrading your bootloader then don't do it,
- it's unnecessary most of the time.
-
- => tftp $loadaddr u-boot-nand.bin
- => nand erase 0 0x80000
- => nand write $loadaddr 0 0x80000 $filesize
-
-2. Program the kernel to NAND flash
+1. Program the kernel to NAND flash
=> tftp $loadaddr uImage
=> nand erase 0x100000 0x1e0000
=> nand write $loadaddr 0x100000 0x1e0000
-3. Program the DTB to NAND flash
+2. Program the DTB to NAND flash
=> tftp $loadaddr mpc8315erdb.dtb
=> nand erase 0x2e0000 0x20000
=> nand write $loadaddr 0x2e0000 0x20000
-4. Program the root filesystem to NAND flash
+3. Program the root filesystem to NAND flash
=> tftp $loadaddr rootfs.jffs2
=> nand erase 0x400000 0x1c00000
=> nand write $loadaddr 0x400000 $filesize
-5. Booting your new system
+4. Booting your new system
=> setenv nandboot 'setenv bootargs root=/dev/mtdblock3 rootfstype=jffs2 console=$consoledev,$baudrate;nand read $fdtaddr 0x2e0000 0x20000;nand read $loadaddr 0x100000 0x1e0000;bootm $loadaddr - $fdtaddr'
diff --git a/configs/freescale_mpc8315erdb_defconfig b/configs/freescale_mpc8315erdb_defconfig
index 628aaad..de7e561 100644
--- a/configs/freescale_mpc8315erdb_defconfig
+++ b/configs/freescale_mpc8315erdb_defconfig
@@ -26,12 +26,3 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="mpc8315erdb"
# Serial port config
BR2_TARGET_GENERIC_GETTY=y
BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
-
-# Bootloader
-# Lock down binutils to <2.25 to avoid U-Boot build failure
-BR2_BINUTILS_VERSION_2_24_X=y
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="MPC8315ERDB_NAND"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.04"
-BR2_TARGET_UBOOT_FORMAT_NAND_BIN=y
--
2.9.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 02/13] configs/freescale_mpc8315erdb: remove U-Boot build
2016-10-15 14:50 ` [Buildroot] [PATCH 02/13] configs/freescale_mpc8315erdb: " Arnout Vandecappelle
@ 2016-10-15 18:02 ` Peter Korsgaard
0 siblings, 0 replies; 29+ messages in thread
From: Peter Korsgaard @ 2016-10-15 18:02 UTC (permalink / raw)
To: buildroot
>>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> writes:
> Binutils was locked down to 2.24 because U-Boot 2014.01 didn't build
> with more recent binutils. However, this doesn't work anymore because
> binutils 2.24 is deprecated.
> Current U-Boot 2016.09.01 doesn't work out of the box because the
> u-boot-nand.img support has been removed.
> Since updating U-Boot is generally not needed anyway, we just remove
> the U-Boot support.
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
> Gustavo still has this board to test again, so when he has time, he
> will try to revive with current U-Boot.
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 03/13] binutils: remove deprecated 2.24.X
2016-10-15 14:50 [Buildroot] Deprecate BR2_DEPRECATED Arnout Vandecappelle
2016-10-15 14:50 ` [Buildroot] [PATCH 01/13] configs/freescale_p1010rdb_pa: remove U-Boot build Arnout Vandecappelle
2016-10-15 14:50 ` [Buildroot] [PATCH 02/13] configs/freescale_mpc8315erdb: " Arnout Vandecappelle
@ 2016-10-15 14:50 ` Arnout Vandecappelle
2016-10-15 18:04 ` Peter Korsgaard
2016-10-15 14:50 ` [Buildroot] [PATCH 04/13] gcc: remove deprecated 4.7.x Arnout Vandecappelle
` (9 subsequent siblings)
12 siblings, 1 reply; 29+ messages in thread
From: Arnout Vandecappelle @ 2016-10-15 14:50 UTC (permalink / raw)
To: buildroot
We will remove BR2_DEPRECATED, so remove this deprecated option.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
Config.in.legacy | 8 ++++++++
package/binutils/Config.in.host | 11 -----------
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index 2fae812..45814ca 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,14 @@ endif
###############################################################################
comment "Legacy options removed in 2016.11"
+config BR2_BINUTILS_VERSION_2_24_X
+ bool "binutils version 2.24 support removed"
+ select BR2_LEGACY
+ help
+ Support for binutils version 2.24 has been removed. The
+ current default version (2.26 or later) has been selected
+ instead.
+
config BR2_PACKAGE_WESTON_RPI
bool "Weston propietary RPI support is gone"
select BR2_LEGACY
diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host
index 5ea5f31..3e0c357 100644
--- a/package/binutils/Config.in.host
+++ b/package/binutils/Config.in.host
@@ -7,16 +7,6 @@ choice
help
Select the version of binutils you wish to use.
- config BR2_BINUTILS_VERSION_2_24_X
- depends on BR2_DEPRECATED_SINCE_2016_11
- # supported, but broken on Nios-II, Blackfin and powerpc64le
- depends on !BR2_nios2 && !BR2_powerpc64le && !BR2_bfin
- # Unsupported for MIPS R6
- depends on !BR2_mips_32r6 && !BR2_mips_64r6
- # Unsupported ARM cores
- depends on !BR2_cortex_a17
- bool "binutils 2.24"
-
config BR2_BINUTILS_VERSION_2_25_X
bool "binutils 2.25.1"
# supported but broken on Blackfin
@@ -33,7 +23,6 @@ endchoice
config BR2_BINUTILS_VERSION
string
default "arc-2016.09-eng015" if BR2_arc
- default "2.24" if BR2_BINUTILS_VERSION_2_24_X
default "2.25.1" if BR2_BINUTILS_VERSION_2_25_X
default "2.26.1" if BR2_BINUTILS_VERSION_2_26_X
default "2.27" if BR2_BINUTILS_VERSION_2_27_X
--
2.9.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 04/13] gcc: remove deprecated 4.7.x
2016-10-15 14:50 [Buildroot] Deprecate BR2_DEPRECATED Arnout Vandecappelle
` (2 preceding siblings ...)
2016-10-15 14:50 ` [Buildroot] [PATCH 03/13] binutils: remove deprecated 2.24.X Arnout Vandecappelle
@ 2016-10-15 14:50 ` Arnout Vandecappelle
2016-10-15 15:18 ` Thomas Petazzoni
2016-10-15 19:26 ` Peter Korsgaard
2016-10-15 14:50 ` [Buildroot] [PATCH 05/13] ipkg: remove deprecated package Arnout Vandecappelle
` (8 subsequent siblings)
12 siblings, 2 replies; 29+ messages in thread
From: Arnout Vandecappelle @ 2016-10-15 14:50 UTC (permalink / raw)
To: buildroot
We will remove BR2_DEPRECATED, so remove this deprecated option.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
Config.in.legacy | 7 +++++++
package/gcc/Config.in.host | 23 -----------------------
package/gcc/gcc-final/gcc-final.mk | 12 ------------
package/uclibc/uclibc.mk | 7 +++----
4 files changed, 10 insertions(+), 39 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index 45814ca..7d68c67 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,13 @@ endif
###############################################################################
comment "Legacy options removed in 2016.11"
+config BR2_GCC_VERSION_4_7_X
+ bool "gcc 4.7.x support removed"
+ select BR2_LEGACY
+ help
+ Support for gcc version 4.7.x has been removed. The current
+ default version (4.9.x or later) has been selected instead.
+
config BR2_BINUTILS_VERSION_2_24_X
bool "binutils version 2.24 support removed"
select BR2_LEGACY
diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index 5b847fa..69f3ffd 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -13,28 +13,6 @@ choice
help
Select the version of gcc you wish to use.
- config BR2_GCC_VERSION_4_7_X
- bool "gcc 4.7.x"
- depends on BR2_DEPRECATED_SINCE_2016_05
- # Broken or unsupported architectures
- depends on !BR2_microblaze && !BR2_aarch64 && !BR2_arc \
- && !BR2_powerpc64le && !BR2_nios2 && !BR2_bfin
- # Broken or unsupported ARM cores
- depends on !BR2_cortex_a12 && !BR2_pj4 && !BR2_cortex_a17
- # Broken or unsupported PPC cores
- depends on !BR2_powerpc_e5500 && !BR2_powerpc_e6500 && \
- !BR2_powerpc_power8
- # SPARC -mcpu=leon3 appeared in gcc 4.8.x
- depends on !BR2_sparc_leon3
- # Broken or unsupported x86 cores
- depends on !BR2_x86_jaguar && !BR2_x86_steamroller
- # Unsupported for MIPS R6
- depends on !BR2_mips_32r6 && !BR2_mips_64r6
- # musl ppc64 unsupported
- depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el))
- select BR2_GCC_NEEDS_MPC
- select BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
-
config BR2_GCC_VERSION_4_8_X
bool "gcc 4.8.x"
# Broken or unsupported architectures
@@ -116,7 +94,6 @@ config BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
config BR2_GCC_VERSION
string
- default "4.7.4" if BR2_GCC_VERSION_4_7_X
default "4.8.5" if BR2_GCC_VERSION_4_8_X
default "4.9.4" if BR2_GCC_VERSION_4_9_X
default "5.4.0" if BR2_GCC_VERSION_5_X
diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
index 36f185e..9104273 100644
--- a/package/gcc/gcc-final/gcc-final.mk
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -118,18 +118,6 @@ HOST_GCC_FINAL_POST_BUILD_HOOKS += TOOLCHAIN_BUILD_WRAPPER
# -cc symlink to the wrapper is not created.
HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_INSTALL_WRAPPER_AND_SIMPLE_SYMLINKS
-# In gcc 4.7.x, the ARM EABIhf library loader path for glibc was not
-# correct, so we create a symbolic link to make things work
-# properly. glibc installs the library loader as ld-linux-armhf.so.3,
-# but gcc creates binaries that reference ld-linux.so.3.
-ifeq ($(BR2_arm)$(BR2_ARM_EABIHF)$(BR2_GCC_VERSION_4_7_X)$(BR2_TOOLCHAIN_USES_GLIBC),yyyy)
-define HOST_GCC_FINAL_LD_LINUX_LINK
- ln -sf ld-linux-armhf.so.3 $(TARGET_DIR)/lib/ld-linux.so.3
- ln -sf ld-linux-armhf.so.3 $(STAGING_DIR)/lib/ld-linux.so.3
-endef
-HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_LD_LINUX_LINK
-endif
-
# coldfire is not working without removing these object files from libgcc.a
ifeq ($(BR2_m68k_cf),y)
define HOST_GCC_FINAL_M68K_LIBGCC_FIXUP
diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index 16fc0dd..da83d8a 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -113,10 +113,9 @@ define UCLIBC_ARM_ABI_CONFIG
$(call KCONFIG_ENABLE_OPT,CONFIG_ARM_EABI,$(@D)/.config)
endef
-# Thumb1 build is broken with threads with old gcc versions (4.7 and
-# 4.8). Since all cores supporting Thumb1 also support ARM, we use ARM
-# code in this case.
-ifeq ($(BR2_GCC_VERSION_4_7_X)$(BR2_GCC_VERSION_4_8_X):$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_TOOLCHAIN_HAS_THREADS),y:yy)
+# Thumb1 build is broken with threads with old gcc versions (< 4.8). Since
+# all cores supporting Thumb1 also support ARM, we use ARM code in this case.
+ifeq ($(BR2_GCC_VERSION_4_8_X)$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_TOOLCHAIN_HAS_THREADS),yyy)
UCLIBC_EXTRA_CFLAGS += -marm
endif
--
2.9.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 04/13] gcc: remove deprecated 4.7.x
2016-10-15 14:50 ` [Buildroot] [PATCH 04/13] gcc: remove deprecated 4.7.x Arnout Vandecappelle
@ 2016-10-15 15:18 ` Thomas Petazzoni
2016-10-15 16:28 ` Arnout Vandecappelle
2016-10-15 19:26 ` Peter Korsgaard
1 sibling, 1 reply; 29+ messages in thread
From: Thomas Petazzoni @ 2016-10-15 15:18 UTC (permalink / raw)
To: buildroot
Hello,
On Sat, 15 Oct 2016 16:50:58 +0200, Arnout Vandecappelle
(Essensium/Mind) wrote:
> We will remove BR2_DEPRECATED, so remove this deprecated option.
>
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> ---
> Config.in.legacy | 7 +++++++
> package/gcc/Config.in.host | 23 -----------------------
> package/gcc/gcc-final/gcc-final.mk | 12 ------------
> package/uclibc/uclibc.mk | 7 +++----
> 4 files changed, 10 insertions(+), 39 deletions(-)
This commit forgets to remove the gcc patches. It can be fixed when
applying, I don't think it's worth resending just for this.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 04/13] gcc: remove deprecated 4.7.x
2016-10-15 15:18 ` Thomas Petazzoni
@ 2016-10-15 16:28 ` Arnout Vandecappelle
0 siblings, 0 replies; 29+ messages in thread
From: Arnout Vandecappelle @ 2016-10-15 16:28 UTC (permalink / raw)
To: buildroot
On 15-10-16 17:18, Thomas Petazzoni wrote:
> Hello,
>
> On Sat, 15 Oct 2016 16:50:58 +0200, Arnout Vandecappelle
> (Essensium/Mind) wrote:
>> We will remove BR2_DEPRECATED, so remove this deprecated option.
>>
>> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>> ---
>> Config.in.legacy | 7 +++++++
>> package/gcc/Config.in.host | 23 -----------------------
>> package/gcc/gcc-final/gcc-final.mk | 12 ------------
>> package/uclibc/uclibc.mk | 7 +++----
>> 4 files changed, 10 insertions(+), 39 deletions(-)
>
> This commit forgets to remove the gcc patches. It can be fixed when
> applying, I don't think it's worth resending just for this.
Actually, same for binutils.
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
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: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 04/13] gcc: remove deprecated 4.7.x
2016-10-15 14:50 ` [Buildroot] [PATCH 04/13] gcc: remove deprecated 4.7.x Arnout Vandecappelle
2016-10-15 15:18 ` Thomas Petazzoni
@ 2016-10-15 19:26 ` Peter Korsgaard
1 sibling, 0 replies; 29+ messages in thread
From: Peter Korsgaard @ 2016-10-15 19:26 UTC (permalink / raw)
To: buildroot
>>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> writes:
> We will remove BR2_DEPRECATED, so remove this deprecated option.
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Committed after removing the now unused patches, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 05/13] ipkg: remove deprecated package
2016-10-15 14:50 [Buildroot] Deprecate BR2_DEPRECATED Arnout Vandecappelle
` (3 preceding siblings ...)
2016-10-15 14:50 ` [Buildroot] [PATCH 04/13] gcc: remove deprecated 4.7.x Arnout Vandecappelle
@ 2016-10-15 14:50 ` Arnout Vandecappelle
2016-10-15 20:57 ` Peter Korsgaard
2016-10-15 14:51 ` [Buildroot] [PATCH 06/13] kodi-addon-xvdr: " Arnout Vandecappelle
` (7 subsequent siblings)
12 siblings, 1 reply; 29+ messages in thread
From: Arnout Vandecappelle @ 2016-10-15 14:50 UTC (permalink / raw)
To: buildroot
We will remove BR2_DEPRECATED, so remove this deprecated package.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
Config.in.legacy | 8 +++
package/Config.in | 1 -
package/ipkg/0001-fix-musl-build.patch | 50 -------------
package/ipkg/0002-fix-nommu.patch | 24 -------
package/ipkg/Config.in | 7 --
package/ipkg/ipkg-build | 127 ---------------------------------
package/ipkg/ipkg.hash | 2 -
package/ipkg/ipkg.mk | 13 ----
8 files changed, 8 insertions(+), 224 deletions(-)
delete mode 100644 package/ipkg/0001-fix-musl-build.patch
delete mode 100644 package/ipkg/0002-fix-nommu.patch
delete mode 100644 package/ipkg/Config.in
delete mode 100755 package/ipkg/ipkg-build
delete mode 100644 package/ipkg/ipkg.hash
delete mode 100644 package/ipkg/ipkg.mk
diff --git a/Config.in.legacy b/Config.in.legacy
index 7d68c67..c27ae3d 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,14 @@ endif
###############################################################################
comment "Legacy options removed in 2016.11"
+config BR2_PACKAGE_IPKG
+ bool "ipkg removed"
+ select BR2_LEGACY
+ help
+ ipkg dates back to the early 2000s when Compaq started the
+ handhelds.org project and it hasn't seen development since 2006.
+ Use opkg as a replacement.
+
config BR2_GCC_VERSION_4_7_X
bool "gcc 4.7.x support removed"
select BR2_LEGACY
diff --git a/package/Config.in b/package/Config.in
index 1b0ffcf..0257685 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1651,7 +1651,6 @@ comment "* "
comment "See the manual: "
comment "http://buildroot.org/manual.html#faq-no-binary-packages"
comment "-------------------------------------------------------"
- source "package/ipkg/Config.in"
source "package/opkg/Config.in"
source "package/rpm/Config.in"
endmenu
diff --git a/package/ipkg/0001-fix-musl-build.patch b/package/ipkg/0001-fix-musl-build.patch
deleted file mode 100644
index fce3ec4..0000000
--- a/package/ipkg/0001-fix-musl-build.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Remove __P macro usage to fix musl build
-
-__P() is used for compatibility with old K&R C compilers. With ANSI C
-this macro has no effect.
-
-This fixes a compilation error with musl libc because of undeclared
-__P.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/md5.c
-===================================================================
---- a/md5.c
-+++ b/md5.c
-@@ -97,21 +97,21 @@
-
- /* Initialize structure containing state of computation.
- (RFC 1321, 3.3: Step 3) */
--static void md5_init_ctx __P ((struct md5_ctx *ctx));
-+static void md5_init_ctx (struct md5_ctx *ctx);
-
- /* Starting with the result of former calls of this function (or the
- initialization function update the context for the next LEN bytes
- starting at BUFFER.
- It is necessary that LEN is a multiple of 64!!! */
--static void md5_process_block __P ((const void *buffer, size_t len,
-- struct md5_ctx *ctx));
-+static void md5_process_block (const void *buffer, size_t len,
-+ struct md5_ctx *ctx);
-
- /* Starting with the result of former calls of this function (or the
- initialization function update the context for the next LEN bytes
- starting at BUFFER.
- It is NOT required that LEN is a multiple of 64. */
--static void md5_process_bytes __P ((const void *buffer, size_t len,
-- struct md5_ctx *ctx));
-+static void md5_process_bytes (const void *buffer, size_t len,
-+ struct md5_ctx *ctx);
-
- /* Process the remaining bytes in the buffer and put result from CTX
- in first 16 bytes following RESBUF. The result is always in little
-@@ -120,7 +120,7 @@
-
- IMPORTANT: On some systems it is required that RESBUF is correctly
- aligned for a 32 bits value. */
--static void *md5_finish_ctx __P ((struct md5_ctx *ctx, void *resbuf));
-+static void *md5_finish_ctx (struct md5_ctx *ctx, void *resbuf);
-
- //----------------------------------------------------------------------------
- //--------end of md5.h
diff --git a/package/ipkg/0002-fix-nommu.patch b/package/ipkg/0002-fix-nommu.patch
deleted file mode 100644
index 64cec1e..0000000
--- a/package/ipkg/0002-fix-nommu.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-libbb: fix no MMU build
-
-uClibc-ng defines __ARCH_HAS_MMU__ for ARM or m68k because these
-architectures may potentially have MMU. The code should test for
-__ARCH_USE_MMU__, which indicates if the MMU is really in use. But
-since the configure script detects the presence of fork(), using
-HAVE_FORK directly is a better solution.
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Patch status: no active upstream
-
-diff -Nuar ipkg-0.99.163-orig/libbb/libbb.h ipkg-0.99.163/libbb/libbb.h
---- ipkg-0.99.163-orig/libbb/libbb.h 2006-02-06 10:13:02.000000000 +0200
-+++ ipkg-0.99.163/libbb/libbb.h 2016-07-26 13:50:09.296988855 +0300
-@@ -341,7 +341,7 @@
- #define CONSOLE_DEV "/dev/console"
-
- /* Cope with mmu-less systems somewhat gracefully */
--#if defined(__UCLIBC__) && !defined(__ARCH_HAS_MMU__)
-+#if !defined(HAVE_FORK)
- #define fork vfork
- #endif
-
diff --git a/package/ipkg/Config.in b/package/ipkg/Config.in
deleted file mode 100644
index a987bd6..0000000
--- a/package/ipkg/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_IPKG
- bool "ipkg"
- depends on BR2_DEPRECATED_SINCE_2016_08
- help
- The Itsy Package Installer from handhelds.org
-
- http://www.handhelds.org
diff --git a/package/ipkg/ipkg-build b/package/ipkg/ipkg-build
deleted file mode 100755
index f3f5d0c..0000000
--- a/package/ipkg/ipkg-build
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/bin/sh
-
-# ipkg-build -- construct a .ipk from a directory
-# Carl Worth <cworth@east.isi.edu>
-# based on a script by Steve Redler IV, steve at sr-tech.com 5-21-2001
-set -e
-
-ipkg_extract_value() {
- sed -e "s/^[^:]*:[[:space:]]*//"
-}
-
-required_field() {
- field=$1
-
- value=`grep "^$field:" < $CONTROL/control | ipkg_extract_value`
- if [ -z "$value" ]; then
- echo "ipkg-build: Error: $CONTROL/control is missing field $field" ;
- PKG_ERROR=1
- fi
- echo $value
-}
-
-pkg_appears_sane() {
- local pkg_dir=$1
-
- local owd=`pwd`
- cd $pkg_dir
-
- PKG_ERROR=0
- if [ ! -f "$CONTROL/control" ]; then
- echo "ipkg-build: Error: Control file $pkg_dir/$CONTROL/control not found."
- cd $owd
- return 1
- fi
-
- pkg=`required_field Package`
- version=`required_field Version`
- arch=`required_field Architecture`
- required_field Maintainer >/dev/null
- required_field Description >/dev/null
-
- if echo $pkg | grep '[^a-z0-9.+-]'; then
- echo "ipkg-build: Error: Package name $name contains illegal characters, (other than [a-z0-9.+-])"
- PKG_ERROR=1;
- fi
-
- local bad_fields=`sed -ne 's/^\([^[:space:]][^:[:space:]]\+[[:space:]]\+\)[^:].*/\1/p' < $CONTROL/control | sed -e 's/\\n//'`
- if [ -n "$bad_fields" ]; then
- bad_fields=`echo $bad_fields`
- echo "ipkg-build: Error: The following fields in $CONTROL/control are missing a ':'"
- echo " $bad_fields"
- echo "ipkg-build: This may be due to a missing initial space for a multi-line field value"
- PKG_ERROR=1
- fi
-
- for script in $CONTROL/preinst $CONTROL/postinst $CONTROL/prerm $CONTROL/postrm; do
- if [ -f $script -a ! -x $script ]; then
- echo "ipkg-build: Error: package script $script is not executable"
- PKG_ERROR=1
- fi
- done
-
- if [ -f $CONTROL/conffiles ]; then
- for cf in `cat $CONTROL/conffiles`; do
- if [ ! -f ./$cf ]; then
- echo "ipkg-build: Error: $CONTROL/conffiles mentions conffile $cf which does not exist"
- PKG_ERROR=1
- fi
- done
- fi
-
- cd $owd
- return $PKG_ERROR
-}
-
-###
-# ipkg-build "main"
-###
-
-case $# in
-1)
- dest_dir=.
- ;;
-2)
- dest_dir=$2
- ;;
-*)
- echo "Usage: ipkg-build <pkg_directory> [<destination_directory>]" ;
- exit 1
- ;;
-esac
-
-pkg_dir=$1
-
-if [ ! -d $pkg_dir ]; then
- echo "ipkg-build: Error: Directory $pkg_dir does not exist"
- exit 1
-fi
-
-# CONTROL is second so that it takes precedence
-CONTROL=
-[ -d $pkg_dir/DEBIAN ] && CONTROL=DEBIAN
-[ -d $pkg_dir/CONTROL ] && CONTROL=CONTROL
-if [ -z "$CONTROL" ]; then
- echo "ipkg-build: Error: Directory $pkg_dir has no CONTROL subdirectory."
- exit 1
-fi
-
-if ! pkg_appears_sane $pkg_dir; then
- echo "Please fix the above errors and try again."
- exit 1
-fi
-
-tmp_dir=$dest_dir/IPKG_BUILD.$$
-mkdir $tmp_dir
-
-tar -C $pkg_dir -czf $tmp_dir/data.tar.gz . --exclude=$CONTROL
-tar -C $pkg_dir/$CONTROL -czf $tmp_dir/control.tar.gz .
-
-echo "2.0" > $tmp_dir/debian-binary
-
-pkg_file=$dest_dir/${pkg}_${version}_${arch}.ipk
-tar -C $tmp_dir -czf $pkg_file debian-binary data.tar.gz control.tar.gz
-rm $tmp_dir/debian-binary $tmp_dir/data.tar.gz $tmp_dir/control.tar.gz
-rmdir $tmp_dir
-
-echo "Packaged contents of $pkg_dir into $pkg_file"
diff --git a/package/ipkg/ipkg.hash b/package/ipkg/ipkg.hash
deleted file mode 100644
index 34a2d62..0000000
--- a/package/ipkg/ipkg.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# locally computed
-sha256 405743e1ba320ed6095d42a898f1486e3af1d745cae2bd45dfe1d8403a4d8995 ipkg-0.99.163.tar.gz
diff --git a/package/ipkg/ipkg.mk b/package/ipkg/ipkg.mk
deleted file mode 100644
index 10ef207..0000000
--- a/package/ipkg/ipkg.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-#
-# ipkg
-#
-################################################################################
-
-IPKG_VERSION = 0.99.163
-IPKG_SITE = http://www.handhelds.org/download/packages/ipkg
-IPKG_INSTALL_STAGING = YES
-IPKG_LICENSE = GPLv2+
-IPKG_LICENSE_FILES = COPYING
-
-$(eval $(autotools-package))
--
2.9.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 06/13] kodi-addon-xvdr: remove deprecated package
2016-10-15 14:50 [Buildroot] Deprecate BR2_DEPRECATED Arnout Vandecappelle
` (4 preceding siblings ...)
2016-10-15 14:50 ` [Buildroot] [PATCH 05/13] ipkg: remove deprecated package Arnout Vandecappelle
@ 2016-10-15 14:51 ` Arnout Vandecappelle
2016-10-15 21:00 ` Peter Korsgaard
2016-10-15 14:51 ` [Buildroot] [PATCH 07/13] linux-headers: remove deprecated version 4.2 and 4.3 Arnout Vandecappelle
` (6 subsequent siblings)
12 siblings, 1 reply; 29+ messages in thread
From: Arnout Vandecappelle @ 2016-10-15 14:51 UTC (permalink / raw)
To: buildroot
We will remove BR2_DEPRECATED, so remove this deprecated package.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
Config.in.legacy | 15 +++++++++++---
package/kodi-addon-xvdr/0001-xbmc-rebrand.patch | 19 ------------------
package/kodi-addon-xvdr/Config.in | 16 ---------------
package/kodi-addon-xvdr/kodi-addon-xvdr.hash | 2 --
package/kodi-addon-xvdr/kodi-addon-xvdr.mk | 26 -------------------------
package/kodi/Config.in | 1 -
6 files changed, 12 insertions(+), 67 deletions(-)
delete mode 100644 package/kodi-addon-xvdr/0001-xbmc-rebrand.patch
delete mode 100644 package/kodi-addon-xvdr/Config.in
delete mode 100644 package/kodi-addon-xvdr/kodi-addon-xvdr.hash
delete mode 100644 package/kodi-addon-xvdr/kodi-addon-xvdr.mk
diff --git a/Config.in.legacy b/Config.in.legacy
index c27ae3d..5e65d7b 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,14 @@ endif
###############################################################################
comment "Legacy options removed in 2016.11"
+config BR2_PACKAGE_KODI_ADDON_XVDR
+ bool "kodi-addon-xvdr removed"
+ select BR2_LEGACY
+ help
+ According to the github project page:
+ https://github.com/pipelka/xbmc-addon-xvdr
+ this package is discontinued.
+
config BR2_PACKAGE_IPKG
bool "ipkg removed"
select BR2_LEGACY
@@ -1366,11 +1374,12 @@ config BR2_PACKAGE_STRONGSWAN_TOOLS
deprecated.
config BR2_PACKAGE_XBMC_ADDON_XVDR
- bool "xbmc options have been renamed"
+ bool "xbmc-addon-xvdr removed"
select BR2_LEGACY
- select BR2_PACKAGE_KODI_ADDON_XVDR
help
- The XBMC media center project was renamed to Kodi entertainment center
+ According to the github project page:
+ https://github.com/pipelka/xbmc-addon-xvdr
+ this package is discontinued.
config BR2_PACKAGE_XBMC_PVR_ADDONS
bool "xbmc options have been renamed"
diff --git a/package/kodi-addon-xvdr/0001-xbmc-rebrand.patch b/package/kodi-addon-xvdr/0001-xbmc-rebrand.patch
deleted file mode 100644
index 6e87b79..0000000
--- a/package/kodi-addon-xvdr/0001-xbmc-rebrand.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Update for Kodi
-
-Ported from OpenELEC:
-https://github.com/OpenELEC/OpenELEC.tv/blob/master/packages/mediacenter/kodi-addon-xvdr/patches/kodi-addon-xvdr-xbmc-rebrand.patch
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-diff -Naur xbmc-addon-xvdr-2bf2563/configure.ac xbmc-addon-xvdr-2bf2563.patch/configure.ac
---- xbmc-addon-xvdr-2bf2563/configure.ac 2014-10-18 22:02:18.000000000 +0200
-+++ xbmc-addon-xvdr-2bf2563.patch/configure.ac 2014-10-20 03:03:20.525526996 +0200
-@@ -6,7 +6,7 @@
- AC_INIT([xbmc-addon-xvdr], [MAJOR.MINOR.MICRO], [alexander.pipelka at gmail.com])
-
- AC_CONFIG_AUX_DIR(autotools)
--AC_PREFIX_DEFAULT(/usr/lib/xbmc)
-+AC_PREFIX_DEFAULT(/usr/lib/kodi)
-
- AC_CANONICAL_HOST
- AC_CANONICAL_TARGET
diff --git a/package/kodi-addon-xvdr/Config.in b/package/kodi-addon-xvdr/Config.in
deleted file mode 100644
index 85e9d60..0000000
--- a/package/kodi-addon-xvdr/Config.in
+++ /dev/null
@@ -1,16 +0,0 @@
-config BR2_PACKAGE_KODI_ADDON_XVDR
- bool "kodi-addon-xvdr"
- # upstream discontinued the development
- depends on BR2_DEPRECATED_SINCE_2016_05
- help
- This is a PVR add-on for Kodi to add VDR (http://tvdr.de/)
- as a TV/PVR Backend to Kodi.
-
- It adds support for Live TV watching, replaying of Recordings,
- programming Timers and EPG TV Guide to use on same computer or
- over the Network.
-
- https://github.com/pipelka/xbmc-addon-xvdr
-
- Note: since the VDR server is not packaged in Buildroot, using
- this addon requires that a remote VDR server be used.
diff --git a/package/kodi-addon-xvdr/kodi-addon-xvdr.hash b/package/kodi-addon-xvdr/kodi-addon-xvdr.hash
deleted file mode 100644
index 933c7b8..0000000
--- a/package/kodi-addon-xvdr/kodi-addon-xvdr.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Locally computed
-sha256 783796eccc19c639c59b7a05cad1df705d557993b15cc7e29f7dbbd8388d698b kodi-addon-xvdr-ae66610bc2e1a3efe49f4fa0db55ff3a7808a247.tar.gz
diff --git a/package/kodi-addon-xvdr/kodi-addon-xvdr.mk b/package/kodi-addon-xvdr/kodi-addon-xvdr.mk
deleted file mode 100644
index ac7f3cb..0000000
--- a/package/kodi-addon-xvdr/kodi-addon-xvdr.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-################################################################################
-#
-# kodi-addon-xvdr
-#
-################################################################################
-
-# This cset is on master. When a Jarvis branch is made, we should
-# follow it, as incompatible changes in the plugins API can happen
-# on the master branch.
-KODI_ADDON_XVDR_VERSION = ae66610bc2e1a3efe49f4fa0db55ff3a7808a247
-KODI_ADDON_XVDR_SITE = $(call github,pipelka,xbmc-addon-xvdr,$(KODI_ADDON_XVDR_VERSION))
-KODI_ADDON_XVDR_LICENSE = GPLv2+
-KODI_ADDON_XVDR_LICENSE_FILES = COPYING
-
-# There's no ./configure in the git tree, we need to generate it
-# kodi-addon-xvdr uses a weird autogen.sh script, which
-# is even incorrect (it's missing the #! ) Sigh... :-(
-# Fortunately, with our little patch, it autoreconfs nicely! :-)
-KODI_ADDON_XVDR_AUTORECONF = YES
-
-# This really is a runtime dependency, but we need KODI to be installed
-# first, since we'll install files in KODI's directories _after_ KODI has
-# installed his own files
-KODI_ADDON_XVDR_DEPENDENCIES = kodi
-
-$(eval $(autotools-package))
diff --git a/package/kodi/Config.in b/package/kodi/Config.in
index f388a72..1d610b2 100644
--- a/package/kodi/Config.in
+++ b/package/kodi/Config.in
@@ -284,7 +284,6 @@ menu "Audio encoder addons"
endmenu
menu "PVR addons"
- source "package/kodi-addon-xvdr/Config.in"
source "package/kodi-pvr-argustv/Config.in"
source "package/kodi-pvr-dvblink/Config.in"
source "package/kodi-pvr-dvbviewer/Config.in"
--
2.9.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 07/13] linux-headers: remove deprecated version 4.2 and 4.3
2016-10-15 14:50 [Buildroot] Deprecate BR2_DEPRECATED Arnout Vandecappelle
` (5 preceding siblings ...)
2016-10-15 14:51 ` [Buildroot] [PATCH 06/13] kodi-addon-xvdr: " Arnout Vandecappelle
@ 2016-10-15 14:51 ` Arnout Vandecappelle
2016-10-15 21:00 ` Peter Korsgaard
2016-10-15 14:51 ` [Buildroot] [PATCH 08/13] sstrip: remove deprecated package Arnout Vandecappelle
` (5 subsequent siblings)
12 siblings, 1 reply; 29+ messages in thread
From: Arnout Vandecappelle @ 2016-10-15 14:51 UTC (permalink / raw)
To: buildroot
We will remove BR2_DEPRECATED, so remove this deprecated package.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
Config.in.legacy | 20 ++++++++++++++++++++
| 12 ------------
2 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index 5e65d7b..76365e6 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,26 @@ endif
###############################################################################
comment "Legacy options removed in 2016.11"
+config BR2_KERNEL_HEADERS_4_3
+ bool "kernel headers version 4.3.x are no longer supported"
+ select BR2_KERNEL_HEADERS_4_1
+ select BR2_LEGACY
+ help
+ Version 4.3.x of the Linux kernel headers are no longer
+ maintained upstream and are now removed. As an alternative,
+ version 4.1.x of the headers have been automatically
+ selected in your configuration.
+
+config BR2_KERNEL_HEADERS_4_2
+ bool "kernel headers version 4.2.x are no longer supported"
+ select BR2_KERNEL_HEADERS_4_1
+ select BR2_LEGACY
+ help
+ Version 4.2.x of the Linux kernel headers are no longer
+ maintained upstream and are now removed. As an alternative,
+ version 4.1.x of the headers have been automatically
+ selected in your configuration.
+
config BR2_PACKAGE_KODI_ADDON_XVDR
bool "kodi-addon-xvdr removed"
select BR2_LEGACY
--git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index ebb869b..60578b8 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -60,16 +60,6 @@ choice
bool "Linux 4.1.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1
- config BR2_KERNEL_HEADERS_4_2
- bool "Linux 4.2.x kernel headers"
- depends on BR2_DEPRECATED_SINCE_2016_02
- select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2
-
- config BR2_KERNEL_HEADERS_4_3
- bool "Linux 4.3.x kernel headers"
- depends on BR2_DEPRECATED_SINCE_2016_05
- select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3
-
config BR2_KERNEL_HEADERS_4_4
bool "Linux 4.4.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4
@@ -242,8 +232,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "3.19.8" if BR2_KERNEL_HEADERS_3_19
default "4.0.9" if BR2_KERNEL_HEADERS_4_0
default "4.1.34" if BR2_KERNEL_HEADERS_4_1
- default "4.2.8" if BR2_KERNEL_HEADERS_4_2
- default "4.3.6" if BR2_KERNEL_HEADERS_4_3
default "4.4.24" if BR2_KERNEL_HEADERS_4_4
default "4.5.7" if BR2_KERNEL_HEADERS_4_5
default "4.6.7" if BR2_KERNEL_HEADERS_4_6
--
2.9.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 08/13] sstrip: remove deprecated package
2016-10-15 14:50 [Buildroot] Deprecate BR2_DEPRECATED Arnout Vandecappelle
` (6 preceding siblings ...)
2016-10-15 14:51 ` [Buildroot] [PATCH 07/13] linux-headers: remove deprecated version 4.2 and 4.3 Arnout Vandecappelle
@ 2016-10-15 14:51 ` Arnout Vandecappelle
2016-10-15 21:02 ` Peter Korsgaard
2016-10-15 14:51 ` [Buildroot] [PATCH 09/13] torsmo: " Arnout Vandecappelle
` (4 subsequent siblings)
12 siblings, 1 reply; 29+ messages in thread
From: Arnout Vandecappelle @ 2016-10-15 14:51 UTC (permalink / raw)
To: buildroot
We will remove BR2_DEPRECATED, so remove this deprecated package.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
Config.in.legacy | 9 +++++++++
package/Config.in | 1 -
package/sstrip/Config.in | 8 --------
package/sstrip/sstrip.mk | 20 --------------------
4 files changed, 9 insertions(+), 29 deletions(-)
delete mode 100644 package/sstrip/Config.in
delete mode 100644 package/sstrip/sstrip.mk
diff --git a/Config.in.legacy b/Config.in.legacy
index 76365e6..1fcedfe 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,15 @@ endif
###############################################################################
comment "Legacy options removed in 2016.11"
+config BR2_PACKAGE_SSTRIP
+ bool "sstrip removed"
+ select BR2_LEGACY
+ help
+ sstrip is unmaintained and potentially harmful. It doesn't
+ save so much compared to normal binutils strip, and there is
+ a big risk of binaries that don't work. Use normal strip
+ instead.
+
config BR2_KERNEL_HEADERS_4_3
bool "kernel headers version 4.3.x are no longer supported"
select BR2_KERNEL_HEADERS_4_1
diff --git a/package/Config.in b/package/Config.in
index 0257685..47c0801 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -143,7 +143,6 @@ menu "Development tools"
source "package/patch/Config.in"
source "package/pkgconf/Config.in"
source "package/sed/Config.in"
- source "package/sstrip/Config.in"
source "package/subversion/Config.in"
source "package/tree/Config.in"
source "package/yasm/Config.in"
diff --git a/package/sstrip/Config.in b/package/sstrip/Config.in
deleted file mode 100644
index c458f8e..0000000
--- a/package/sstrip/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_SSTRIP
- bool "sstrip"
- depends on BR2_DEPRECATED_SINCE_2016_08
- help
- Small utility that removes a few bytes from an executable that
- strip leaves behind.
-
- http://www.muppetlabs.com/~breadbox/software/elfkickers.html
diff --git a/package/sstrip/sstrip.mk b/package/sstrip/sstrip.mk
deleted file mode 100644
index 685ea09..0000000
--- a/package/sstrip/sstrip.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-################################################################################
-#
-# sstrip
-#
-################################################################################
-
-SSTRIP_SITE = svn://svn.openwrt.org/openwrt/trunk/tools/sstrip
-SSTRIP_VERSION = 20154
-
-define SSTRIP_BUILD_CMDS
- cd $(@D) ; \
- $(TARGET_CC) $(TARGET_CFLAGS) -include endian.h -include byteswap.h \
- -o sstrip src/sstrip.c
-endef
-
-define SSTRIP_INSTALL_TARGET_CMDS
- $(INSTALL) -D $(@D)/sstrip $(TARGET_DIR)/usr/bin/sstrip
-endef
-
-$(eval $(generic-package))
--
2.9.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 09/13] torsmo: remove deprecated package
2016-10-15 14:50 [Buildroot] Deprecate BR2_DEPRECATED Arnout Vandecappelle
` (7 preceding siblings ...)
2016-10-15 14:51 ` [Buildroot] [PATCH 08/13] sstrip: remove deprecated package Arnout Vandecappelle
@ 2016-10-15 14:51 ` Arnout Vandecappelle
2016-10-15 21:03 ` Peter Korsgaard
2016-10-15 14:51 ` [Buildroot] [PATCH 10/13] webkitgtk24: " Arnout Vandecappelle
` (3 subsequent siblings)
12 siblings, 1 reply; 29+ messages in thread
From: Arnout Vandecappelle @ 2016-10-15 14:51 UTC (permalink / raw)
To: buildroot
We will remove BR2_DEPRECATED, so remove this deprecated package.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
Config.in.legacy | 7 +++++++
package/Config.in | 1 -
package/torsmo/Config.in | 11 -----------
package/torsmo/torsmo.hash | 2 --
package/torsmo/torsmo.mk | 18 ------------------
5 files changed, 7 insertions(+), 32 deletions(-)
delete mode 100644 package/torsmo/Config.in
delete mode 100644 package/torsmo/torsmo.hash
delete mode 100644 package/torsmo/torsmo.mk
diff --git a/Config.in.legacy b/Config.in.legacy
index 1fcedfe..a372052 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,13 @@ endif
###############################################################################
comment "Legacy options removed in 2016.11"
+config BR2_PACKAGE_TORSMO
+ bool "torsmo removed"
+ select BR2_LEGACY
+ help
+ torsmo has been unmaintained for a long time, and nobody
+ seems to be interested in it.
+
config BR2_PACKAGE_SSTRIP
bool "sstrip removed"
select BR2_LEGACY
diff --git a/package/Config.in b/package/Config.in
index 47c0801..0a17ce0 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -305,7 +305,6 @@ comment "X applications"
source "package/qt-webkit-kiosk/Config.in"
source "package/rdesktop/Config.in"
source "package/synergy/Config.in"
- source "package/torsmo/Config.in"
source "package/wmctrl/Config.in"
source "package/x11vnc/Config.in"
source "package/xdotool/Config.in"
diff --git a/package/torsmo/Config.in b/package/torsmo/Config.in
deleted file mode 100644
index 5c18ac6..0000000
--- a/package/torsmo/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config BR2_PACKAGE_TORSMO
- bool "torsmo"
- depends on BR2_DEPRECATED_SINCE_2015_11
- depends on BR2_PACKAGE_XORG7
- depends on BR2_USE_MMU # fork()
- select BR2_PACKAGE_XLIB_LIBX11
- select BR2_PACKAGE_XLIB_LIBXEXT
- help
- Torsmo is a system monitor that sits in the corner of your desktop.
-
- http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/Torsmo
diff --git a/package/torsmo/torsmo.hash b/package/torsmo/torsmo.hash
deleted file mode 100644
index 8bbf9dc..0000000
--- a/package/torsmo/torsmo.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256 6a6bc82e71c841ba9359f0ffe370e57ef7b04b49a448252bb0c1c28fc10e964c torsmo-0.18.tar.gz
diff --git a/package/torsmo/torsmo.mk b/package/torsmo/torsmo.mk
deleted file mode 100644
index 96a7976..0000000
--- a/package/torsmo/torsmo.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-################################################################################
-#
-# torsmo
-#
-################################################################################
-
-TORSMO_VERSION = 0.18
-TORSMO_SITE = http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/Torsmo
-TORSMO_LICENSE = BSD-3c
-TORSMO_LICENSE_FILES = COPYING
-
-# help2man doesn't work when cross compiling
-TORSMO_CONF_ENV = ac_cv_path_HELP2MAN=''
-TORSMO_CONF_OPTS = --x-includes="-I$(STAGING_DIR)/usr/include/X11" --x-libraries="-I$(STAGING_DIR)/usr/lib" --with-x
-
-TORSMO_DEPENDENCIES = xlib_libX11 xlib_libXext
-
-$(eval $(autotools-package))
--
2.9.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 10/13] webkitgtk24: remove deprecated package
2016-10-15 14:50 [Buildroot] Deprecate BR2_DEPRECATED Arnout Vandecappelle
` (8 preceding siblings ...)
2016-10-15 14:51 ` [Buildroot] [PATCH 09/13] torsmo: " Arnout Vandecappelle
@ 2016-10-15 14:51 ` Arnout Vandecappelle
2016-10-15 21:04 ` Peter Korsgaard
2016-10-15 14:51 ` [Buildroot] [PATCH 11/13] wvdial: " Arnout Vandecappelle
` (2 subsequent siblings)
12 siblings, 1 reply; 29+ messages in thread
From: Arnout Vandecappelle @ 2016-10-15 14:51 UTC (permalink / raw)
To: buildroot
We will remove BR2_DEPRECATED, so remove this deprecated package.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
Config.in.legacy | 9 ++
DEVELOPERS | 1 -
package/Config.in | 1 -
package/webkitgtk24/0001-fix-ppc32.patch | 34 ------
...etty-quotes-in-licence-break-Python-stdin.patch | 36 ------
package/webkitgtk24/Config.in | 83 --------------
package/webkitgtk24/webkitgtk24.hash | 4 -
package/webkitgtk24/webkitgtk24.mk | 124 ---------------------
8 files changed, 9 insertions(+), 283 deletions(-)
delete mode 100644 package/webkitgtk24/0001-fix-ppc32.patch
delete mode 100644 package/webkitgtk24/0003-Pretty-quotes-in-licence-break-Python-stdin.patch
delete mode 100644 package/webkitgtk24/Config.in
delete mode 100644 package/webkitgtk24/webkitgtk24.hash
delete mode 100644 package/webkitgtk24/webkitgtk24.mk
diff --git a/Config.in.legacy b/Config.in.legacy
index a372052..0c47992 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,15 @@ endif
###############################################################################
comment "Legacy options removed in 2016.11"
+config BR2_PACKAGE_WEBKITGTK24
+ bool "webkitgtk 2.4.x removed"
+ select BR2_LEGACY
+ help
+ This legacy package only existed because some other packages
+ depended on that specific version of webkitgtk. However, the
+ other packages have been fixed. webkitgtk 2.4 is full of
+ security issues so it needs to be removed.
+
config BR2_PACKAGE_TORSMO
bool "torsmo removed"
select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index e702b2a..71b0456 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -715,7 +715,6 @@ F: package/vorbis-tools/
F: package/wavpack/
F: package/wayland-protocols/
F: package/webkitgtk/
-F: package/webkitgtk24/
F: package/whois/
F: package/wireshark/
F: package/wpan-tools/
diff --git a/package/Config.in b/package/Config.in
index 0a17ce0..cdaf9e3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1012,7 +1012,6 @@ menu "Graphics"
source "package/wayland/Config.in"
source "package/wayland-protocols/Config.in"
source "package/webkitgtk/Config.in"
- source "package/webkitgtk24/Config.in"
source "package/webp/Config.in"
source "package/zbar/Config.in"
source "package/zxing-cpp/Config.in"
diff --git a/package/webkitgtk24/0001-fix-ppc32.patch b/package/webkitgtk24/0001-fix-ppc32.patch
deleted file mode 100644
index c655a0e..0000000
--- a/package/webkitgtk24/0001-fix-ppc32.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From https://bugs.webkit.org/show_bug.cgi?id=130837
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura webkitgtk-2.4.8/Source/WebKit2/Platform/IPC/Connection.h webkitgtk-2.4.8-ppc/Source/WebKit2/Platform/IPC/Connection.h
---- webkitgtk-2.4.8/Source/WebKit2/Platform/IPC/Connection.h 2015-01-07 06:45:43.000000000 -0300
-+++ webkitgtk-2.4.8-ppc/Source/WebKit2/Platform/IPC/Connection.h 2015-04-20 01:55:41.554547510 -0300
-@@ -216,7 +216,11 @@
-
- Client* m_client;
- bool m_isServer;
-+#if CPU(PPC)
-+ uint64_t m_syncRequestID;
-+#else
- std::atomic<uint64_t> m_syncRequestID;
-+#endif
-
- bool m_onlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage;
- bool m_shouldExitOnSyncMessageSendFailure;
-diff -Nura webkitgtk-2.4.8/Source/WebKit2/UIProcess/StatisticsRequest.cpp webkitgtk-2.4.8-ppc/Source/WebKit2/UIProcess/StatisticsRequest.cpp
---- webkitgtk-2.4.8/Source/WebKit2/UIProcess/StatisticsRequest.cpp 2015-01-07 06:45:43.000000000 -0300
-+++ webkitgtk-2.4.8-ppc/Source/WebKit2/UIProcess/StatisticsRequest.cpp 2015-04-20 01:55:41.555547544 -0300
-@@ -44,7 +44,11 @@
-
- uint64_t StatisticsRequest::addOutstandingRequest()
- {
-+#if CPU(PPC)
-+ static int64_t uniqueRequestID;
-+#else
- static std::atomic<int64_t> uniqueRequestID;
-+#endif
-
- uint64_t requestID = ++uniqueRequestID;
- m_outstandingRequests.add(requestID);
diff --git a/package/webkitgtk24/0003-Pretty-quotes-in-licence-break-Python-stdin.patch b/package/webkitgtk24/0003-Pretty-quotes-in-licence-break-Python-stdin.patch
deleted file mode 100644
index df51078..0000000
--- a/package/webkitgtk24/0003-Pretty-quotes-in-licence-break-Python-stdin.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Pretty quotes in licence break Python stdin.
-
-This patch was submitted upstream in this bug report:
-
-https://bugs.webkit.org/show_bug.cgi?id=128971
-
-[Vincent: tweak the patch to make it apply on Buildroot]
-
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-
-Pretty quotes in licence break Python stdin.
-
-https://bugs.webkit.org/show_bug.cgi?id=128971
-
---- a/Source/WebCore/xml/XMLViewer.css 2014-01-23 16:49:58.000000000 +0000
-+++ b/Source/WebCore/xml/XMLViewer.css
-@@ -14,7 +14,7 @@
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. AND ITS CONTRIBUTORS
-- * ?AS IS? AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC.
- * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
---- a/Source/WebCore/xml/XMLViewer.js 2014-01-23 16:49:58.000000000 +0000
-+++ b/Source/WebCore/xml/XMLViewer.js
-@@ -15,7 +15,7 @@
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. AND ITS CONTRIBUTORS
-- * ?AS IS? AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC.
- * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
diff --git a/package/webkitgtk24/Config.in b/package/webkitgtk24/Config.in
deleted file mode 100644
index bba3a2b..0000000
--- a/package/webkitgtk24/Config.in
+++ /dev/null
@@ -1,83 +0,0 @@
-config BR2_PACKAGE_WEBKITGTK24_ARCH_SUPPORTS
- bool
- # ARM needs BLX, so v5t+, BE completely untested so disabled
- default y if BR2_arm && !BR2_ARM_CPU_ARMV4
- default y if BR2_i386 || BR2_x86_64
- # Disabled on MIPS big endian due to sigbus
- default y if BR2_mipsel || BR2_mips64el
- # Disabled on PowerPC pending runtime testing
- # Disabled on SuperH because of segfault
- depends on BR2_USE_MMU # libglib2
-
-comment "webkitgtk24 needs libgtk2 and a toolchain w/ C++, wchar, NPTL, gcc >=4.8"
- depends on BR2_PACKAGE_WEBKITGTK24_ARCH_SUPPORTS
- depends on BR2_TOOLCHAIN_HAS_SYNC_4
- depends on !BR2_PACKAGE_LIBGTK2 || !BR2_PACKAGE_XORG7 || \
- !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_INSTALL_LIBSTDCPP \
- || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
- depends on BR2_USE_MMU
- depends on BR2_DEPRECATED_SINCE_2016_05
-
-config BR2_PACKAGE_WEBKITGTK24
- bool "webkitgtk 2.4.x"
- depends on BR2_DEPRECATED_SINCE_2016_05
- depends on BR2_INSTALL_LIBSTDCPP
- depends on BR2_USE_WCHAR
- depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
- depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
- depends on (BR2_PACKAGE_LIBGTK2 && BR2_PACKAGE_XORG7)
- depends on BR2_PACKAGE_WEBKITGTK24_ARCH_SUPPORTS
- depends on BR2_TOOLCHAIN_HAS_SYNC_4 # harfbuzz
- select BR2_PACKAGE_CAIRO
- select BR2_PACKAGE_CAIRO_PNG
- select BR2_PACKAGE_ENCHANT
- select BR2_PACKAGE_HARFBUZZ
- select BR2_PACKAGE_ICU
- select BR2_PACKAGE_JPEG
- select BR2_PACKAGE_LIBCURL
- select BR2_PACKAGE_LIBSECRET
- select BR2_PACKAGE_LIBSOUP
- select BR2_PACKAGE_LIBXML2
- select BR2_PACKAGE_LIBXSLT
- select BR2_PACKAGE_SQLITE
- select BR2_PACKAGE_WEBP
- select BR2_PACKAGE_XLIB_LIBXT if BR2_PACKAGE_XORG7
- select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_HAS_LIBGL || \
- (BR2_PACKAGE_HAS_LIBGLES && BR2_PACKAGE_HAS_LIBEGL)
- select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_HAS_LIBGL || \
- (BR2_PACKAGE_HAS_LIBGLES && BR2_PACKAGE_HAS_LIBEGL)
- help
- WebKit is an open source, standards compliant web browser engine.
-
- http://www.webkitgtk.org/
-
-if BR2_PACKAGE_WEBKITGTK24
-
-config BR2_PACKAGE_WEBKITGTK24_HTTPS
- bool "HTTPS support"
- select BR2_PACKAGE_CA_CERTIFICATES # runtime
- select BR2_PACKAGE_LIBSOUP_SSL
- help
- Enable HTTPS protocol support.
-
-config BR2_PACKAGE_WEBKITGTK24_MULTIMEDIA
- bool "multimedia support"
- select BR2_PACKAGE_GSTREAMER1
- select BR2_PACKAGE_GST1_PLUGINS_BASE
- select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA
- select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP
- select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT
- select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE
- select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK
- select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT
- select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE
- select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME
- select BR2_PACKAGE_GST1_PLUGINS_GOOD
- select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4
- select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP
- select BR2_PACKAGE_GST1_LIBAV
- help
- This option pulls in all of the required dependencies
- to enable basic multimedia (video/audio) support.
-
-endif
diff --git a/package/webkitgtk24/webkitgtk24.hash b/package/webkitgtk24/webkitgtk24.hash
deleted file mode 100644
index d3a9cca..0000000
--- a/package/webkitgtk24/webkitgtk24.hash
+++ /dev/null
@@ -1,4 +0,0 @@
-# From http://www.webkitgtk.org/releases/webkitgtk-2.4.10.tar.xz.sha1
-sha1 7fe2fe07ed21d00d8a8483d68c13a8c7ff0ff320 webkitgtk-2.4.10.tar.xz
-# Calculated based on the hash above
-sha256 33fda4b20d7fec2d6e9399ba03ef3f6d2a733c628bd77d397880c44e4bf7c614 webkitgtk-2.4.10.tar.xz
diff --git a/package/webkitgtk24/webkitgtk24.mk b/package/webkitgtk24/webkitgtk24.mk
deleted file mode 100644
index 4b7d694..0000000
--- a/package/webkitgtk24/webkitgtk24.mk
+++ /dev/null
@@ -1,124 +0,0 @@
-################################################################################
-#
-# webkitgtk 2.4.x
-#
-################################################################################
-
-WEBKITGTK24_VERSION = 2.4.10
-WEBKITGTK24_SITE = http://www.webkitgtk.org/releases
-WEBKITGTK24_SOURCE = webkitgtk-$(WEBKITGTK24_VERSION).tar.xz
-WEBKITGTK24_INSTALL_STAGING = YES
-WEBKITGTK24_LICENSE = LGPLv2+, BSD-2c
-WEBKITGTK24_LICENSE_FILES = \
- Source/WebCore/LICENSE-APPLE \
- Source/WebCore/LICENSE-LGPL-2
-WEBKITGTK24_DEPENDENCIES = host-ruby host-flex host-bison host-gperf \
- host-pkgconf enchant harfbuzz icu jpeg libcurl libgtk2 \
- libsecret libsoup libxml2 libxslt sqlite webp
-
-WEBKITGTK24_DEPENDENCIES += \
- $(if $(BR_PACKAGE_XLIB_LIBXCOMPOSITE),xlib_libXcomposite) \
- $(if $(BR_PACKAGE_XLIB_LIBXDAMAGE),xlib_libXdamage)
-
-# make 3.81 loops into oblivion with numjobs > 1
-ifneq ($(findstring x3.81,x$(RUNNING_MAKE_VERSION)),)
-WEBKITGTK24_MAKE = $(MAKE1)
-endif
-
-# Give explicit path to icu-config to avoid host leakage
-WEBKITGTK24_CONF_ENV = ac_cv_path_icu_config=$(STAGING_DIR)/usr/bin/icu-config
-
-# Some 32-bit architectures need libatomic support for 64-bit ops
-ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
-WEBKITGTK24_CONF_ENV += LIBS="-latomic"
-endif
-
-# dependency tracking is to avoid build issues in the GEN/WTF phase
-WEBKITGTK24_CONF_OPTS = \
- --enable-dependency-tracking \
- --enable-spellcheck \
- --disable-geolocation \
- --disable-glibtest \
- --disable-gtk-doc-html \
- --disable-wayland-target
-
-ifeq ($(BR2_PACKAGE_WEBKITGTK24_MULTIMEDIA),y)
-WEBKITGTK24_CONF_OPTS += \
- --enable-video \
- --enable-web-audio
-WEBKITGTK24_DEPENDENCIES += gstreamer1 gst1-libav gst1-plugins-base gst1-plugins-good
-else
-WEBKITGTK24_CONF_OPTS += \
- --disable-video \
- --disable-web-audio
-endif
-
-# OpenGL
-ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
-WEBKITGTK24_CONF_OPTS += \
- --enable-accelerated-compositing \
- --enable-glx \
- --enable-webgl \
- --disable-gles2
-WEBKITGTK24_DEPENDENCIES += libgl
-# EGL + GLES
-else ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGLES),yy)
-WEBKITGTK24_CONF_OPTS += \
- --enable-accelerated-compositing \
- --enable-gles2 \
- --enable-webgl \
- --disable-glx
-WEBKITGTK24_DEPENDENCIES += libegl libgles
-# Some EGL/GLES implementations needs extra help (eg. rpi-userland)
-WEBKITGTK24_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) \
- `$(PKG_CONFIG_HOST_BINARY) --cflags egl` \
- `$(PKG_CONFIG_HOST_BINARY) --clfags glesv2`"
-# No GL
-else
-WEBKITGTK24_CONF_OPTS += \
- --disable-accelerated-compositing \
- --disable-gles2 \
- --disable-glx \
- --disable-webgl
-endif
-
-# X11 target with GTK2 (optionally GTK3)
-ifeq ($(BR2_PACKAGE_XLIB_LIBXT),y)
-WEBKITGTK24_CONF_OPTS += --enable-x11-target
-WEBKITGTK24_DEPENDENCIES += xlib_libXt
-else
-WEBKITGTK24_CONF_OPTS += --disable-x11-target
-endif
-
-# ARM needs NEON for JIT
-# i386 & x86_64 don't seem to have any special requirements
-ifeq ($(BR2_ARM_CPU_HAS_NEON)$(BR2_i386)$(BR2_x86_64),y)
-WEBKITGTK24_CONF_OPTS += --enable-jit
-else
-WEBKITGTK24_CONF_OPTS += --disable-jit
-# Disabling assembly and JIT needs an extra push sometimes (ppc)
-# See https://bugs.webkit.org/show_bug.cgi?format=multiple&id=113638
-WEBKITGTK24_CONF_ENV += \
- CPPFLAGS="$(TARGET_CPPFLAGS) -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0"
-endif
-
-# webkit1 (old API) uses gtk2, webkit2 (new API) uses gtk3
-# Both can be built simultaneously, prefer "newer" for size/time savings
-# gtk2 is mandatory for plugin support
-ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
-WEBKITGTK24_CONF_OPTS += \
- --with-gtk=3.0 \
- --disable-webkit1
-WEBKITGTK24_DEPENDENCIES += libgtk3
-define WEBKITGTK24_INSTALL_BROWSER
- $(INSTALL) -D -m 0755 $(@D)/Programs/MiniBrowser \
- $(TARGET_DIR)/usr/bin/MiniBrowser
-endef
-WEBKITGTK24_POST_INSTALL_TARGET_HOOKS += WEBKITGTK24_INSTALL_BROWSER
-else
-WEBKITGTK24_CONF_OPTS += \
- --with-gtk=2.0 \
- --disable-webkit2
-endif
-
-$(eval $(autotools-package))
--
2.9.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 11/13] wvdial: remove deprecated package
2016-10-15 14:50 [Buildroot] Deprecate BR2_DEPRECATED Arnout Vandecappelle
` (9 preceding siblings ...)
2016-10-15 14:51 ` [Buildroot] [PATCH 10/13] webkitgtk24: " Arnout Vandecappelle
@ 2016-10-15 14:51 ` Arnout Vandecappelle
2016-10-15 21:05 ` Peter Korsgaard
2016-10-15 14:51 ` [Buildroot] [PATCH 12/13] wvstreams: " Arnout Vandecappelle
2016-10-15 14:51 ` [Buildroot] [PATCH 13/13] Remove BR2_DEPRECATED Arnout Vandecappelle
12 siblings, 1 reply; 29+ messages in thread
From: Arnout Vandecappelle @ 2016-10-15 14:51 UTC (permalink / raw)
To: buildroot
We will remove BR2_DEPRECATED, so remove this deprecated package.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
Config.in.legacy | 7 +++++++
DEVELOPERS | 1 -
package/Config.in | 1 -
package/wvdial/0001-uClibc-scandir.patch | 23 -----------------------
package/wvdial/Config.in | 17 -----------------
package/wvdial/wvdial.hash | 2 --
package/wvdial/wvdial.mk | 32 --------------------------------
7 files changed, 7 insertions(+), 76 deletions(-)
delete mode 100644 package/wvdial/0001-uClibc-scandir.patch
delete mode 100644 package/wvdial/Config.in
delete mode 100644 package/wvdial/wvdial.hash
delete mode 100644 package/wvdial/wvdial.mk
diff --git a/Config.in.legacy b/Config.in.legacy
index 0c47992..b5fb49f 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,13 @@ endif
###############################################################################
comment "Legacy options removed in 2016.11"
+config BR2_PACKAGE_WVDIAL
+ bool "wvdial removed"
+ select BR2_LEGACY
+ help
+ wvdial is not maintained anymore since about 2009. It also
+ doesn't build anymore with recent compilers (GCC 5+).
+
config BR2_PACKAGE_WEBKITGTK24
bool "webkitgtk 2.4.x removed"
select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index 71b0456..d8c6583 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1348,7 +1348,6 @@ F: package/sconeserver/
F: package/sound-theme-borealis/
F: package/sound-theme-freedesktop/
F: package/vlc/
-F: package/wvdial/
F: package/wvstreams/
F: package/xscreensaver/
F: package/zmqpp/
diff --git a/package/Config.in b/package/Config.in
index cdaf9e3..b7cb970 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1628,7 +1628,6 @@ endif
source "package/wireshark/Config.in"
source "package/wpa_supplicant/Config.in"
source "package/wpan-tools/Config.in"
- source "package/wvdial/Config.in"
source "package/xinetd/Config.in"
source "package/xl2tp/Config.in"
source "package/xtables-addons/Config.in"
diff --git a/package/wvdial/0001-uClibc-scandir.patch b/package/wvdial/0001-uClibc-scandir.patch
deleted file mode 100644
index b611e94..0000000
--- a/package/wvdial/0001-uClibc-scandir.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Fix wvdial so that it works with scandir as defined in uClibc.
-
-Signed-off-by: Simon Dawson <spdawson@gmail.com>
-
-diff -Nurp a/wvmodemscan.cc b/wvmodemscan.cc
---- a/wvmodemscan.cc 2009-09-29 18:27:28.000000000 +0100
-+++ b/wvmodemscan.cc 2012-07-28 14:03:56.359729660 +0100
-@@ -495,13 +495,13 @@ static int fileselect(const struct diren
- // (no internal ISDN support) || !strncmp(e->d_name, "ttyI", 4);
- }
-
--#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 10)
-+#if defined(__UCLIBC__) || (defined(__GLIBC__) && __GLIBC_PREREQ(2, 10))
- static int filesort(const dirent **e1, const dirent **e2)
- #else
- static int filesort(const void *_e1, const void *_e2)
- #endif
- {
--#if !(defined(__GLIBC__) && __GLIBC_PREREQ(2, 10))
-+#if !(defined(__UCLIBC__) || (defined(__GLIBC__) && __GLIBC_PREREQ(2, 10)))
- dirent const * const *e1 = (dirent const * const *)_e1;
- dirent const * const *e2 = (dirent const * const *)_e2;
- #endif
diff --git a/package/wvdial/Config.in b/package/wvdial/Config.in
deleted file mode 100644
index 0c13202..0000000
--- a/package/wvdial/Config.in
+++ /dev/null
@@ -1,17 +0,0 @@
-config BR2_PACKAGE_WVDIAL
- bool "wvdial"
- depends on BR2_DEPRECATED_SINCE_2016_08
- depends on BR2_INSTALL_LIBSTDCPP
- depends on BR2_USE_MMU # wvstreams
- depends on !BR2_STATIC_LIBS # wvstreams
- depends on !BR2_TOOLCHAIN_USES_MUSL # wvstreams
- select BR2_PACKAGE_WVSTREAMS
- help
- wvdial is an intelligent Point-to-Point Protocol dialer
-
- http://wvdial.googlecode.com/
-
-comment "wvdial needs a glibc or uClibc toolchain w/ C++, dynamic library"
- depends on BR2_DEPRECATED_SINCE_2016_08
- depends on BR2_USE_MMU
- depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL
diff --git a/package/wvdial/wvdial.hash b/package/wvdial/wvdial.hash
deleted file mode 100644
index ac49209..0000000
--- a/package/wvdial/wvdial.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# locally computed
-sha256 99906d9560cbdbc97e1855e7b0a7169f1e11983be3ac539140423f09debced82 wvdial-1.61.tar.bz2
diff --git a/package/wvdial/wvdial.mk b/package/wvdial/wvdial.mk
deleted file mode 100644
index e89dfc5..0000000
--- a/package/wvdial/wvdial.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-################################################################################
-#
-# wvdial
-#
-################################################################################
-
-WVDIAL_VERSION = 1.61
-WVDIAL_SITE = http://wvdial.googlecode.com/files
-WVDIAL_SOURCE = wvdial-$(WVDIAL_VERSION).tar.bz2
-WVDIAL_DEPENDENCIES = wvstreams
-
-WVDIAL_LICENSE = LGPLv2
-WVDIAL_LICENSE_FILES = COPYING.LIB
-
-# N.B. parallel make fails
-WVDIAL_MAKE = $(MAKE1)
-
-WVDIAL_MAKE_ENV += $(TARGET_CONFIGURE_OPTS) \
- WVSTREAMS_INC="$(STAGING_DIR)/usr/include" \
- WVSTREAMS_LIB="$(STAGING_DIR)/usr/lib"
-
-define WVDIAL_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(WVDIAL_MAKE_ENV) $(WVDIAL_MAKE) -C $(@D)
-endef
-
-define WVDIAL_INSTALL_TARGET_CMDS
- $(TARGET_MAKE_ENV) $(WVDIAL_MAKE_ENV) $(WVDIAL_MAKE) \
- prefix="$(TARGET_DIR)/usr" PPPDIR="$(TARGET_DIR)/etc/ppp/peers" \
- install -C $(@D)
-endef
-
-$(eval $(generic-package))
--
2.9.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 12/13] wvstreams: remove deprecated package
2016-10-15 14:50 [Buildroot] Deprecate BR2_DEPRECATED Arnout Vandecappelle
` (10 preceding siblings ...)
2016-10-15 14:51 ` [Buildroot] [PATCH 11/13] wvdial: " Arnout Vandecappelle
@ 2016-10-15 14:51 ` Arnout Vandecappelle
2016-10-15 21:05 ` Peter Korsgaard
2016-10-15 14:51 ` [Buildroot] [PATCH 13/13] Remove BR2_DEPRECATED Arnout Vandecappelle
12 siblings, 1 reply; 29+ messages in thread
From: Arnout Vandecappelle @ 2016-10-15 14:51 UTC (permalink / raw)
To: buildroot
We will remove BR2_DEPRECATED, so remove this deprecated package.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
Config.in.legacy | 7 +
DEVELOPERS | 1 -
package/Config.in | 1 -
.../0001-fix-uClibc-compile-getcontext.patch | 273 ---------------------
...002-fix-uClibc-compile-execinfo-backtrace.patch | 31 ---
.../wvstreams/0003-fix-uClibc-compile-misc.patch | 16 --
package/wvstreams/0004-build-fixes.patch | 40 ---
package/wvstreams/0005-getuid.patch | 25 --
package/wvstreams/Config.in | 19 --
package/wvstreams/wvstreams.hash | 2 -
package/wvstreams/wvstreams.mk | 62 -----
11 files changed, 7 insertions(+), 470 deletions(-)
delete mode 100644 package/wvstreams/0001-fix-uClibc-compile-getcontext.patch
delete mode 100644 package/wvstreams/0002-fix-uClibc-compile-execinfo-backtrace.patch
delete mode 100644 package/wvstreams/0003-fix-uClibc-compile-misc.patch
delete mode 100644 package/wvstreams/0004-build-fixes.patch
delete mode 100644 package/wvstreams/0005-getuid.patch
delete mode 100644 package/wvstreams/Config.in
delete mode 100644 package/wvstreams/wvstreams.hash
delete mode 100644 package/wvstreams/wvstreams.mk
diff --git a/Config.in.legacy b/Config.in.legacy
index b5fb49f..f26f97f 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,13 @@ endif
###############################################################################
comment "Legacy options removed in 2016.11"
+config BR2_PACKAGE_WVSTREAMS
+ bool "wvstreams removed"
+ select BR2_LEGACY
+ help
+ wvstreams is not maintained anymore since about 2009. It also
+ doesn't build anymore with recent compilers (GCC 5+).
+
config BR2_PACKAGE_WVDIAL
bool "wvdial removed"
select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index d8c6583..0a991e4 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1348,7 +1348,6 @@ F: package/sconeserver/
F: package/sound-theme-borealis/
F: package/sound-theme-freedesktop/
F: package/vlc/
-F: package/wvstreams/
F: package/xscreensaver/
F: package/zmqpp/
F: package/zyre/
diff --git a/package/Config.in b/package/Config.in
index b7cb970..56813ea 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1260,7 +1260,6 @@ menu "Networking"
source "package/sofia-sip/Config.in"
source "package/thrift/Config.in"
source "package/usbredir/Config.in"
- source "package/wvstreams/Config.in"
source "package/zeromq/Config.in"
source "package/zmqpp/Config.in"
source "package/zyre/Config.in"
diff --git a/package/wvstreams/0001-fix-uClibc-compile-getcontext.patch b/package/wvstreams/0001-fix-uClibc-compile-getcontext.patch
deleted file mode 100644
index c78cc18..0000000
--- a/package/wvstreams/0001-fix-uClibc-compile-getcontext.patch
+++ /dev/null
@@ -1,273 +0,0 @@
-Fix wvstreams so that it builds with uClibc, which does not have the
-getcontext() and setcontext() functions.
-
-Signed-off-by: Simon Dawson <spdawson@gmail.com>
-
-diff -Nurp a/include/wvtask.h b/include/wvtask.h
---- a/include/wvtask.h 2008-07-14 20:11:35.000000000 +0100
-+++ b/include/wvtask.h 2012-07-28 12:29:53.559981240 +0100
-@@ -28,6 +28,13 @@
-
- #define WVTASK_MAGIC 0x123678
-
-+#undef HAVE_GETCONTEXT
-+#ifdef HAVE_GETCONTEXT
-+typedef ucontext_t TaskContext;
-+#else
-+typedef jmp_buf TaskContext;
-+#endif
-+
- class WvTaskMan;
-
- /** Represents a single thread of control. */
-@@ -54,8 +61,8 @@ class WvTask
- bool running, recycled;
-
- WvTaskMan &man;
-- ucontext_t mystate; // used for resuming the task
-- ucontext_t func_call, func_return;
-+ TaskContext mystate; // used for resuming the task
-+ TaskContext func_call, func_return;
-
- TaskFunc *func;
- void *userdata;
-@@ -94,13 +101,13 @@ class WvTaskMan
- static void call_func(WvTask *task);
-
- static char *stacktop;
-- static ucontext_t stackmaster_task;
-+ static TaskContext stackmaster_task;
-
- static WvTask *stack_target;
-- static ucontext_t get_stack_return;
-+ static TaskContext get_stack_return;
-
- static WvTask *current_task;
-- static ucontext_t toplevel;
-+ static TaskContext toplevel;
-
- WvTaskMan();
- virtual ~WvTaskMan();
-diff -Nurp a/utils/wvtask.cc b/utils/wvtask.cc
---- a/utils/wvtask.cc 2009-05-13 22:42:52.000000000 +0100
-+++ b/utils/wvtask.cc 2012-07-28 12:32:23.855974538 +0100
-@@ -60,12 +60,14 @@ int WvTask::taskcount, WvTask::numtasks,
- WvTaskMan *WvTaskMan::singleton;
- int WvTaskMan::links, WvTaskMan::magic_number;
- WvTaskList WvTaskMan::all_tasks, WvTaskMan::free_tasks;
--ucontext_t WvTaskMan::stackmaster_task, WvTaskMan::get_stack_return,
-+TaskContext WvTaskMan::stackmaster_task, WvTaskMan::get_stack_return,
- WvTaskMan::toplevel;
- WvTask *WvTaskMan::current_task, *WvTaskMan::stack_target;
- char *WvTaskMan::stacktop;
-
-+#ifdef HAVE_GETCONTEXT
- static int context_return;
-+#endif
-
-
- static bool use_shared_stack()
-@@ -198,9 +200,13 @@ WvTaskMan::WvTaskMan()
-
- stacktop = (char *)alloca(0);
-
-+#ifdef HAVE_GETCONTEXT
- context_return = 0;
- assert(getcontext(&get_stack_return) == 0);
- if (context_return == 0)
-+#else
-+ if (setjmp(get_stack_return) == 0)
-+#endif
- {
- // initial setup - start the stackmaster() task (never returns!)
- stackmaster();
-@@ -257,22 +263,30 @@ int WvTaskMan::run(WvTask &task, int val
-
- WvTask *old_task = current_task;
- current_task = &task;
-- ucontext_t *state;
-+ TaskContext *state;
-
- if (!old_task)
- state = &toplevel; // top-level call (not in an actual task yet)
- else
- state = &old_task->mystate;
-
-+#ifdef HAVE_GETCONTEXT
- context_return = 0;
- assert(getcontext(state) == 0);
- int newval = context_return;
-+#else
-+ int newval = setjmp(*state);
-+#endif
- if (newval == 0)
- {
- // saved the state, now run the task.
-+#ifdef HAVE_GETCONTEXT
- context_return = val;
- setcontext(&task.mystate);
- return -1;
-+#else
-+ longjmp(task.mystate, val);
-+#endif
- }
- else
- {
-@@ -317,16 +331,24 @@ int WvTaskMan::yield(int val)
- (long)current_task->stacksize);
- }
- #endif
--
-+
-+#ifdef HAVE_GETCONTEXT
- context_return = 0;
- assert(getcontext(¤t_task->mystate) == 0);
- int newval = context_return;
-+#else
-+ int newval = setjmp(current_task->mystate);
-+#endif
- if (newval == 0)
- {
- // saved the task state; now yield to the toplevel.
-+#ifdef HAVE_GETCONTEXT
- context_return = val;
- setcontext(&toplevel);
- return -1;
-+#else
-+ longjmp(toplevel, val);
-+#endif
- }
- else
- {
-@@ -340,9 +362,13 @@ int WvTaskMan::yield(int val)
-
- void WvTaskMan::get_stack(WvTask &task, size_t size)
- {
-+#ifdef HAVE_GETCONTEXT
- context_return = 0;
- assert(getcontext(&get_stack_return) == 0);
- if (context_return == 0)
-+#else
-+ if (setjmp(get_stack_return) == 0)
-+#endif
- {
- assert(magic_number == -WVTASK_MAGIC);
- assert(task.magic_number == WVTASK_MAGIC);
-@@ -358,6 +384,7 @@ void WvTaskMan::get_stack(WvTask &task,
- static char *next_stack_addr = NULL;
- #endif
-
-+#ifndef HAVE_GETCONTEXT
- task.stack = mmap(next_stack_addr, task.stacksize,
- PROT_READ | PROT_WRITE,
- #ifndef MACOS
-@@ -366,12 +393,17 @@ void WvTaskMan::get_stack(WvTask &task,
- MAP_PRIVATE,
- #endif
- -1, 0);
-+#endif // !HAVE_GETCONTEXT
- }
-
- // initial setup
- stack_target = &task;
-+#ifdef HAVE_GETCONTEXT
- context_return = size/1024 + (size%1024 > 0);
- setcontext(&stackmaster_task);
-+#else
-+ longjmp(stackmaster_task, size/1024 + (size%1024 > 0));
-+#endif
- }
- else
- {
-@@ -408,9 +440,13 @@ void WvTaskMan::_stackmaster()
- {
- assert(magic_number == -WVTASK_MAGIC);
-
-+#ifdef HAVE_GETCONTEXT
- context_return = 0;
- assert(getcontext(&stackmaster_task) == 0);
- val = context_return;
-+#else
-+ val = setjmp(stackmaster_task);
-+#endif
- if (val == 0)
- {
- assert(magic_number == -WVTASK_MAGIC);
-@@ -418,8 +454,12 @@ void WvTaskMan::_stackmaster()
- // just did setjmp; save stackmaster's current state (with
- // all current stack allocations) and go back to get_stack
- // (or the constructor, if that's what called us)
-+#ifdef HAVE_GETCONTEXT
- context_return = 1;
- setcontext(&get_stack_return);
-+#else
-+ longjmp(get_stack_return, 1);
-+#endif
- }
- else
- {
-@@ -462,7 +502,9 @@ void WvTaskMan::call_func(WvTask *task)
- task->func(task->userdata);
- Dprintf("WvTaskMan: returning from task #%d (%s)\n",
- task->tid, (const char *)task->name);
-+#ifdef HAVE_GETCONTEXT
- context_return = 1;
-+#endif
- }
-
-
-@@ -473,9 +515,13 @@ void WvTaskMan::do_task()
- assert(task->magic_number == WVTASK_MAGIC);
-
- // back here from longjmp; someone wants stack space.
-+#ifdef HAVE_GETCONTEXT
- context_return = 0;
- assert(getcontext(&task->mystate) == 0);
- if (context_return == 0)
-+#else
-+ if (setjmp(task->mystate) == 0)
-+#endif
- {
- // done the setjmp; that means the target task now has
- // a working jmp_buf all set up. Leave space on the stack
-@@ -510,6 +556,7 @@ void WvTaskMan::do_task()
- }
- else
- {
-+#ifdef HAVE_GETCONTEXT
- assert(getcontext(&task->func_call) == 0);
- task->func_call.uc_stack.ss_size = task->stacksize;
- task->func_call.uc_stack.ss_sp = task->stack;
-@@ -519,11 +566,19 @@ void WvTaskMan::do_task()
- task->tid, (const char *)task->name);
- makecontext(&task->func_call,
- (void (*)(void))call_func, 1, task);
-+#else
-+ assert(setjmp(task->func_call) == 0);
-+#endif
-
-+#ifdef HAVE_GETCONTEXT
- context_return = 0;
- assert(getcontext(&task->func_return) == 0);
- if (context_return == 0)
- setcontext(&task->func_call);
-+#else
-+ if (setjmp(task->func_return) == 0)
-+ longjmp(task->func_call, 0);
-+#endif
- }
-
- // the task's function terminated.
-@@ -544,8 +599,12 @@ const void *WvTaskMan::current_top_of_st
- if (use_shared_stack() || current_task == NULL)
- return __libc_stack_end;
- else
-+#ifdef HAVE_GETCONTEXT
- return (const char *)current_task->stack + current_task->stacksize;
- #else
-+ return 0;
-+#endif
-+#else
- return 0;
- #endif
- }
diff --git a/package/wvstreams/0002-fix-uClibc-compile-execinfo-backtrace.patch b/package/wvstreams/0002-fix-uClibc-compile-execinfo-backtrace.patch
deleted file mode 100644
index c6317da..0000000
--- a/package/wvstreams/0002-fix-uClibc-compile-execinfo-backtrace.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Fix wvstreams so that it builds with uClibc: we don't have execinfo.h,
-so we can't do backtrace() stuff.
-
-Signed-off-by: Simon Dawson <spdawson@gmail.com>
-
-diff -Nurp a/utils/wvcrash.cc b/utils/wvcrash.cc
---- a/utils/wvcrash.cc 2008-12-17 12:24:20.000000000 +0000
-+++ b/utils/wvcrash.cc 2012-07-27 22:00:15.456502262 +0100
-@@ -28,7 +28,9 @@
- // FIXME: this file mostly only works in Linux
- #ifdef __linux
-
--# include <execinfo.h>
-+#ifdef HAVE_EXECINFO_H
-+#include <execinfo.h>
-+#endif
- #include <unistd.h>
-
- #ifdef __USE_GNU
-@@ -267,9 +269,11 @@ static void wvcrash_real(int sig, int fd
- }
- }
-
-+#ifdef HAVE_EXECINFO_H
- wr(fd, "\nBacktrace:\n");
- backtrace_symbols_fd(trace,
- backtrace(trace, sizeof(trace)/sizeof(trace[0])), fd);
-+#endif
-
- if (pid > 0)
- {
diff --git a/package/wvstreams/0003-fix-uClibc-compile-misc.patch b/package/wvstreams/0003-fix-uClibc-compile-misc.patch
deleted file mode 100644
index 690a961..0000000
--- a/package/wvstreams/0003-fix-uClibc-compile-misc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix wvstreams so that it builds with uClibc: const cast problem.
-
-Signed-off-by: Simon Dawson <spdawson@gmail.com>
-
-diff -Nurp a/crypto/wvx509.cc b/crypto/wvx509.cc
---- a/crypto/wvx509.cc 2008-10-23 21:23:49.000000000 +0100
-+++ b/crypto/wvx509.cc 2012-06-15 18:45:06.605899292 +0100
-@@ -1157,7 +1157,7 @@ WvString WvX509::get_extension(int nid)
-
- if (ext)
- {
-- X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
-+ X509V3_EXT_METHOD *method = const_cast<X509V3_EXT_METHOD *>(X509V3_EXT_get(ext));
- if (!method)
- {
- WvDynBuf buf;
diff --git a/package/wvstreams/0004-build-fixes.patch b/package/wvstreams/0004-build-fixes.patch
deleted file mode 100644
index 21792d7..0000000
--- a/package/wvstreams/0004-build-fixes.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Add missing includes for proper build on Linux/glibc
-
-The current wvstreams code doesn't build on Linux/glibc, with error
-about chmod() not being available (for wvunixdgsocket.cc) or umask()
-not being available (for wvatomicfile.cc). Those errors turn out to be
-missing includes. Those includes were in fact already done, but
-conditionally for MacOS. We make them unconditional (it probably
-breaks other platforms, but since Buildroot is Linux only, we don't
-care).
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/ipstreams/wvunixdgsocket.cc
-===================================================================
---- a/ipstreams/wvunixdgsocket.cc
-+++ b/ipstreams/wvunixdgsocket.cc
-@@ -1,8 +1,6 @@
- #include "wvunixdgsocket.h"
--#ifdef MACOS
- #include <sys/types.h>
- #include <sys/stat.h>
--#endif
-
- WvUnixDGSocket::WvUnixDGSocket(WvStringParm filename, bool _server, int perms)
- : socketfile(filename)
-Index: b/streams/wvatomicfile.cc
-===================================================================
---- a/streams/wvatomicfile.cc
-+++ b/streams/wvatomicfile.cc
-@@ -10,10 +10,7 @@
- #include "wvatomicfile.h"
- #include "wvfileutils.h"
- #include "wvstrutils.h"
--
--#ifdef MACOS
- #include <sys/stat.h>
--#endif
-
- WvAtomicFile::WvAtomicFile(WvStringParm filename, int flags, mode_t create_mode)
- : tmp_file(WvString::null)
diff --git a/package/wvstreams/0005-getuid.patch b/package/wvstreams/0005-getuid.patch
deleted file mode 100644
index 6015066..0000000
--- a/package/wvstreams/0005-getuid.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-[PATCH] wvuid.cc: getuid needs sys/types.h + unistd.h
-
-Otherwise the build fails with:
-
-utils/wvuid.cc: In function 'wvuid_t wvgetuid()':
-utils/wvuid.cc:63:19: error: 'getuid' was not declared in this scope
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- utils/wvuid.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-Index: wvstreams-4.6.1/utils/wvuid.cc
-===================================================================
---- wvstreams-4.6.1.orig/utils/wvuid.cc
-+++ wvstreams-4.6.1/utils/wvuid.cc
-@@ -33,6 +33,8 @@
-
- #else // not WIN32
-
-+#include <unistd.h>
-+#include <sys/types.h>
-
- WvString wv_username_from_uid(wvuid_t uid)
- {
diff --git a/package/wvstreams/Config.in b/package/wvstreams/Config.in
deleted file mode 100644
index a550c57..0000000
--- a/package/wvstreams/Config.in
+++ /dev/null
@@ -1,19 +0,0 @@
-config BR2_PACKAGE_WVSTREAMS
- bool "wvstreams"
- depends on BR2_DEPRECATED_SINCE_2016_08
- depends on BR2_INSTALL_LIBSTDCPP
- depends on !BR2_STATIC_LIBS
- depends on BR2_USE_MMU # fork()
- # musl not supported and no upstream activity since 2011.
- depends on !BR2_TOOLCHAIN_USES_MUSL
- select BR2_PACKAGE_OPENSSL
- select BR2_PACKAGE_ZLIB
- help
- C++ Network Programming Library.
-
- http://wvstreams.googlecode.com/
-
-comment "wvstreams needs a glibc or uClibc toolchain w/ C++, dynamic library"
- depends on BR2_DEPRECATED_SINCE_2016_08
- depends on BR2_USE_MMU
- depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL
diff --git a/package/wvstreams/wvstreams.hash b/package/wvstreams/wvstreams.hash
deleted file mode 100644
index 17cad6d..0000000
--- a/package/wvstreams/wvstreams.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# locally computed
-sha256 8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633 wvstreams-4.6.1.tar.gz
diff --git a/package/wvstreams/wvstreams.mk b/package/wvstreams/wvstreams.mk
deleted file mode 100644
index 4d344e2..0000000
--- a/package/wvstreams/wvstreams.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-################################################################################
-#
-# wvstreams
-#
-################################################################################
-
-WVSTREAMS_VERSION = 4.6.1
-WVSTREAMS_SITE = http://wvstreams.googlecode.com/files
-WVSTREAMS_DEPENDENCIES = openssl zlib host-pkgconf
-WVSTREAMS_INSTALL_STAGING = YES
-
-WVSTREAMS_LICENSE = LGPLv2+
-WVSTREAMS_LICENSE_FILES = LICENSE
-
-# N.B. parallel make fails
-WVSTREAMS_MAKE = $(MAKE1)
-
-# Needed to work around problem with wvassert.h
-WVSTREAMS_CONF_OPTS += CPPFLAGS=-DNDEBUG
-
-WVSTREAMS_CONF_OPTS += \
- --with-openssl \
- --with-zlib \
- --without-pam \
- --disable-warnings \
- --without-tcl
-
-# needed for openssl detection when statically linking (as ssl needs lz)
-WVSTREAMS_CONF_ENV += LIBS=-lz
-
-ifneq ($(BR2_STATIC_LIBS),y)
-WVSTREAMS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -fPIC"
-endif
-
-# wvstreams uses argp.h which can be provided by the argp-standalone
-# package
-ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y)
-WVSTREAMS_DEPENDENCIES += argp-standalone
-endif
-
-ifeq ($(BR2_PACKAGE_DBUS),y)
-WVSTREAMS_DEPENDENCIES += dbus
-WVSTREAMS_CONF_OPTS += --with-dbus
-else
-WVSTREAMS_CONF_OPTS += --without-dbus
-endif
-
-ifeq ($(BR2_PACKAGE_QT),y)
-WVSTREAMS_DEPENDENCIES += qt
-WVSTREAMS_CONF_OPTS += --with-qt
-else
-WVSTREAMS_CONF_OPTS += --without-qt
-endif
-
-ifeq ($(BR2_PACKAGE_VALGRIND),y)
-WVSTREAMS_DEPENDENCIES += valgrind
-WVSTREAMS_CONF_OPTS += --with-valgrind
-else
-WVSTREAMS_CONF_OPTS += --without-valgrind
-endif
-
-$(eval $(autotools-package))
--
2.9.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 13/13] Remove BR2_DEPRECATED
2016-10-15 14:50 [Buildroot] Deprecate BR2_DEPRECATED Arnout Vandecappelle
` (11 preceding siblings ...)
2016-10-15 14:51 ` [Buildroot] [PATCH 12/13] wvstreams: " Arnout Vandecappelle
@ 2016-10-15 14:51 ` Arnout Vandecappelle
2016-10-15 21:07 ` Peter Korsgaard
12 siblings, 1 reply; 29+ messages in thread
From: Arnout Vandecappelle @ 2016-10-15 14:51 UTC (permalink / raw)
To: buildroot
The BR2_DEPRECATED logic is a lot less useful than the legacy handling,
because the symbols just disappears without warning to the user. For
example, we had a few defconfigs that were using deprecated symbols
(which were not actually used because BR2_DEPRECATED wasn't set) so
these didn't build the expected code anymore.
Also, the idea behind BR2_DEPRECATED is that you can easily revive it
again if there is interest. However, it is relatively easy to revert
the removal of a package as well.
The deprecation is also more effort because it has to be removed twice:
once when deprecating, and once when really removing.
It doesn't make sense to add a legacy entry for BR2_DEPRECATED. Users
who actually used it will get legacy warnings instead.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
Config.in | 30 ------------------------------
Makefile | 2 --
Makefile.legacy | 3 ---
3 files changed, 35 deletions(-)
diff --git a/Config.in b/Config.in
index 8d37c93..d9fc400 100644
--- a/Config.in
+++ b/Config.in
@@ -361,36 +361,6 @@ config BR2_CCACHE_USE_BASEDIR
endif
-config BR2_DEPRECATED
- bool "Show options and packages that are deprecated or obsolete"
- help
- This option shows outdated/obsolete versions of packages and
- options that are otherwise hidden.
-
-if BR2_DEPRECATED
-
-config BR2_DEPRECATED_SINCE_2015_11
- bool
- default y
-
-config BR2_DEPRECATED_SINCE_2016_02
- bool
- default y
-
-config BR2_DEPRECATED_SINCE_2016_05
- bool
- default y
-
-config BR2_DEPRECATED_SINCE_2016_08
- bool
- default y
-
-config BR2_DEPRECATED_SINCE_2016_11
- bool
- default y
-
-endif
-
config BR2_ENABLE_DEBUG
bool "build packages with debugging symbols"
help
diff --git a/Makefile b/Makefile
index 74b831e..4110861 100644
--- a/Makefile
+++ b/Makefile
@@ -436,9 +436,7 @@ all: world
# Include legacy before the other things, because package .mk files
# may rely on it.
-ifneq ($(BR2_DEPRECATED),y)
include Makefile.legacy
-endif
include package/Makefile.in
include support/dependencies/dependencies.mk
diff --git a/Makefile.legacy b/Makefile.legacy
index 764cfcd..800c089 100644
--- a/Makefile.legacy
+++ b/Makefile.legacy
@@ -4,9 +4,6 @@
# This file contains placeholders to detect backward-compatibility problems.
# When a buildroot "API" feature is being deprecated, a rule should be added
# here that issues an error when the old feature is used.
-#
-# This file is not included if BR2_DEPRECATED is selected, so it is possible
-# to bypass the errors (although that's usually a bad idea).
ifeq ($(BR2_LEGACY),y)
$(error "You have legacy configuration in your .config! Please check your configuration.")
--
2.9.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 13/13] Remove BR2_DEPRECATED
2016-10-15 14:51 ` [Buildroot] [PATCH 13/13] Remove BR2_DEPRECATED Arnout Vandecappelle
@ 2016-10-15 21:07 ` Peter Korsgaard
0 siblings, 0 replies; 29+ messages in thread
From: Peter Korsgaard @ 2016-10-15 21:07 UTC (permalink / raw)
To: buildroot
>>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> writes:
> The BR2_DEPRECATED logic is a lot less useful than the legacy handling,
> because the symbols just disappears without warning to the user. For
> example, we had a few defconfigs that were using deprecated symbols
> (which were not actually used because BR2_DEPRECATED wasn't set) so
> these didn't build the expected code anymore.
> Also, the idea behind BR2_DEPRECATED is that you can easily revive it
> again if there is interest. However, it is relatively easy to revert
> the removal of a package as well.
> The deprecation is also more effort because it has to be removed twice:
> once when deprecating, and once when really removing.
> It doesn't make sense to add a legacy entry for BR2_DEPRECATED. Users
> who actually used it will get legacy warnings instead.
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 29+ messages in thread