Re: [OpenWrt-Devel] Doubts with mac80211.sh and wpa_supplicant.sh scripts
Hi Bastian, thanks for replying.
The line I referred to is in wpa_supplicant.sh line 167.
Then, according to your explanation, in the script wpa_supplicant.sh
line 167, that means the variable fixed will have a value of
fixed_freq=1 right? I guess this option is only enabled on the sta
mode, doesn't it? I ask this, because I´m trying to understand how the
client knows the AP channel or frequency...
thanks again
2013/5/16 Bastian Bittorf bitt...@bluebottle.com:
* Francisco Cuesta ndarkn...@gmail.com [16.05.2013 18:32]:
Thanks for replying Bastian,
Do you know the meaning of the ${fixed:+fixed_freq=1} ?? I mean,
this fixes the vaule of the frequency but for what value?
i can only see:
line 335:
[ $channel = auto -o $channel = 0 ] || {
fixed=1
}
line 528:
${fixed:+fixed-freq}
which means: if channel is auto or 0, than
the freq is NOT fixed, so dont insert the statement.
the syntax:
${variable:+bla}
means: has variable a value, than output bla, which is the same like
[ -n $variable ] echo bla
(but often used inline)
for further explenation read here:
http://tldp.org/LDP/abs/html/parameter-substitution.html
bye, bastian
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Fwd: [PATCH][include] Update CyaSSL library to last version 2.6.0
CyaSSL must determine the environment to recognize the size of the types, there is a conflict on the size of the long type. Can you attach the changes on curl makefile for using CyaSSL ? 2013/5/16 Ben West b...@gowasabi.net Thank you for sharing this patch! I'm trying this very patch to see if I can use cyassl with curl, instead of openssl. (cyassl v1.6.5 is apparently old enough that the current version of curl can no longer use libcyassl.so.) However, my build on ar71xx target fails when libcurl tries to link to libcyassl on the rather esoteric error bad math long / long long settings. Are there platform limitations to the new version of cyassl? OpenWrt-libtool: compile: mips-openwrt-linux-uclibc-gcc -DHAVE_CONFIG_H -I../include/curl -I../include -I../include -I../lib -I../lib -DCURL_HIDDEN_SYMBOLS -isystem /blah/blah/openwrt/staging_dir/target-mips_r2_uClibc-0.9.33.2/usr/include -isystem /blah/blah/openwrt/staging_dir/target-mips_r2_uClibc-0.9.33.2/include -isystem /blah/blah/openwrt/staging_dir/toolchain-mips_r2_gcc-4.7-linaro_uClibc-0.9.33.2/usr/include -isystem /blah/blah/openwrt/staging_dir/toolchain-mips_r2_gcc-4.7-linaro_uClibc-0.9.33.2/include -I/blah/blah/openwrt/staging_dir/target-mips_r2_uClibc-0.9.33.2/usr/include -I/blah/blah/openwrt/staging_dir/target-mips_r2_uClibc-0.9.33.2/usr/include -fvisibility=hidden -Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves -funit-at-a-time -fhonour-copts -Wno-error=unused-but-set-variable -msoft-float -fpic -Wno-system-headers -MT libcurl_la-cyassl.lo -MD -MP -MF .deps/libcurl_la-cyassl.Tpo -c cyassl.c -fPIC -DPIC -o .libs/libcurl_la-cyassl.o In file included from /blah/blah/openwrt/staging_dir/target-mips_r2_uClibc-0.9.33.2/usr/include/cyassl/ctaocrypt/error.h:26:0, from /blah/blah/openwrt/staging_dir/target-mips_r2_uClibc-0.9.33.2/usr/include/cyassl/error.h:26, from cyassl.c:53: /blah/blah/openwrt/staging_dir/target-mips_r2_uClibc-0.9.33.2/usr/include/cyassl/ctaocrypt/types.h:274:6: error: #error bad math long / long long settings /blah/blah/openwrt/staging_dir/target-mips_r2_uClibc-0.9.33.2/usr/include/cyassl/ctaocrypt/types.h:276:1: error: expected identifier before '}' token make[5]: *** [libcurl_la-cyassl.lo] Error 1 The caveat, however, is that I'm trying to compile the newer cyassl for Attitude Adjustment v36608, not trunk. Not sure if that would make a difference for this error. On Sun, May 5, 2013 at 5:50 AM, Massimo Vellucci vema...@gmail.comwrote: Sorry I made a big mistake, I attached the wrong patch. For x86 you need to disable the PIC optimization otherwise you get an error at compile time. diff -r -u a/package/libs/cyassl/Makefile b/package/libs/cyassl/Makefile --- a/package/libs/cyassl/Makefile2013-03-21 08:08:18.0 +0100 +++ b/package/libs/cyassl/Makefile2013-05-05 10:27:06.0 +0200 @@ -8,16 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cyassl -PKG_VERSION:=1.6.5 -PKG_RELEASE:=2 +PKG_VERSION:=2.6.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip PKG_SOURCE_URL:=http://www.yassl.com/ -PKG_MD5SUM:=98c2c6350acf1d089756a1de9ccb9903 +PKG_MD5SUM:=9c48fd4ab677c11b4612fb4eb15444d9 -PKG_FIXUP:=patch-libtool PKG_INSTALL:=1 -PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk @@ -37,8 +35,12 @@ TARGET_CFLAGS += $(FPIC) CONFIGURE_ARGS += \ - --without-zlib \ - --enable-singleThreaded + --without-pic \ + --enable-dtls \ + --enable-static \ + --enable-opensslextra \ + --enable-singlethreaded \ + --disable-examples define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include I'm sorry again for the mistake Massimo ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel -- Ben West http://gowasabi.net b...@gowasabi.net 314-246-9434 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 2/2] imx23: Add target for i.MX23
Hi, On Thu, May 16, 2013 at 12:02 AM, Zoltan HERPAI wigy...@uid0.hu wrote: Adding target support for i.MX23, with initial profiles for the different Olinuxino boards. Signed-off-by: Zoltan HERPAI wigy...@uid0.hu --- Index: target/linux/imx23/image/Makefile === --- target/linux/imx23/image/Makefile (revision 0) +++ target/linux/imx23/image/Makefile (revision 0) @@ -0,0 +1,42 @@ +# +# Copyright (C) 2010 OpenWrt.org It's 2013 ... +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/image.mk + +JFFS2_BLOCKSIZE=128k 16k Maybe order them by size? +JFFS2OPTS += -n Long option names are preferred (at least by me). Actually do you need jffs2 at all? None of the boards seem to have internal flash. + +#define Image/BuildKernel +# mkdir -p $(BIN_DIR) +# cp $(KDIR)/vmlinuz $(BIN_DIR)/$(IMG_PREFIX)-zImage +#endef + +#define Image/Prepare +# cp $(LINUX_DIR)/arch/arm/boot/zImage $(KDIR)/vmlinuz +#endef Please remove dead code. + + +define Image/Build/jffs2-64k + dd if=$(KDIR)/root.jffs2-64k of=$(BIN_DIR)/openwrt-$(BOARD)-jffs2-64k.img bs=65536 conv=sync This patch is line broken, please fix your mailer. Also since you don't include 64k block size in JFFS_BLOCKSIZE, this is basically read code, so you can remove it, especially as none of the devices seem to have integrated flash. You can prevent building them by clearing JFFS2_BLOCKSIZE. +endef + +define Image/Build/jffs2-128k + dd if=$(KDIR)/root.jffs2-128k of=$(BIN_DIR)/openwrt-$(BOARD)-jffs2-128k.img bs=131072 conv=sync +endef + +define Image/Build/squashfs + $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) + dd if=$(KDIR)/root.squashfs of=$(BIN_DIR)/openwrt-$(BOARD)-squashfs.img bs=131072 conv=sync +endef Same these two, you are never actually calling them them. + +define Image/Build + $(call Image/Build/$(1)) + dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync +endef + + +$(eval $(call BuildImage)) Index: target/linux/imx23/profiles/003-Micro.mk === --- target/linux/imx23/profiles/003-Micro.mk(revision 0) +++ target/linux/imx23/profiles/003-Micro.mk(revision 0) @@ -0,0 +1,19 @@ +# +# Copyright (C) 2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +# FiXME: need to add usb soc + +define Profile/MICRO + NAME:=OLinuXino-MICRO board +# PACKAGES:=kmod-rtl8187 +endef + +define Profile/MICRO/Description + Base packages for -MICRO boards. +endef +$(eval $(call Profile,MICRO)) + Index: target/linux/imx23/profiles/000-Maxi.mk === --- target/linux/imx23/profiles/000-Maxi.mk (revision 0) +++ target/linux/imx23/profiles/000-Maxi.mk (revision 0) @@ -0,0 +1,19 @@ +# +# Copyright (C) 2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +# FiXME: need to add usb soc and snd + +define Profile/MAXI + NAME:=OLinuXino-MAXI board + PACKAGES:=kmod-usb-net-smsc95xx +endef + +define Profile/MAXI/Description + Base packages for -MAXI boards. +endef +$(eval $(call Profile,MAXI)) + Index: target/linux/imx23/profiles/002-Mini.mk === --- target/linux/imx23/profiles/002-Mini.mk (revision 0) +++ target/linux/imx23/profiles/002-Mini.mk (revision 0) @@ -0,0 +1,19 @@ +# +# Copyright (C) 2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +# FiXME: need to add usb soc and snd + +define Profile/MINI + NAME:=OLinuXino-MINI board + PACKAGES:=kmod-rtl8187 Why does the mini non-wifi include the wifi driver? +endef + +define Profile/MINI/Description + Base packages for -MINI boards. +endef +$(eval $(call Profile,MINI)) + Index: target/linux/imx23/profiles/001-Mini-Wifi.mk === --- target/linux/imx23/profiles/001-Mini-Wifi.mk(revision 0) +++ target/linux/imx23/profiles/001-Mini-Wifi.mk(revision 0) @@ -0,0 +1,19 @@ +# +# Copyright (C) 2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +# FiXME: need to add usb soc and snd + +define Profile/MINI-WIFI + NAME:=OLinuXino-MINI-WIFI board + PACKAGES:=kmod-rtl8187 +endef + +define Profile/MINI-WIFI/Description + Base packages for -MINI-WIFI boards. +endef +$(eval $(call
Re: [OpenWrt-Devel] [PATCH 1/2] [tools]: Add tools support for i.MX23
Hi,
On Thu, May 16, 2013 at 12:01 AM, Zoltan HERPAI wigy...@uid0.hu wrote:
Add tools support for booting up an i.MX23-based board via bootlets.
Signed-off-by: Zoltan HERPAI wigy...@uid0.hu
---
Index: package/imx-bootlets/patches/003-add-olinuxino.diff
===
--- package/imx-bootlets/patches/003-add-olinuxino.diff (revision 0)
+++ package/imx-bootlets/patches/003-add-olinuxino.diff (revision 0)
Minor nitpick: Patches are usually called .patch, not .diff.
@@ -0,0 +1,171 @@
+diff -ruN imx-bootlets-10.05.02.orig/linux.db
imx-bootlets-10.05.02/linux.db
+--- imx-bootlets-10.05.02.orig/linux.db2010-05-14
06:56:28.0 +0200
imx-bootlets-10.05.02/linux.db 2012-10-27 01:35:55.0 +0200
+@@ -1,10 +1,10 @@
+-// STMP378x ROM command script to load and run Linux kernel
++// IMX23_OLINUXINO ROM command script to load and run Linux kernel
+
+ sources {
+ power_prep=./power_prep/power_prep;
+ sdram_prep=./boot_prep/boot_prep;
+ linux_prep=./linux_prep/output-target/linux_prep;
+- zImage=/home/b18647/repos/ltib_latest/rootfs/boot/zImage;
++ zImage=../../kernel/linux-3.6-rc1/arch/arm/boot/zImage;
Why is this change necessary? And why does it then not match the
actual used kernel version. Actually, why then not use a path/name
that does not include the version?
+ }
+
+ section (0) {
+diff -ruN
imx-bootlets-10.05.02.orig/linux_prep/board/imx23_olinuxino_dev.c
imx-bootlets-10.05.02/linux_prep/board/imx23_olinuxino_dev.c
+--- imx-bootlets-10.05.02.orig/linux_prep/board/imx23_olinuxino_dev.c
1970-01-01 01:00:00.0 +0100
imx-bootlets-10.05.02/linux_prep/board/imx23_olinuxino_dev.c
2012-10-27 01:35:55.0 +0200
+@@ -0,0 +1,54 @@
++/*
++ * Platform specific data for the IMX23_OLINUXINO development board
++ *
++ * Fadil Berisha fadil.r.beri...@gmail.com
++ *
++ * Copyright 2008 SigmaTel, Inc
++ * Copyright 2008 Embedded Alley Solutions, Inc
++ * Copyright 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ *
++ * This file is licensed under the terms of the GNU General Public License
++ * version 2. This program is licensed as is without any warranty of any
++ * kind, whether express or implied.
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++#include setup.h
++#include keys.h
++#include lradc_buttons.h
++
++/
++ * LRADC keyboard data *
++ /
++int lradc_keypad_ch = LRADC_CH0;
++int lradc_vddio_ch = LRADC_CH6;
++
++struct lradc_keycode lradc_keycodes[] = {
++ { 100, KEY4 },
++ { 306, KEY5 },
++ { 601, KEY6 },
++ { 932, KEY7 },
++ { 1260, KEY8 },
++ { 1424, KEY9 },
++ { 1707, KEY10 },
++ { 2207, KEY11 },
++ { 2525, KEY12 },
++ { 2831, KEY13 },
++ { 3134, KEY14 },
++ { -1, 0 },
++};
++
++/
++ * Magic key combinations for Armadillo *
++ /
++u32 magic_keys[MAGIC_KEY_NR] = {
++ [MAGIC_KEY1] = KEY4,
++ [MAGIC_KEY2] = KEY6,
++ [MAGIC_KEY3] = KEY10,
++};
++
++/
++ * Default command line *
++ /
++char cmdline_def[] = console=ttyAMA0,115200;
+diff -ruN
imx-bootlets-10.05.02.orig/linux_prep/cmdlines/imx23_olinuxino_dev.txt
imx-bootlets-10.05.02/linux_prep/cmdlines/imx23_olinuxino_dev.txt
+---
imx-bootlets-10.05.02.orig/linux_prep/cmdlines/imx23_olinuxino_dev.txt
1970-01-01 01:00:00.0 +0100
imx-bootlets-10.05.02/linux_prep/cmdlines/imx23_olinuxino_dev.txt
2012-10-27 01:35:55.0 +0200
+@@ -0,0 +1,3 @@
++noinitrd console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait ssp1=mmc
++noinitrd console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait ssp1=mmc
++noinitrd console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait ssp1=mmc
Three times' the charm?
+diff -ruN imx-bootlets-10.05.02.orig/linux_prep/core/setup.c
imx-bootlets-10.05.02/linux_prep/core/setup.c
+--- imx-bootlets-10.05.02.orig/linux_prep/core/setup.c 2010-05-14
06:56:28.0 +0200
imx-bootlets-10.05.02/linux_prep/core/setup.c 2012-10-27
01:35:55.0 +0200
+@@ -84,6 +84,8 @@
+ #include ../../mach-mx28/includes/registers/regsrtc.h
+ #elif defined(STMP378X)
+ #include ../../mach-mx23/includes/registers/regsrtc.h
++#elif defined(IMX23_OLINUXINO)
++#include ../../mach-mx23/includes/registers/regsrtc.h
+ #endif
+
+ #define NAND_SECONDARY_BOOT 0x0002
+diff -ruN imx-bootlets-10.05.02.orig/linux_prep/include/mx23/platform.h
imx-bootlets-10.05.02/linux_prep/include/mx23/platform.h
+--- imx-bootlets-10.05.02.orig/linux_prep/include/mx23/platform.h
2010-05-14 06:56:28.0 +0200
Re: [OpenWrt-Devel] Question about pulling out the latest revision of sources for openwrt tagged sources
On 2013-05-16 8:13 PM, Jiri Slachta wrote: Hello everyone, I would love to start an open discussion. There is a little issue with checking out the latest revision of sources for package asteriskXX-chan-sccp-b. Those sources are OpenWrt tagged, so it should consist of stable sources to be compiled. Even if those sources are release-candidate, they are more stable and functional than every previous stable release that was released to this date. Once the stable release will be rolled out, the package variables will be switched to tarball. Package freeswitch does the same, except the one thing - it pulls the latest HEAD revision if it's told to pull it out (CONFIG_FS_...), otherwise it pulls out the default revision. I would love to do the opposite - to always pull the latest revision. (see http://git.nanl.de/?p=openwrt/telephony.git;a=blob;f=freeswitch/Makefile ) Is it acceptable to always check out the latest revision, or should we stick with specific revision? What do you think about that? A package should always build a specific revision. The reason for this is simple: sometimes people want to build older versions to check for regressions, or build a particular older version of OpenWrt, including the versions of packages that were used at that time. This becomes impossible or impractical if packages suddenly start becoming moving targets and older versions of packages start randomly breaking because the upstream SVN changed. - Felix ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Netifd: Generic multi-wan support v3
This patch implements the comments received for version 1 (see
https://lists.openwrt.org/pipermail/openwrt-devel/2013-May/020119.html), and
improves upon version 2 by respecting metrics.
* Routes are only added to the specified table. The only exception are the
IPv4-routes Linux automatically adds to the default table when an address
with a mask less than 32 comes up. In order to respect the metrics, each
automatic routes is replaced by one containing the correct metric (if metric
is set). Prefsrc is set as the source hint is needed in case of overlapping
subnets. The automatic routes, or equivalent, needed to be present (in the
default table) for for example adding default routes to interfaces to work.
* The rules are divided into three 'parts', in order to support the case where a
client is connected to networks with overlapping subnets. The first part
consists of the from IP-address-rules, so that packets from sockets bound
to IPs on the device go through the intended interface. The order here does
not matter.
Then follows lookups in main and default, before the networks and from
lo-rules are checked. If metric is set, the priority of this rules is 65535
+ metric, otherwise the priority is 65535 + ifindex. The from lo .. rules
are needed so that traffic from sockets not bound to an IP also is routed
correctly.
* The from lo-rules all have different priorities. When there are
multiple rules with the same priority and same source, the kernel seems to
display undefined behavior. Even though table and priority was specified
when netifd sends DELRULE, it seems random which rule is actually deleted.
I have been testing this patch on my router for the last two days and it behaves
as intended. However, all my WAN-connections are IPv4 and I was only able to
test IPv6 in a small, private network. If anyone has time to check the behavior
in a full IPv6-network, I would be very grateful.
---
interface-ip.c | 108 -
interface-ip.h | 3 +-
iprule.h | 3 ++
proto.c| 6 ++--
system-linux.c | 3 ++
5 files changed, 94 insertions(+), 29 deletions(-)
diff --git a/interface-ip.c b/interface-ip.c
index e265563..05806af 100644
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -90,28 +90,39 @@ match_if_addr(union if_addr *a1, union if_addr *a2, int
mask)
return !memcmp(p1, p2, sizeof(*p1));
}
-static int set_ipv6_source_policy(bool add, const union if_addr *addr, uint8_t
mask, int ifindex)
+static int set_ip_source_policy(bool add, bool v4, unsigned int priority,
+ const union if_addr *addr, uint8_t mask, int ifindex)
{
struct iprule rule = {
- .flags = IPRULE_INET6 | IPRULE_SRC | IPRULE_LOOKUP |
IPRULE_PRIORITY,
- .priority = 65535,
- .lookup = interface_ip_resolve_v6_rtable(ifindex),
+ .flags = IPRULE_SRC | IPRULE_LOOKUP | IPRULE_PRIORITY,
+ .priority = priority,
+ .lookup = interface_ip_resolve_rtable(ifindex),
.src_addr = *addr,
.src_mask = mask,
};
+ if(v4)
+ rule.flags |= IPRULE_INET4;
+ else
+ rule.flags |= IPRULE_INET6;
+
return (add) ? system_add_iprule(rule) : system_del_iprule(rule);
}
-static int set_ipv6_lo_policy(bool add, int ifindex)
+static int set_ip_lo_policy(bool add, bool v4, int ifindex, unsigned int pri)
{
struct iprule rule = {
- .flags = IPRULE_INET6 | IPRULE_IN | IPRULE_LOOKUP |
IPRULE_PRIORITY,
- .priority = 65535,
- .lookup = interface_ip_resolve_v6_rtable(ifindex),
+ .flags = IPRULE_IN | IPRULE_LOOKUP | IPRULE_PRIORITY,
+ .priority = pri,
+ .lookup = interface_ip_resolve_rtable(ifindex),
.in_dev = lo
};
+ if(v4)
+ rule.flags |= IPRULE_INET4;
+ else
+ rule.flags |= IPRULE_INET6;
+
return (add) ? system_add_iprule(rule) : system_del_iprule(rule);
}
@@ -246,7 +257,6 @@ interface_ip_add_route(struct interface *iface, struct
blob_attr *attr, bool v6)
struct blob_attr *tb[__ROUTE_MAX], *cur;
struct device_route *route;
int af = v6 ? AF_INET6 : AF_INET;
- bool is_v6_proto_route = v6 iface;
blobmsg_parse(route_attr, __ROUTE_MAX, tb, blobmsg_data(attr),
blobmsg_data_len(attr));
@@ -300,10 +310,8 @@ interface_ip_add_route(struct interface *iface, struct
blob_attr *attr, bool v6)
}
// Use source-based routing
- if (is_v6_proto_route) {
- route-table =
interface_ip_resolve_v6_rtable(iface-l3_dev.dev-ifindex);
- route-flags |= DEVROUTE_SRCTABLE;
- }
+ route-table = interface_ip_resolve_rtable(iface-l3_dev.dev-ifindex);
+ route-flags |= DEVROUTE_SRCTABLE;
if
[OpenWrt-Devel] [PATCH][packages] Update Samba to 3.6.15
Hello,
This patch updates Samba to 3.6.15 and refreshes its patches.
Download locations also changed (again) so they are also updated.
Compile and run tested, no problems found.
Index: package/network/services/samba36/Makefile
===
--- package/network/services/samba36/Makefile (revision 36617)
+++ package/network/services/samba36/Makefile (working copy)
@@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=samba
-PKG_VERSION:=3.6.11
-PKG_RELEASE:=2
+PKG_VERSION:=3.6.15
+PKG_RELEASE:=1
PKG_SOURCE_URL:=http://ftp.samba.org/pub/samba \
- http://ftp.samba.org/pub/samba/old-versions
+ http://ftp.samba.org/pub/samba/stable
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=9039e0ab3e4fc632ff0a1a8f2433edb4
+PKG_MD5SUM:=d9424e9badb089bd51e6cfc752b21dfa
PKG_LICENSE:=GPLv3
PKG_LICENSE_FILES:=COPYING
Index: package/network/services/samba36/patches/260-remove_samr.patch
===
--- package/network/services/samba36/patches/260-remove_samr.patch
(revision 36617)
+++ package/network/services/samba36/patches/260-remove_samr.patch
(working copy)
@@ -98,7 +98,7 @@
if (!str1 || !str2 || !p) {
return False;
}
-@@ -2541,6 +2545,10 @@ static bool api_NetUserGetGroups(struct
+@@ -2541,6 +2545,10 @@ static bool api_NetUserGetGroups(struct
NTSTATUS status, result;
struct dcerpc_binding_handle *b;
Index: package/network/services/samba36/patches/250-remove_domain_logon.patch
===
--- package/network/services/samba36/patches/250-remove_domain_logon.patch
(revision 36617)
+++ package/network/services/samba36/patches/250-remove_domain_logon.patch
(working copy)
@@ -99,7 +99,7 @@
dfs_commands,
--- a/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
+++ b/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
-@@ -820,6 +820,10 @@ WERROR _wkssvc_NetrJoinDomain2(struct pi
+@@ -824,6 +824,10 @@ WERROR _wkssvc_NetrJoinDomain2(struct pi
WERROR werr;
struct security_token *token = p-session_info-security_token;
@@ -110,7 +110,7 @@
if (!r-in.domain_name) {
return WERR_INVALID_PARAM;
}
-@@ -897,6 +901,10 @@ WERROR _wkssvc_NetrUnjoinDomain2(struct
+@@ -901,6 +905,10 @@ WERROR _wkssvc_NetrUnjoinDomain2(struct
WERROR werr;
struct security_token *token = p-session_info-security_token;
@@ -147,7 +147,7 @@
/* lookup a DC first */
if ( !get_dc_name(domain, NULL, dc_name, dc_ss) ) {
-@@ -243,6 +250,10 @@ NTSTATUS change_trust_account_password(
+@@ -243,6 +250,10 @@ NTSTATUS change_trust_account_password(
struct cli_state *cli = NULL;
struct rpc_pipe_client *netlogon_pipe = NULL;
@@ -172,7 +172,7 @@
}
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
-@@ -2484,8 +2484,10 @@ static bool housekeeping_fn(const struct
+@@ -2431,8 +2431,10 @@ static bool housekeeping_fn(const struct
/* check if we need to reload services */
check_reload(sconn, time_mono(NULL));
Index: package/network/services/samba36/patches/330-librpc_default_print.patch
===
--- package/network/services/samba36/patches/330-librpc_default_print.patch
(revision 36617)
+++ package/network/services/samba36/patches/330-librpc_default_print.patch
(working copy)
@@ -4007,7 +4007,7 @@
},
--- a/source3/librpc/gen_ndr/ndr_ntprinting.c
+++ b/source3/librpc/gen_ndr/ndr_ntprinting.c
-@@ -902,7 +902,7 @@ static const struct ndr_interface_call n
+@@ -914,7 +914,7 @@ static const struct ndr_interface_call n
sizeof(struct decode_ntprinting_form),
(ndr_push_flags_fn_t) ndr_push_decode_ntprinting_form,
(ndr_pull_flags_fn_t) ndr_pull_decode_ntprinting_form,
@@ -4016,7 +4016,7 @@
{ 0, NULL },
{ 0, NULL },
},
-@@ -911,7 +911,7 @@ static const struct ndr_interface_call n
+@@ -923,7 +923,7 @@ static const struct ndr_interface_call n
sizeof(struct decode_ntprinting_driver),
(ndr_push_flags_fn_t) ndr_push_decode_ntprinting_driver,
(ndr_pull_flags_fn_t) ndr_pull_decode_ntprinting_driver,
@@ -4025,7 +4025,7 @@
{ 0, NULL },
{ 0, NULL },
},
-@@ -920,7 +920,7 @@ static const struct ndr_interface_call n
+@@ -932,7 +932,7 @@ static const struct ndr_interface_call n
sizeof(struct decode_ntprinting_printer),
(ndr_push_flags_fn_t) ndr_push_decode_ntprinting_printer,
(ndr_pull_flags_fn_t) ndr_pull_decode_ntprinting_printer,
@@ -5402,7 +5402,7 @@
},
--- a/source3/librpc/gen_ndr/ndr_spoolss.c
+++ b/source3/librpc/gen_ndr/ndr_spoolss.c
-@@ -32660,7 +32660,7 @@ static const struct
[OpenWrt-Devel] Generic Makefile question
Hello all, I was looking at the Makefile in the top dir of OpenWRT and I don't understand the meaning of these lines : $(toolchain/stamp-install): $(tools/stamp-install) $(target/stamp-compile): $(toolchain/stamp-install) $(tools/stamp-install) $(BUILD_DIR)/.prepared $(package/stamp-compile): $(target/stamp-compile) $(package/stamp-cleanup) $(package/stamp-install): $(package/stamp-compile) $(target/stamp-install): $(package/stamp-compile) $(package/stamp-install) I used the top makefile but this is a generic question, where are these variables/target defined ? what I don't understand is if these are target, variables … can someone give me some light ? Thanks, Pietro. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Fwd: [PATCH][include] Update CyaSSL library to last version 2.6.0
Thank you for responding. Below is the diff of the curl Makefile, against that included in the Attitude Adjustment v12.09 packages herehttps://dev.openwrt.org/browser/branches/packages_12.09/libs/curl/Makefile . Note that the addition of -lm to libraries for curl to link to came from my own research in pending OpenWRT issues about compiling curl with cyassl. However, the error about long long size mismatch occurs whether libm.so is included or not. Index: libs/curl/Makefile === --- libs/curl/Makefile(revision 36652) +++ libs/curl/Makefile(working copy) @@ -43,7 +43,7 @@ $(call Package/curl/Default) SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+libopenssl +zlib + DEPENDS:=+libcyassl +zlib TITLE:=A client-side URL transfer library endef @@ -70,7 +70,8 @@ --enable-tftp \ --disable-verbose \ --with-random=/dev/urandom \ ---with-ssl=$(STAGING_DIR)/usr \ +--with-cyassl=$(STAGING_DIR)/usr \ +--without-ssl --without-ca-bundle \ --without-gnutls \ --without-krb4 \ @@ -81,7 +82,7 @@ $(call autoconf_bool,CONFIG_IPV6,ipv6) \ CONFIGURE_VARS += \ -LIBS=-lcrypto -lssl -lz \ +LIBS=-lm -lcyassl -lz \ CC=$(filter-out ccache,$(TARGET_CC)) define Build/Compile On Fri, May 17, 2013 at 2:10 AM, Massimo Vellucci vema...@gmail.com wrote: CyaSSL must determine the environment to recognize the size of the types, there is a conflict on the size of the long type. Can you attach the changes on curl makefile for using CyaSSL ? 2013/5/16 Ben West b...@gowasabi.net Thank you for sharing this patch! I'm trying this very patch to see if I can use cyassl with curl, instead of openssl. (cyassl v1.6.5 is apparently old enough that the current version of curl can no longer use libcyassl.so.) However, my build on ar71xx target fails when libcurl tries to link to libcyassl on the rather esoteric error bad math long / long long settings. Are there platform limitations to the new version of cyassl? OpenWrt-libtool: compile: mips-openwrt-linux-uclibc-gcc -DHAVE_CONFIG_H -I../include/curl -I../include -I../include -I../lib -I../lib -DCURL_HIDDEN_SYMBOLS -isystem /blah/blah/openwrt/staging_dir/target-mips_r2_uClibc-0.9.33.2/usr/include -isystem /blah/blah/openwrt/staging_dir/target-mips_r2_uClibc-0.9.33.2/include -isystem /blah/blah/openwrt/staging_dir/toolchain-mips_r2_gcc-4.7-linaro_uClibc-0.9.33.2/usr/include -isystem /blah/blah/openwrt/staging_dir/toolchain-mips_r2_gcc-4.7-linaro_uClibc-0.9.33.2/include -I/blah/blah/openwrt/staging_dir/target-mips_r2_uClibc-0.9.33.2/usr/include -I/blah/blah/openwrt/staging_dir/target-mips_r2_uClibc-0.9.33.2/usr/include -fvisibility=hidden -Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves -funit-at-a-time -fhonour-copts -Wno-error=unused-but-set-variable -msoft-float -fpic -Wno-system-headers -MT libcurl_la-cyassl.lo -MD -MP -MF .deps/libcurl_la-cyassl.Tpo -c cyassl.c -fPIC -DPIC -o .libs/libcurl_la-cyassl.o In file included from /blah/blah/openwrt/staging_dir/target-mips_r2_uClibc-0.9.33.2/usr/include/cyassl/ctaocrypt/error.h:26:0, from /blah/blah/openwrt/staging_dir/target-mips_r2_uClibc-0.9.33.2/usr/include/cyassl/error.h:26, from cyassl.c:53: /blah/blah/openwrt/staging_dir/target-mips_r2_uClibc-0.9.33.2/usr/include/cyassl/ctaocrypt/types.h:274:6: error: #error bad math long / long long settings /blah/blah/openwrt/staging_dir/target-mips_r2_uClibc-0.9.33.2/usr/include/cyassl/ctaocrypt/types.h:276:1: error: expected identifier before '}' token make[5]: *** [libcurl_la-cyassl.lo] Error 1 The caveat, however, is that I'm trying to compile the newer cyassl for Attitude Adjustment v36608, not trunk. Not sure if that would make a difference for this error. On Sun, May 5, 2013 at 5:50 AM, Massimo Vellucci vema...@gmail.comwrote: Sorry I made a big mistake, I attached the wrong patch. For x86 you need to disable the PIC optimization otherwise you get an error at compile time. diff -r -u a/package/libs/cyassl/Makefile b/package/libs/cyassl/Makefile --- a/package/libs/cyassl/Makefile2013-03-21 08:08:18.0 +0100 +++ b/package/libs/cyassl/Makefile2013-05-05 10:27:06.0+0200 @@ -8,16 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cyassl -PKG_VERSION:=1.6.5 -PKG_RELEASE:=2 +PKG_VERSION:=2.6.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip PKG_SOURCE_URL:=http://www.yassl.com/ -PKG_MD5SUM:=98c2c6350acf1d089756a1de9ccb9903 +PKG_MD5SUM:=9c48fd4ab677c11b4612fb4eb15444d9 -PKG_FIXUP:=patch-libtool PKG_INSTALL:=1 -PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk @@ -37,8 +35,12 @@ TARGET_CFLAGS += $(FPIC) CONFIGURE_ARGS += \ - --without-zlib \ - --enable-singleThreaded + --without-pic \ + --enable-dtls \ + --enable-static \ + --enable-opensslextra \ +
[OpenWrt-Devel] Renaming a package during compilation
Let's say I want to make a package: PKG_NAME:=avr-gcc PKG_VERSION:=1.0 but my source is named gcc PKG_SOURCE:=gcc-$(PACKAGE_VERSION).tar.gz When this source gets uncompressed it gets put into. target_mipsel/avr-gcc/.. The uncompress set goes up a level in directories the source ends up in target_mipsel/gcc-1.0 What is the right way to achieve a rename like this? I need the source in the avr-gcc tree so that I can apply avr specific patches to it. -- Jon Smirl jonsm...@gmail.com ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Renaming a package during compilation
On 05/17/2013 08:48 PM, jonsm...@gmail.com wrote: Let's say I want to make a package: PKG_NAME:=avr-gcc PKG_VERSION:=1.0 but my source is named gcc PKG_SOURCE:=gcc-$(PACKAGE_VERSION).tar.gz When this source gets uncompressed it gets put into. target_mipsel/avr-gcc/.. The uncompress set goes up a level in directories the source ends up in target_mipsel/gcc-1.0 What is the right way to achieve a rename like this? I need the source in the avr-gcc tree so that I can apply avr specific patches to it. You can override the default of PKG_SOURCE_SUBDIR to point it to where the src actually lies after unpacking, which in this case would be: PKG_SOURCE_SUBDIR:=gcc-$(PACKAGE_VERSION) mirko ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Renaming a package during compilation
Has no effect, I must have something slightly wrong since I can see other Makefile using it. include $(TOPDIR)/rules.mk PKG_NAME:=avr-binutils PKG_VERSION:=2.20.1a PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=binutils-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/binutils/ PKG_MD5SUM:= PKG_INSTALL=1 include $(INCLUDE_DIR)/package.mk define Package/avr-binutils CATEGORY:=Development SECTION:=devel TITLE:=avr-binutils URL:=http://www.avr-binutils.org/ DEPENDS:= endef jonsmirl@jonsmirl-VirtualBox:~/openwrt$ make package/avr-binutils/compile V=s Collecting package info: done make[1]: Entering directory `/home/jonsmirl/openwrt' make[2]: Entering directory `/home/jonsmirl/openwrt/package/toolchain' if [ -f /home/jonsmirl/openwrt/staging_dir/target-mipsel_dsp_uClibc-0.9.33.2/pkginfo/toolchain.default.install.clean ]; then rm -f /home/jonsmirl/openwrt/staging_dir/target-mipsel_dsp_uClibc-0.9.33.2/pkginfo/toolchain.default.install /home/jonsmirl/openwrt/staging_dir/target-mipsel_dsp_uClibc-0.9.33.2/pkginfo/toolchain.default.install.clean; fi; echo libc /home/jonsmirl/openwrt/staging_dir/target-mipsel_dsp_uClibc-0.9.33.2/pkginfo/toolchain.default.install if [ -f /home/jonsmirl/openwrt/staging_dir/target-mipsel_dsp_uClibc-0.9.33.2/pkginfo/toolchain.default.install.clean ]; then rm -f /home/jonsmirl/openwrt/staging_dir/target-mipsel_dsp_uClibc-0.9.33.2/pkginfo/toolchain.default.install /home/jonsmirl/openwrt/staging_dir/target-mipsel_dsp_uClibc-0.9.33.2/pkginfo/toolchain.default.install.clean; fi; echo libgcc /home/jonsmirl/openwrt/staging_dir/target-mipsel_dsp_uClibc-0.9.33.2/pkginfo/toolchain.default.install WARNING: skipping libssp -- package not selected WARNING: skipping libstdcpp -- package not selected WARNING: skipping libthread-db -- package not selected WARNING: skipping libgfortran -- package not selected WARNING: skipping ldd -- package not selected WARNING: skipping ldconfig -- package not selected make[2]: Leaving directory `/home/jonsmirl/openwrt/package/toolchain' make[2]: Entering directory `/home/jonsmirl/openwrt/feeds/packages/devel/avr-binutils' . /home/jonsmirl/openwrt/include/shell.sh; bzcat /home/jonsmirl/openwrt/dl/binutils-2.20.1a.tar.bz2 | /bin/tar -C /home/jonsmirl/openwrt/build_dir/target-mipsel_dsp_uClibc-0.9.33.2/avr-binutils-2.20.1a/.. -xf - touch /home/jonsmirl/openwrt/build_dir/target-mipsel_dsp_uClibc-0.9.33.2/avr-binutils-2.20.1a/.prepared_66d5841369295208e0fe5ac792688489 (cd /home/jonsmirl/openwrt/build_dir/target-mipsel_dsp_uClibc-0.9.33.2/avr-binutils-2.20.1a; rm -f config.cache; SHELL=/bin/bash /home/jonsmirl/openwrt/build_dir/target-mipsel_dsp_uClibc-0.9.33.2/avr-binutils-2.20.1a/configure --build=i686-linux-gnu --host=mipsel --targe./bin/ramips/packagest=avr --prefix=/usr --disable-static --with-gnu-ld --with-gnu-as --enable-install-libbfd --with-dwarf2 ); bash: /home/jonsmirl/openwrt/build_dir/target-mipsel_dsp_uClibc-0.9.33.2/avr-binutils-2.20.1a/configure: No such file or directory make[2]: *** [/home/jonsmirl/openwrt/build_dir/target-mipsel_dsp_uClibc-0.9.33.2/avr-binutils-2.20.1a/.configured_] Error 127 make[2]: Leaving directory `/home/jonsmirl/openwrt/feeds/packages/devel/avr-binutils' make[1]: *** [package/feeds/packages/avr-binutils/compile] Error 2 make[1]: Leaving directory `/home/jonsmirl/openwrt' make: *** [package/avr-binutils/compile] Error 2 jonsmirl@jonsmirl-VirtualBox:~/openwrt$ On Fri, May 17, 2013 at 3:04 PM, Mirko Vogt mi...@openwrt.org wrote: On 05/17/2013 08:48 PM, jonsm...@gmail.com wrote: Let's say I want to make a package: PKG_NAME:=avr-gcc PKG_VERSION:=1.0 but my source is named gcc PKG_SOURCE:=gcc-$(PACKAGE_VERSION).tar.gz When this source gets uncompressed it gets put into. target_mipsel/avr-gcc/.. The uncompress set goes up a level in directories the source ends up in target_mipsel/gcc-1.0 What is the right way to achieve a rename like this? I need the source in the avr-gcc tree so that I can apply avr specific patches to it. You can override the default of PKG_SOURCE_SUBDIR to point it to where the src actually lies after unpacking, which in this case would be: PKG_SOURCE_SUBDIR:=gcc-$(PACKAGE_VERSION) mirko ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel -- Jon Smirl jonsm...@gmail.com ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
