[OpenWrt-Devel] [PATCH packages] php7: add package dependency on zoneinfo-core
From: Rafał Miłecki
Having "select PACKAGE_zoneinfo-core" wasn't enough for builds without
php7-cli=y or php7-cgi=y. It didn't result in installing zoneinfo-core
when using "opkg install" (during runtime or when building images with
CONFIG_TARGET_PER_DEVICE_ROOTFS).
Missing zoneinfo results in PHP fatal errors, e.g.:
Fatal error: DateTime::createFromFormat(): Timezone database is corrupt - this
should *never* happen!
For years users were told to manually install zoneinfo-core package.
This problem was hidden for some time (including 17.01 release) due to
disabled support for CONFIG_PHP7_SYSTEMTZDATA. It's now back as support
for --with-system-tzdata was enabled again.
The proper solution is to simply make php7 package depend on
zoneinfo-core when PHP7_SYSTEMTZDATA is used.
Fixes: 84e5012e8853 ("php7: re-enable system timezone data usage")
Signed-off-by: Rafał Miłecki
---
lang/php7/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lang/php7/Makefile b/lang/php7/Makefile
index aa860a95..93348543 100644
--- a/lang/php7/Makefile
+++ b/lang/php7/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=php
PKG_VERSION:=7.2.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_MAINTAINER:=Michael Heimpold
@@ -74,7 +74,6 @@ define Package/php7/config
config PHP7_SYSTEMTZDATA
bool "Use system timezone data instead of php's built-in
database"
depends on PACKAGE_php7-cli || PACKAGE_php7-cgi
- select PACKAGE_zoneinfo-core
default y
help
Enabling this feature automatically selects the
zoneinfo-core package
@@ -86,7 +85,8 @@ define Package/php7
$(call Package/php7/Default)
DEPENDS:=+libpcre +zlib \
- +PHP7_LIBXML:libxml2
+ +PHP7_LIBXML:libxml2 \
+ +PHP7_SYSTEMTZDATA:zoneinfo-core
endef
define Package/php7/description
--
2.13.7
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] base-files: fix links in banner.failsafe
Am Dienstag, 12. Juni 2018, 22:48:39 CEST schrieb Sven Roederer: > Update the link to the current section in the documentaion wiki. > This fixes https://github.com/openwrt/packages/issues/6282 > This was merged into master with 2314c2c6f295b7b4aa5a261d19fa6ca16210f42c. Can you cherry-pick into 18.06 and 17.01 too? Sven ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] mpc85xx: Enable caam support only for p1020
Am 18.06.2018 um 09:34 schrieb John Crispin: On 09/06/18 11:10, Hauke Mehrtens wrote: On 06/08/2018 04:42 PM, Achim Gottinger wrote: Disable caam support in default config and enable it only for the p1020 target. The generic target is used for the wdr4900-v1 tp-link router which does not have an enabled caam engine. If caam is build in for this target it adds non functional crypto methods to the kernels crypto framework. Strongswan for example tries to use these methods and as an result does not work. More about the issue is mentioned here https://bugs.openwrt.org/index.php?do=details&task_id=1262 Signed-off-by: Achim Gottinger --- target/linux/mpc85xx/config-4.9 | 10 -- target/linux/mpc85xx/generic/config-default | 10 ++ target/linux/mpc85xx/p1020/config-default | 10 ++ 3 files changed, 20 insertions(+), 10 deletions(-) Hi Felix, Please have a look at this patch. This problem was introduced in your commit: https://git.openwrt.org/c00e5a4f09115ec976fac7dc380f576ef6a24fab Hauke Acked-by: John Crispin looks good, but does not apply. please rebase/send. I'll merge a V2. John Hello John, I created the patch using git --format-patch origin. If i cnp the patch to an text file and try to apply it to openwrt master it applies without issues. What command are you using that fails? I'd be glad to modify the patch and send an V2 but first I must be able to reproduce the issue. Thanks in advance, Achim~ ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH packages] php7: add package dependency on zoneinfo-core
LGTM
Sent from my iPhone
> On Jun 24, 2018, at 2:19 AM, Rafał Miłecki wrote:
>
> From: Rafał Miłecki
>
> Having "select PACKAGE_zoneinfo-core" wasn't enough for builds without
> php7-cli=y or php7-cgi=y. It didn't result in installing zoneinfo-core
> when using "opkg install" (during runtime or when building images with
> CONFIG_TARGET_PER_DEVICE_ROOTFS).
>
> Missing zoneinfo results in PHP fatal errors, e.g.:
> Fatal error: DateTime::createFromFormat(): Timezone database is corrupt -
> this should *never* happen!
>
> For years users were told to manually install zoneinfo-core package.
> This problem was hidden for some time (including 17.01 release) due to
> disabled support for CONFIG_PHP7_SYSTEMTZDATA. It's now back as support
> for --with-system-tzdata was enabled again.
>
> The proper solution is to simply make php7 package depend on
> zoneinfo-core when PHP7_SYSTEMTZDATA is used.
>
> Fixes: 84e5012e8853 ("php7: re-enable system timezone data usage")
> Signed-off-by: Rafał Miłecki
> ---
> lang/php7/Makefile | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/lang/php7/Makefile b/lang/php7/Makefile
> index aa860a95..93348543 100644
> --- a/lang/php7/Makefile
> +++ b/lang/php7/Makefile
> @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
>
> PKG_NAME:=php
> PKG_VERSION:=7.2.6
> -PKG_RELEASE:=1
> +PKG_RELEASE:=2
>
> PKG_MAINTAINER:=Michael Heimpold
>
> @@ -74,7 +74,6 @@ define Package/php7/config
>config PHP7_SYSTEMTZDATA
>bool "Use system timezone data instead of php's built-in database"
>depends on PACKAGE_php7-cli || PACKAGE_php7-cgi
> -select PACKAGE_zoneinfo-core
>default y
>help
>Enabling this feature automatically selects the zoneinfo-core
> package
> @@ -86,7 +85,8 @@ define Package/php7
> $(call Package/php7/Default)
>
> DEPENDS:=+libpcre +zlib \
> - +PHP7_LIBXML:libxml2
> + +PHP7_LIBXML:libxml2 \
> + +PHP7_SYSTEMTZDATA:zoneinfo-core
> endef
>
> define Package/php7/description
> --
> 2.13.7
>
>
> ___
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/listinfo/openwrt-devel
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH packages] php7: add package dependency on zoneinfo-core
On 24/06/18 10:19, Rafał Miłecki wrote:
From: Rafał Miłecki
Having "select PACKAGE_zoneinfo-core" wasn't enough for builds without
php7-cli=y or php7-cgi=y. It didn't result in installing zoneinfo-core
when using "opkg install" (during runtime or when building images with
CONFIG_TARGET_PER_DEVICE_ROOTFS).
Missing zoneinfo results in PHP fatal errors, e.g.:
Fatal error: DateTime::createFromFormat(): Timezone database is corrupt - this
should *never* happen!
For years users were told to manually install zoneinfo-core package.
This problem was hidden for some time (including 17.01 release) due to
disabled support for CONFIG_PHP7_SYSTEMTZDATA. It's now back as support
for --with-system-tzdata was enabled again.
The proper solution is to simply make php7 package depend on
zoneinfo-core when PHP7_SYSTEMTZDATA is used.
Fixes: 84e5012e8853 ("php7: re-enable system timezone data usage")
Signed-off-by: Rafał Miłecki
php7 is part of the feed, please post a PR on github. the ML is
unfortunately only for trunk
John
---
lang/php7/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lang/php7/Makefile b/lang/php7/Makefile
index aa860a95..93348543 100644
--- a/lang/php7/Makefile
+++ b/lang/php7/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=php
PKG_VERSION:=7.2.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_MAINTAINER:=Michael Heimpold
@@ -74,7 +74,6 @@ define Package/php7/config
config PHP7_SYSTEMTZDATA
bool "Use system timezone data instead of php's built-in
database"
depends on PACKAGE_php7-cli || PACKAGE_php7-cgi
- select PACKAGE_zoneinfo-core
default y
help
Enabling this feature automatically selects the
zoneinfo-core package
@@ -86,7 +85,8 @@ define Package/php7
$(call Package/php7/Default)
DEPENDS:=+libpcre +zlib \
- +PHP7_LIBXML:libxml2
+ +PHP7_LIBXML:libxml2 \
+ +PHP7_SYSTEMTZDATA:zoneinfo-core
endef
define Package/php7/description
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] iwinfo: add channel survey
Should I add something. Do I have to implement the lua bindings?
What's missing?
Or is this patch not suitable for the iwinfo lib?
On 06.06.2018 17:17, Nick wrote:
> I just followed the coding style...
>
> On 06.06.2018 16:11, Koen Vandeputte wrote:
>>
>> On 2018-06-05 10:23, Nick wrote:
>>>
+static char * format_channel_time(uint64_t time)
+{
+ static char buf[30];
+
+ if (!time)
+ snprintf(buf, sizeof(buf), "unknown");
+ else
+ snprintf(buf, sizeof(buf), "%llu ms", time);
+
+ return buf;
+}
+
>> Out of curiosity:
>>
>>
>> Any reason to use a static char buffer inside this function instead of
>> using some char buffer provided by the caller?
>> This would:
>>
>> - Avoid using slow heap memory and use faster stack memory (if the
>> caller allocates it on stack)
>> - Automatically makes the function re-entrant & threadsafe this way
>>
>>
static char * format_noise(int noise)
{
static char buf[10];
@@ -531,6 +543,19 @@ static char * print_phyname(const struct
iwinfo_ops *iw, const char *ifname)
return "?";
}
+static void print_survey(const struct iwinfo_ops *iw, const char
*ifname)
+{
+ struct iwinfo_survey_entry entry;
+ iw->survey(ifname, &entry);
+ printf("%s\tESSID:\t\t\t\t%s\n", ifname, print_ssid(iw, ifname));
+ printf("\tChannel:\t\t\t%s (%s)\n", print_channel(iw, ifname),
format_frequency(entry.frequency));
+ printf("\tNoise:\t\t\t\t%s\n", format_noise(entry.noise));
+ printf("\tchannel Active Time:\t\t%s\n",
format_channel_time(entry.channel_time));
+ printf("\tChannel Busy
Time:\t\t%s\n",format_channel_time(entry.channel_time_busy));
+ printf("\tExtension Channel Busy
Time:\t%s\n",format_channel_time(entry.channel_time_ext_busy));
+ printf("\tChannel Receive
Time:\t\t%s\n",format_channel_time(entry.channel_time_rx));
+ printf("\tChannel Transmit
Time:\t\t%s\n",format_channel_time(entry.channel_time_tx));
+}
...
>> Koen
>>
>>
>>
>> ___
>> openwrt-devel mailing list
>> openwrt-devel@lists.openwrt.org
>> https://lists.openwrt.org/listinfo/openwrt-devel
>
> ___
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/listinfo/openwrt-devel
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Customizing openssh password login, preprovisioned root passwords, etc.
On 06/22/2018 12:43 AM, Philip Prindeville wrote: Hi all, A while back I proposed some PR’s to allow baking in root passwords (configurable, so it wouldn’t have to be some lame constant password) as well as turning off password login for OpenSSH server. The maintainers of base-files and openssh didn’t like either. So I’m proposing a virtual package that scribbles on both as part of its /postinst script, which was suggested as a compromise. Please see: https://github.com/openwrt/packages/pull/6311 and leave comments. Related thought: Some consumer grade routers have the WiFi key and admin password in part of the flash that OpenWrt doesn't write over. It would be nice to be able to include those as defaults, if possible. Then the password(s) would be as written on the bottom of the device after a settings reset. Eric ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH packages] php7: add package dependency on zoneinfo-core
Hi,
Am Sonntag, 24. Juni 2018, 19:40:53 CEST schrieb John Crispin:
> On 24/06/18 10:19, Rafał Miłecki wrote:
> > From: Rafał Miłecki
> >
> > Having "select PACKAGE_zoneinfo-core" wasn't enough for builds without
> > php7-cli=y or php7-cgi=y. It didn't result in installing zoneinfo-core
> > when using "opkg install" (during runtime or when building images with
> > CONFIG_TARGET_PER_DEVICE_ROOTFS).
> >
> > Missing zoneinfo results in PHP fatal errors, e.g.:
> > Fatal error: DateTime::createFromFormat(): Timezone database is corrupt -
> > this should *never* happen!
> >
> > For years users were told to manually install zoneinfo-core package.
> > This problem was hidden for some time (including 17.01 release) due to
> > disabled support for CONFIG_PHP7_SYSTEMTZDATA. It's now back as support
> > for --with-system-tzdata was enabled again.
> >
> > The proper solution is to simply make php7 package depend on
> > zoneinfo-core when PHP7_SYSTEMTZDATA is used.
> >
> > Fixes: 84e5012e8853 ("php7: re-enable system timezone data usage")
> > Signed-off-by: Rafał Miłecki
>
> php7 is part of the feed, please post a PR on github. the ML is
> unfortunately only for trunk
this is true, but since I'm reading this list too and the patch is correct
I picked it up - no need to open a PR - hope this is ok for all :-)
Thanks,
Michael
> John
>
> > ---
> >
> > lang/php7/Makefile | 6 +++---
> > 1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/lang/php7/Makefile b/lang/php7/Makefile
> > index aa860a95..93348543 100644
> > --- a/lang/php7/Makefile
> > +++ b/lang/php7/Makefile
> > @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
> >
> > PKG_NAME:=php
> > PKG_VERSION:=7.2.6
> >
> > -PKG_RELEASE:=1
> > +PKG_RELEASE:=2
> >
> > PKG_MAINTAINER:=Michael Heimpold
> >
> > @@ -74,7 +74,6 @@ define Package/php7/config
> >
> > config PHP7_SYSTEMTZDATA
> >
> > bool "Use system timezone data instead of php's built-in
> > database"
> > depends on PACKAGE_php7-cli || PACKAGE_php7-cgi
> >
> > - select PACKAGE_zoneinfo-core
> >
> > default y
> > help
> >
> > Enabling this feature automatically selects the
> > zoneinfo-core
package
> >
> > @@ -86,7 +85,8 @@ define Package/php7
> >
> > $(call Package/php7/Default)
> >
> > DEPENDS:=+libpcre +zlib \
> >
> > - +PHP7_LIBXML:libxml2
> > + +PHP7_LIBXML:libxml2 \
> > + +PHP7_SYSTEMTZDATA:zoneinfo-core
> >
> > endef
> >
> > define Package/php7/description
>
> ___
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/listinfo/openwrt-devel
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH packages] php7: add package dependency on zoneinfo-core
On 2018-06-24 21:39, Michael Heimpold wrote:
Am Sonntag, 24. Juni 2018, 19:40:53 CEST schrieb John Crispin:
On 24/06/18 10:19, Rafał Miłecki wrote:
> From: Rafał Miłecki
>
> Having "select PACKAGE_zoneinfo-core" wasn't enough for builds without
> php7-cli=y or php7-cgi=y. It didn't result in installing zoneinfo-core
> when using "opkg install" (during runtime or when building images with
> CONFIG_TARGET_PER_DEVICE_ROOTFS).
>
> Missing zoneinfo results in PHP fatal errors, e.g.:
> Fatal error: DateTime::createFromFormat(): Timezone database is corrupt -
> this should *never* happen!
>
> For years users were told to manually install zoneinfo-core package.
> This problem was hidden for some time (including 17.01 release) due to
> disabled support for CONFIG_PHP7_SYSTEMTZDATA. It's now back as support
> for --with-system-tzdata was enabled again.
>
> The proper solution is to simply make php7 package depend on
> zoneinfo-core when PHP7_SYSTEMTZDATA is used.
>
> Fixes: 84e5012e8853 ("php7: re-enable system timezone data usage")
> Signed-off-by: Rafał Miłecki
php7 is part of the feed, please post a PR on github. the ML is
unfortunately only for trunk
this is true, but since I'm reading this list too and the patch is
correct
I picked it up - no need to open a PR - hope this is ok for all :-)
Thanks!
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] brcm2708: cosmetic changes
bcm2709: rename kernel.img to image7.img kernel8.img boot in 64 bit mode kernel8-32.img boot in 32 bit mode kernel7.img 32 bit mode kernel.img 32 bit mode bcm2710: sort order Signed-off-by: Christo Nedev --- target/linux/brcm2708/image/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/linux/brcm2708/image/Makefile b/target/linux/brcm2708/image/Makefile index 80a019270d..8a94375600 100644 --- a/target/linux/brcm2708/image/Makefile +++ b/target/linux/brcm2708/image/Makefile @@ -54,6 +54,7 @@ define Device/Default endef define Device/rpi + KERNEL_IMG := kernel.img DEVICE_TITLE := Raspberry Pi B/B+/CM/Zero/ZeroW DEVICE_DTS := bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm bcm2708-rpi-0-w SUPPORTED_DEVICES := rpi-b rpi-b-plus rpi-cm rpi-zero rpi-zero-w raspberrypi,model-b raspberrypi,model-b-plus raspberrypi,compute-module-1 raspberrypi,model-b-rev2 raspberrypi,model-zero raspberrypi,model-zero-w @@ -64,6 +65,7 @@ ifeq ($(SUBTARGET),bcm2708) endif define Device/rpi-2 + KERNEL_IMG := kernel7.img DEVICE_TITLE := Raspberry Pi 2B/3B/3B+/3CM DEVICE_DTS := bcm2709-rpi-2-b bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3 SUPPORTED_DEVICES := rpi-2-b rpi-3-b rpi-3-b-plus rpi-cm raspberrypi,2-model-b raspberrypi,3-model-b raspberrypi,3-model-b-plus raspberrypi,compute-module-3 @@ -78,7 +80,7 @@ define Device/rpi-3 DEVICE_TITLE := Raspberry Pi 3B/3B+ DEVICE_DTS := broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus SUPPORTED_DEVICES := rpi-3-b rpi-3-b-plus raspberrypi,3-model-b raspberrypi,3-model-b-plus - DEVICE_PACKAGES := brcmfmac-firmware-43430-sdio brcmfmac-board-rpi2 brcmfmac-firmware-43455-sdio brcmfmac-board-rpi3 kmod-brcmfmac wpad-mini + DEVICE_PACKAGES := brcmfmac-firmware-43430-sdio brcmfmac-firmware-43455-sdio brcmfmac-board-rpi2 brcmfmac-board-rpi3 kmod-brcmfmac wpad-mini endef ifeq ($(SUBTARGET),bcm2710) TARGET_DEVICES += rpi-3 -- 2.11.0 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] base-files: fix links in banner.failsafe
On Sun, Jun 24, 2018 at 4:09 PM Sven Roederer wrote: > > Am Dienstag, 12. Juni 2018, 22:48:39 CEST schrieb Sven Roederer: > > Update the link to the current section in the documentaion wiki. > > This fixes https://github.com/openwrt/packages/issues/6282 > > > > This was merged into master with 2314c2c6f295b7b4aa5a261d19fa6ca16210f42c. > Can you cherry-pick into 18.06 and 17.01 too? Cherry-picked to both 18.06 and 17.01 Hans > > > Sven > > ___ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] base-files: fix links in banner.failsafe
Am Sonntag, 24. Juni 2018, 22:36:42 CEST schrieb Hans Dedecker: > > Cherry-picked to both 18.06 and 17.01 > > Hans > Thanks ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Customizing openssh password login, preprovisioned root passwords, etc.
> On Jun 24, 2018, at 12:42 PM, Eric Luehrsen wrote: > > On 06/22/2018 12:43 AM, Philip Prindeville wrote: >> Hi all, >> A while back I proposed some PR’s to allow baking in root passwords >> (configurable, so it wouldn’t have to be some lame constant password) as >> well as turning off password login for OpenSSH server. >> The maintainers of base-files and openssh didn’t like either. >> So I’m proposing a virtual package that scribbles on both as part of its >> /postinst script, which was suggested as a compromise. >> Please see: >> https://github.com/openwrt/packages/pull/6311 >> and leave comments. > > Related thought: Some consumer grade routers have the WiFi key and admin > password in part of the flash that OpenWrt doesn't write over. It would be > nice to be able to include those as defaults, if possible. Then the > password(s) would be as written on the bottom of the device after a settings > reset. > > Eric I could add this to the customization. I was trying to find where the original /etc/config/wireless file is, but there doesn’t seem to be one… Is it auto-synthesized per the available hardware on the first boot? -Philip ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 2/3] rules.mk: replace iremap when using GCC 8
On Fri, 22 Jun 2018 at 19:21, Syrone Wong wrote: > > Hi, > > LGTM. Any documentation on the hidden config symbols? do not top post please. kconfig symbols will be hidden when they have no title. basically all symbols in Config.version are hidden. yousong > > > Best Regards, > Syrone Wong > > > On Fri, Jun 22, 2018 at 5:00 PM, Yousong Zhou wrote: > > On Fri, 22 Jun 2018 at 08:22, Syrone Wong wrote: > >> > >> HI, > >> > >> I'm not sure whether it's the correct way to deal with the flag. When > >> we add GCC 9 in the future, we have to remember to apply this dirty > >> overwrite hack as well. > >> Please feel free to share more elegant ways. > > > > How about adding a hidden config symbol in > > toolchain/gcc/Config.version that says the how to apply the argument. > > > > yousong ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/listinfo/openwrt-devel
[OpenWrt-Devel] [RFC] toolchain: gcc: drop 850-use_shared_libgcc.patch
A link error was encountered when invoking "gccgo -static hello.go" to test a
fix for gccgo [1]. The linker cannot find reference to _Unwind_Resume which is
defined in libgcc_eh.a and from the "gccgo -v" and "gccgo -dumpspecs" output, I
found the issue was caused by libgcc_spec being patched by the said patch
The patch was originally introduced for linaro-gcc 4.5 in 2011 commit
23e18c9 ("gcc-linaro: fix the libgcc spec to default to using the shared
libgcc"). It should be not needed now as the libgcc_spec logic of since
at least gcc 5.5.0 already takes that into account
%{static|static-libgcc:-lgcc
-lgcc_eh}%{!static:%{!static-libgcc:%{!shared-libgcc:-lgcc --as-needed -lgcc_s
--no-as-needed}%{shared-libgcc:-lgcc_s%{!shared: -lgcc
It should also be noted that -lgcc_eh was removed in a followed up
commit c2e2651 ("toolchain: remove -lgcc_eh from the default libgcc
spec, it breaks packages"), though the actual symptom was not
recorded then
[1] https://bugs.openwrt.org/index.php?do=details&task_id=1498
Signed-off-by: Yousong Zhou
---
.../gcc/patches/5.5.0/850-use_shared_libgcc.patch | 47 ---
.../gcc/patches/7.3.0/850-use_shared_libgcc.patch | 54 --
.../850-use_shared_libgcc.patch| 54 --
3 files changed, 155 deletions(-)
delete mode 100644 toolchain/gcc/patches/5.5.0/850-use_shared_libgcc.patch
delete mode 100644 toolchain/gcc/patches/7.3.0/850-use_shared_libgcc.patch
delete mode 100644
toolchain/gcc/patches/arc-2017.09-release/850-use_shared_libgcc.patch
diff --git a/toolchain/gcc/patches/5.5.0/850-use_shared_libgcc.patch
b/toolchain/gcc/patches/5.5.0/850-use_shared_libgcc.patch
deleted file mode 100644
index 5818cf4da0..00
--- a/toolchain/gcc/patches/5.5.0/850-use_shared_libgcc.patch
+++ /dev/null
@@ -1,47 +0,0 @@
a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -131,10 +131,6 @@
- #define ENDFILE_SPEC \
- LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
-
--/* Use the default LIBGCC_SPEC, not the version in linux-elf.h, as we
-- do not use -lfloat. */
--#undef LIBGCC_SPEC
--
- /* Clear the instruction cache from `beg' to `end'. This is
-implemented in lib1funcs.S, so ensure an error if this definition
-is used. */
a/gcc/config/linux.h
-+++ b/gcc/config/linux.h
-@@ -53,6 +53,10 @@ see the files COPYING3 and COPYING.RUNTI
- builtin_assert ("system=posix");\
- } while (0)
-
-+#ifndef LIBGCC_SPEC
-+#define LIBGCC_SPEC
"%{static|static-libgcc:-lgcc}%{!static:%{!static-libgcc:-lgcc_s}}"
-+#endif
-+
- /* Determine which dynamic linker to use depending on whether GLIBC or
-uClibc or Bionic or musl is the default C library and whether
--muclibc or -mglibc or -mbionic or -mmusl has been passed to change
a/libgcc/mkmap-symver.awk
-+++ b/libgcc/mkmap-symver.awk
-@@ -132,5 +132,5 @@ function output(lib) {
- else if (inherit[lib])
- printf("} %s;\n", inherit[lib]);
- else
--printf ("\n local:\n\t*;\n};\n");
-+printf ("\n\t*;\n};\n");
- }
a/gcc/config/rs6000/linux.h
-+++ b/gcc/config/rs6000/linux.h
-@@ -60,6 +60,9 @@
- #undefCPP_OS_DEFAULT_SPEC
- #define CPP_OS_DEFAULT_SPEC "%(cpp_os_linux)"
-
-+#undef LIBGCC_SPEC
-+#define LIBGCC_SPEC "%{!static:%{!static-libgcc:-lgcc_s}} -lgcc"
-+
- #undef LINK_SHLIB_SPEC
- #define LINK_SHLIB_SPEC "%{shared:-shared} %{!shared: %{static:-static}}"
-
diff --git a/toolchain/gcc/patches/7.3.0/850-use_shared_libgcc.patch
b/toolchain/gcc/patches/7.3.0/850-use_shared_libgcc.patch
deleted file mode 100644
index 1d07efed80..00
--- a/toolchain/gcc/patches/7.3.0/850-use_shared_libgcc.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-commit dcfc40358b5a3cae7320c17f8d1cebd5ad5540cd
-Author: Felix Fietkau
-Date: Sun Feb 12 20:25:47 2012 +
-
-gcc 4.6: port over the missing patch 850-use_shared_libgcc.patch to
prevent libgcc crap from leaking into every single binary
-
-SVN-Revision: 30486
a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -126,10 +126,6 @@
- "%{Ofast|ffast-math|funsafe-math-optimizations:crtfastmath.o%s} " \
- LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
-
--/* Use the default LIBGCC_SPEC, not the version in linux-elf.h, as we
-- do not use -lfloat. */
--#undef LIBGCC_SPEC
--
- /* Clear the instruction cache from `beg' to `end'. This is
-implemented in lib1funcs.S, so ensure an error if this definition
-is used. */
a/gcc/config/linux.h
-+++ b/gcc/config/linux.h
-@@ -53,6 +53,10 @@ see the files COPYING3 and COPYING.RUNTI
- builtin_assert ("system=posix");\
- } while (0)
-
-+#ifndef LIBGCC_SPEC
-+#define LIBGCC_SPEC
"%{static|static-libgcc:-lgcc}%{!static:%{!static-libgcc:-lgcc_s}}"
-+#endif
-+
- /* Determine which dynamic linker to use depending on whether GLIBC or
-uClibc or Bionic or musl is
Re: [OpenWrt-Devel] [PATCH] dropbear: Install to /(s)bin instead of /usr so OpenSSH can coexist
On Sat, 23 Jun 2018 at 00:51, Rosen Penev wrote: > > On Fri, Jun 22, 2018 at 1:53 AM Yousong Zhou wrote: > > > > On Sun, 17 Jun 2018 at 11:07, Rosen Penev wrote: > > > > > > If you run opkg install openssh-client and then remove it, the ssh client > > > symlink that was initially there goes away. This avoids that problem. > > > > > > > opkg's "alternatives" support fits this situation perfectly. Please > > take busybox ip and ip-tiny, ip-full as an example. > > > Hmm? Dropbear needs to be installed alongside OpenSSH in order to edit > sshd_config to enable root login. Sorry, failed to get how this symlink management thing affects root login. I created a pull request for openssh-client [1] and patches also dropbear [2] to use the alternatives support in opkg. The alternatives support intends to be a general solution to the preinst/postrm hook or PATH precedence hack. [1] https://github.com/openwrt/packages/pull/6344 [2] https://git.openwrt.org/?p=openwrt/staging/yousong.git;a=shortlog;h=refs/heads/ssh-alt yousong ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/listinfo/openwrt-devel
