date:20150916

Re: [OpenWrt-Devel] [PATCH v2] opkg: Extend 'opkg list' command to optionally display package size

2015-09-16 Thread John Crispin

see inline ...

On 16/09/2015 10:09, Hannu Nyman wrote:
> 'opkg list' command only displays the available packages' name, version and 
> description. It would be useful to also see the approximate size of the
> available package.
> 
> This patch extends "opkg list" command with "--size" to optionally show also 
> the *.ipk size.
> * Default behaviour is to list the available packages as earlier: 
>   "name - version - description"
> * with "--size" the output of is "name - version - size - description".
> 
> Signed-off-by: Hannu Nyman 
> 
> ---
> Patch v2: bump opkg PKG_RELEASE and rebase
> 
> This patch superseeds https://patchwork.ozlabs.org/patch/512231/
> 
> Example:
> root@OpenWrt:~# opkg list kr*
> krb5-client - 1.13.1-1 - Kerberos 5 Client
> krb5-libs - 1.13.1-1 - Kerberos 5 Shared Libraries
> krb5-server - 1.13.1-1 - Kerberos 5 Server
> 
> root@OpenWrt:~# opkg list --size kr*
> krb5-client - 1.13.1-1 - 37297 - Kerberos 5 Client
> krb5-libs - 1.13.1-1 - 667427 - Kerberos 5 Shared Libraries
> krb5-server - 1.13.1-1 - 122460 - Kerberos 5 Server
> 
> Example implementation that utilises this opkg change to show the 
> .ipk size to the user in GUI:
> https://github.com/openwrt/luci/issues/19#issuecomment-136397807
> 
> 
> 
> Index: package/system/opkg/Makefile
> ===
> --- package/system/opkg/Makefile  (revision 46946)
> +++ package/system/opkg/Makefile  (working copy)

^^^ this is against the wrong base and git am does not apply it because
of that. how did you generate the patch ?



> @@ -12,7 +12,7 @@
>  PKG_NAME:=opkg
>  PKG_REV:=9c97d5ecd795709c8584e972bfdf3aee3a5b846d
>  PKG_VERSION:=$(PKG_REV)
> -PKG_RELEASE:=9
> +PKG_RELEASE:=10
>  
>  PKG_SOURCE_PROTO:=git
>  PKG_SOURCE_VERSION:=$(PKG_REV)
> Index: package/system/opkg/patches/250-add-print-package-size.patch
> ===
> --- package/system/opkg/patches/250-add-print-package-size.patch  
> (revision 0)
> +++ package/system/opkg/patches/250-add-print-package-size.patch  
> (working copy)
> @@ -0,0 +1,74 @@
> +--- a/libopkg/opkg_conf.c
>  b/libopkg/opkg_conf.c
> +@@ -69,6 +69,7 @@ opkg_option_t options[] = {
> +   { "proxy_passwd", OPKG_OPT_TYPE_STRING, &_conf.proxy_passwd },
> +   { "proxy_user", OPKG_OPT_TYPE_STRING, &_conf.proxy_user },
> +   { "query-all", OPKG_OPT_TYPE_BOOL, &_conf.query_all },
> ++  { "size", OPKG_OPT_TYPE_BOOL, &_conf.size },
> +   { "tmp_dir", OPKG_OPT_TYPE_STRING, &_conf.tmp_dir },
> +   { "verbosity", OPKG_OPT_TYPE_INT, &_conf.verbosity },
> + #if defined(HAVE_OPENSSL)
> +--- a/libopkg/opkg_conf.h
>  b/libopkg/opkg_conf.h
> +@@ -88,6 +88,7 @@ struct opkg_conf
> +  int query_all;
> +  int verbosity;
> +  int noaction;
> ++ int size;
> +  int download_only;
> +  char *cache;
> + 
> +--- a/src/opkg-cl.c
>  b/src/opkg-cl.c
> +@@ -52,6 +52,7 @@ enum {
> + ARGS_OPT_AUTOREMOVE,
> + ARGS_OPT_CACHE,
> + ARGS_OPT_FORCE_SIGNATURE,
> ++ARGS_OPT_SIZE,
> + };
> + 
> + static struct option long_options[] = {
> +@@ -98,6 +99,7 @@ static struct option long_options[] = {
> + {"offline-root", 1, 0, 'o'},
> + {"add-arch", 1, 0, ARGS_OPT_ADD_ARCH},
> + {"add-dest", 1, 0, ARGS_OPT_ADD_DEST},
> ++{"size", 0, 0, ARGS_OPT_SIZE},
> + {"test", 0, 0, ARGS_OPT_NOACTION},
> + {"tmp-dir", 1, 0, 't'},
> + {"tmp_dir", 1, 0, 't'},
> +@@ -212,6 +214,9 @@ args_parse(int argc, char *argv[])
> + }
> + free(tuple);
> + break;
> ++case ARGS_OPT_SIZE:
> ++conf->size = 1;
> ++break;
> + case ARGS_OPT_NOACTION:
> + conf->noaction = 1;
> + break;
> +@@ -315,6 +320,7 @@ usage()
> + printf("\t--download-only   No action -- download only\n");
> + printf("\t--nodeps  Do not follow dependencies\n");
> + printf("\t--nocase  Perform case insensitive pattern 
> matching\n");
> ++printf("\t--sizePrint package size when listing 
> available packages\n");
> + printf("\t--force-removal-of-dependent-packages\n");
> + printf("\t  Remove package and all dependencies\n");
> + printf("\t--autoremove  Remove packages that were installed\n");
> +--- a/libopkg/opkg_cmd.c
>  b/libopkg/opkg_cmd.c
> +@@ -47,10 +47,12 @@ static void
> + print_pkg(pkg_t *pkg)
> + {
> + char *version = pkg_version_str_alloc(pkg);
> ++printf("%s - %s", pkg->name, version);
> ++if (conf->size)
> ++printf(" - %lu", pkg->size);
> + if (pkg->description)
> +-printf("%s - %s - %s\n", pkg->name, version, pkg->description);
> +-else
> +-printf("%s - %s\n", pkg->name, version);
> ++printf(" - %s", pkg->description);
>

Re: [OpenWrt-Devel] [PATCH v2] opkg: Extend 'opkg list' command to optionally display package size

2015-09-16 Thread John Crispin



On 16/09/2015 10:22, Hannu Nyman wrote:
> On 16.9.2015 11:18, John Crispin wrote:
>> see inline ...
>>
>> On 16/09/2015 10:09, Hannu Nyman wrote:
>>> Index: package/system/opkg/Makefile
>>> ===
>>> --- package/system/opkg/Makefile(revision 46946)
>>> +++ package/system/opkg/Makefile(working copy)
>> ^^^ this is against the wrong base and git am does not apply it because
>> of that. how did you generate the patch ?
>>
>>
> 
> perus@vb1504:/Openwrt/trunk$ svn diff package/system/opkg/ > opkg.patch

please dont remove the CC to the ML a very annoying habit.

once you send a patch that git am can apply i will merge it
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH v2] opkg: Extend 'opkg list' command to optionally display package size

2015-09-16 Thread Hannu Nyman

'opkg list' command only displays the available packages' name, version and 
description. It would be useful to also see the approximate size of the
available package.

This patch extends "opkg list" command with "--size" to optionally show also 
the *.ipk size.
* Default behaviour is to list the available packages as earlier: 
  "name - version - description"
* with "--size" the output of is "name - version - size - description".

Signed-off-by: Hannu Nyman 

---
Patch v2: bump opkg PKG_RELEASE and rebase

This patch superseeds https://patchwork.ozlabs.org/patch/512231/

Example:
root@OpenWrt:~# opkg list kr*
krb5-client - 1.13.1-1 - Kerberos 5 Client
krb5-libs - 1.13.1-1 - Kerberos 5 Shared Libraries
krb5-server - 1.13.1-1 - Kerberos 5 Server

root@OpenWrt:~# opkg list --size kr*
krb5-client - 1.13.1-1 - 37297 - Kerberos 5 Client
krb5-libs - 1.13.1-1 - 667427 - Kerberos 5 Shared Libraries
krb5-server - 1.13.1-1 - 122460 - Kerberos 5 Server

Example implementation that utilises this opkg change to show the 
.ipk size to the user in GUI:
https://github.com/openwrt/luci/issues/19#issuecomment-136397807



Index: package/system/opkg/Makefile
===
--- package/system/opkg/Makefile(revision 46946)
+++ package/system/opkg/Makefile(working copy)
@@ -12,7 +12,7 @@
 PKG_NAME:=opkg
 PKG_REV:=9c97d5ecd795709c8584e972bfdf3aee3a5b846d
 PKG_VERSION:=$(PKG_REV)
-PKG_RELEASE:=9
+PKG_RELEASE:=10
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=$(PKG_REV)
Index: package/system/opkg/patches/250-add-print-package-size.patch
===
--- package/system/opkg/patches/250-add-print-package-size.patch
(revision 0)
+++ package/system/opkg/patches/250-add-print-package-size.patch
(working copy)
@@ -0,0 +1,74 @@
+--- a/libopkg/opkg_conf.c
 b/libopkg/opkg_conf.c
+@@ -69,6 +69,7 @@ opkg_option_t options[] = {
+ { "proxy_passwd", OPKG_OPT_TYPE_STRING, &_conf.proxy_passwd },
+ { "proxy_user", OPKG_OPT_TYPE_STRING, &_conf.proxy_user },
+ { "query-all", OPKG_OPT_TYPE_BOOL, &_conf.query_all },
++{ "size", OPKG_OPT_TYPE_BOOL, &_conf.size },
+ { "tmp_dir", OPKG_OPT_TYPE_STRING, &_conf.tmp_dir },
+ { "verbosity", OPKG_OPT_TYPE_INT, &_conf.verbosity },
+ #if defined(HAVE_OPENSSL)
+--- a/libopkg/opkg_conf.h
 b/libopkg/opkg_conf.h
+@@ -88,6 +88,7 @@ struct opkg_conf
+  int query_all;
+  int verbosity;
+  int noaction;
++ int size;
+  int download_only;
+  char *cache;
+ 
+--- a/src/opkg-cl.c
 b/src/opkg-cl.c
+@@ -52,6 +52,7 @@ enum {
+   ARGS_OPT_AUTOREMOVE,
+   ARGS_OPT_CACHE,
+   ARGS_OPT_FORCE_SIGNATURE,
++  ARGS_OPT_SIZE,
+ };
+ 
+ static struct option long_options[] = {
+@@ -98,6 +99,7 @@ static struct option long_options[] = {
+   {"offline-root", 1, 0, 'o'},
+   {"add-arch", 1, 0, ARGS_OPT_ADD_ARCH},
+   {"add-dest", 1, 0, ARGS_OPT_ADD_DEST},
++  {"size", 0, 0, ARGS_OPT_SIZE},
+   {"test", 0, 0, ARGS_OPT_NOACTION},
+   {"tmp-dir", 1, 0, 't'},
+   {"tmp_dir", 1, 0, 't'},
+@@ -212,6 +214,9 @@ args_parse(int argc, char *argv[])
+   }
+   free(tuple);
+   break;
++  case ARGS_OPT_SIZE:
++  conf->size = 1;
++  break;
+   case ARGS_OPT_NOACTION:
+   conf->noaction = 1;
+   break;
+@@ -315,6 +320,7 @@ usage()
+   printf("\t--download-only   No action -- download only\n");
+   printf("\t--nodeps  Do not follow dependencies\n");
+   printf("\t--nocase  Perform case insensitive pattern 
matching\n");
++  printf("\t--sizePrint package size when listing 
available packages\n");
+   printf("\t--force-removal-of-dependent-packages\n");
+   printf("\t  Remove package and all dependencies\n");
+   printf("\t--autoremove  Remove packages that were installed\n");
+--- a/libopkg/opkg_cmd.c
 b/libopkg/opkg_cmd.c
+@@ -47,10 +47,12 @@ static void
+ print_pkg(pkg_t *pkg)
+ {
+   char *version = pkg_version_str_alloc(pkg);
++  printf("%s - %s", pkg->name, version);
++  if (conf->size)
++  printf(" - %lu", pkg->size);
+   if (pkg->description)
+-  printf("%s - %s - %s\n", pkg->name, version, pkg->description);
+-  else
+-  printf("%s - %s\n", pkg->name, version);
++  printf(" - %s", pkg->description);
++  printf("\n");
+   free(version);
+ }
+ 
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH 2/3] mac80211: cleanup sort

2015-09-16 Thread Dirk Neukirchen

Signed-off-by: Dirk Neukirchen 
---
 package/kernel/mac80211/Makefile | 2115 +++---
 1 file changed, 1071 insertions(+), 1044 deletions(-)

diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index 75a43dc..fa253f4 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -23,15 +23,28 @@ PKG_BUILD_PARALLEL:=1
 PKG_MAINTAINER:=Felix Fietkau 
 
 PKG_DRIVERS = \
-   adm8211 ath5k libertas-usb libertas-sdio p54-common p54-pci p54-usb 
p54-spi \
-   rt2x00-lib rt2x00-pci rt2x00-usb rt2800-lib rt2400-pci rt2500-pci \
-   rt2500-usb rt61-pci rt73-usb rt2800-mmio rt2800-pci rt2800-usb 
rt2800-soc \
-   rtl8180 rtl8187 zd1211rw mac80211-hwsim carl9170 b43 b43legacy \
-   ath9k-common ath9k ath9k-htc ath10k ath libipw ipw2100 ipw2200 \
-   mwl8k mwifiex-pcie hermes hermes-pci hermes-plx hermes-pcmcia \
-   iwl-legacy iwl3945 iwl4965 iwlagn wlcore wl12xx wl18xx lib80211 \
+   adm8211 \
+   ath ath5k ath9k ath9k-common ath9k-htc ath10k \
+   b43 b43legacy \
+   carl9170 \
+   hermes hermes-pci hermes-pcmcia hermes-plx\
+   iwl-legacy iwl3945 iwl4965 iwlagn \
+   lib80211 \
+   libipw ipw2100 ipw2200 \
+   libertas-sdio libertas-usb \
+   mac80211-hwsim \
+   mt7601u \
+   mwl8k mwifiex-pcie \
+   p54-common p54-pci p54-spi p54-usb \
+   rt2x00-lib rt2x00-pci rt2x00-usb \
+   rt2400-pci rt2500-pci rt2500-usb \
+   rt2800-lib rt2800-mmio rt2800-pci rt2800-soc rt2800-usb \
+   rt61-pci rt73-usb \
+   rtl8180 rtl8187 \
rtlwifi rtlwifi-pci rtlwifi-usb rtl8192c-common rtl8192ce rtl8192se \
-   rtl8192de rtl8192cu mt7601u
+   rtl8192de rtl8192cu \
+   wlcore wl12xx wl18xx \
+   zd1211rw
 
 PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_kmod-mac80211 \
@@ -126,369 +139,6 @@ define Download/linux-firmware
 endef
 $(eval $(call Download,linux-firmware))
 
-PKG_ATH10K_LINUX_FIRMWARE_NAME:=ath10k-firmware
-PKG_ATH10K_LINUX_FIRMWARE_VERSION:=b46f3e01a6c1f9150fb4612ef53611d714565842
-PKG_ATH10K_LINUX_FIRMWARE_SOURCE:=$(PKG_ATH10K_LINUX_FIRMWARE_NAME)-$(PKG_ATH10K_LINUX_FIRMWARE_VERSION).tar.bz2
-PKG_ATH10K_LINUX_FIRMWARE_PROTO:=git
-PKG_ATH10K_LINUX_FIRMWARE_SOURCE_URL:=https://github.com/kvalo/ath10k-firmware.git
-PKG_ATH10K_LINUX_FIRMWARE_SUBDIR:=$(PKG_ATH10K_LINUX_FIRMWARE_NAME)-$(PKG_ATH10K_LINUX_FIRMWARE_VERSION)
-#PKG_ATH10K_LINUX_FIRMWARE_MIRROR_MD5SUM:=?
-
-define Download/ath10k-firmware
-  FILE:=$(PKG_ATH10K_LINUX_FIRMWARE_SOURCE)
-  URL:=$(PKG_ATH10K_LINUX_FIRMWARE_SOURCE_URL)
-  PROTO:=$(PKG_ATH10K_LINUX_FIRMWARE_PROTO)
-  VERSION:=$(PKG_ATH10K_LINUX_FIRMWARE_VERSION)
-  SUBDIR:=$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)
-  #MIRROR_MD5SUM:=$(PKG_ATH10K_LINUX_FIRMWARE_MIRROR_MD5SUM)
-endef
-$(eval $(call Download,ath10k-firmware))
-
-# Prism54 drivers
-P54PCIFW:=2.13.12.0.arm
-P54USBFW:=2.13.24.0.lm87.arm
-P54SPIFW:=2.13.0.0.a.13.14.arm
-
-define Download/p54usb
-  FILE:=$(P54USBFW)
-  URL:=http://daemonizer.de/prism54/prism54-fw/fw-usb
-  MD5SUM:=8e8ab005a4f8f0123bcdc51bc25b47f6
-endef
-$(eval $(call Download,p54usb))
-
-define Download/p54pci
-  FILE:=$(P54PCIFW)
-  URL:=http://daemonizer.de/prism54/prism54-fw/fw-softmac
-  MD5SUM:=ff7536af2092b1c4b21315bd103ef4c4
-endef
-$(eval $(call Download,p54pci))
-
-define Download/p54spi
-  FILE:=$(P54SPIFW)
-  URL:=http://daemonizer.de/prism54/prism54-fw/stlc4560
-  MD5SUM:=42661f8ecbadd88012807493f596081d
-endef
-$(eval $(call Download,p54spi))
-
-define KernelPackage/p54/Default
-  $(call KernelPackage/mac80211/Default)
-  TITLE:=Prism54 Drivers
-endef
-
-define KernelPackage/p54/description
-  Kernel module for Prism54 chipsets (mac80211)
-endef
-
-define KernelPackage/p54-common
-  $(call KernelPackage/p54/Default)
-  DEPENDS+= @PCI_SUPPORT||@USB_SUPPORT||@TARGET_omap24xx +kmod-mac80211 
+kmod-lib-crc-ccitt
-  TITLE+= (COMMON)
-  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/p54/p54common.ko
-endef
-
-define KernelPackage/p54-pci
-  $(call KernelPackage/p54/Default)
-  TITLE+= (PCI)
-  DEPENDS+= @PCI_SUPPORT +kmod-p54-common
-  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/p54/p54pci.ko
-  AUTOLOAD:=$(call AutoProbe,p54pci)
-endef
-
-define KernelPackage/p54-usb
-  $(call KernelPackage/p54/Default)
-  TITLE+= (USB)
-  DEPENDS+= @USB_SUPPORT +kmod-usb-core +kmod-p54-common
-  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/p54/p54usb.ko
-  AUTOLOAD:=$(call AutoProbe,p54usb)
-endef
-
-define KernelPackage/p54-spi
-  $(call KernelPackage/p54/Default)
-  TITLE+= (SPI)
-  DEPENDS+= @TARGET_omap24xx +kmod-p54-common
-  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/p54/p54spi.ko
-  AUTOLOAD:=$(call AutoProbe,p54spi)
-endef
-
-define KernelPackage/rt2x00/Default
-  $(call KernelPackage/mac80211/Default)
-  TITLE:=Ralink Drivers for RT2x00 cards
-endef
-
-define KernelPackage/rt2x00-lib
-$(call KernelPackage/rt2x00/Default)
-  DEPENDS+=

[OpenWrt-Devel] [PATCH 1/3] mac80211: cleanup remove net prefixes

2015-09-16 Thread Dirk Neukirchen

Signed-off-by: Dirk Neukirchen 
---
 package/kernel/mac80211/Makefile | 82 
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index a56825f..75a43dc 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -27,8 +27,8 @@ PKG_DRIVERS = \
rt2x00-lib rt2x00-pci rt2x00-usb rt2800-lib rt2400-pci rt2500-pci \
rt2500-usb rt61-pci rt73-usb rt2800-mmio rt2800-pci rt2800-usb 
rt2800-soc \
rtl8180 rtl8187 zd1211rw mac80211-hwsim carl9170 b43 b43legacy \
-   ath9k-common ath9k ath9k-htc ath10k ath net-libipw net-ipw2100 
net-ipw2200 \
-   mwl8k mwifiex-pcie net-hermes net-hermes-pci net-hermes-plx 
net-hermes-pcmcia \
+   ath9k-common ath9k ath9k-htc ath10k ath libipw ipw2100 ipw2200 \
+   mwl8k mwifiex-pcie hermes hermes-pci hermes-plx hermes-pcmcia \
iwl-legacy iwl3945 iwl4965 iwlagn wlcore wl12xx wl18xx lib80211 \
rtlwifi rtlwifi-pci rtlwifi-usb rtl8192c-common rtl8192ce rtl8192se \
rtl8192de rtl8192cu mt7601u
@@ -716,7 +716,7 @@ define KernelPackage/mt7601u
   AUTOLOAD:=$(call AutoProbe,mt7601)
 endef
 
-define KernelPackage/net-libipw
+define KernelPackage/libipw
   $(call KernelPackage/mac80211/Default)
   TITLE:=libipw for ipw2100 and ipw2200
   DEPENDS:=@PCI_SUPPORT +kmod-crypto-michael-mic +kmod-lib80211 +kmod-cfg80211 
+@DRIVER_WEXT_SUPPORT @!BIG_ENDIAN
@@ -724,29 +724,29 @@ define KernelPackage/net-libipw
   AUTOLOAD:=$(call AutoProbe,libipw)
 endef
 
-define KernelPackage/net-libipw/description
+define KernelPackage/libipw/description
  Hardware independent IEEE 802.11 networking stack for ipw2100 and ipw2200.
 endef
 
 IPW2100_NAME:=ipw2100-fw
 IPW2100_VERSION:=1.3
 
-define Download/net-ipw2100
+define Download/ipw2100
   URL:=http://bughost.org/firmware/
   FILE:=$(IPW2100_NAME)-$(IPW2100_VERSION).tgz
   MD5SUM=46aa75bcda1a00efa841f9707bbbd113
 endef
-$(eval $(call Download,net-ipw2100))
+$(eval $(call Download,ipw2100))
 
-define KernelPackage/net-ipw2100
+define KernelPackage/ipw2100
   $(call KernelPackage/mac80211/Default)
   TITLE:=Intel IPW2100 driver
-  DEPENDS:=@PCI_SUPPORT +kmod-net-libipw
+  DEPENDS:=@PCI_SUPPORT +kmod-libipw
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ipw2x00/ipw2100.ko
   AUTOLOAD:=$(call AutoProbe,ipw2100)
 endef
 
-define KernelPackage/net-ipw2100/description
+define KernelPackage/ipw2100/description
  Kernel support for Intel IPW2100
  Includes:
  - ipw2100
@@ -755,29 +755,29 @@ endef
 IPW2200_NAME:=ipw2200-fw
 IPW2200_VERSION:=3.1
 
-define Download/net-ipw2200
+define Download/ipw2200
   URL:=http://bughost.org/firmware/
   FILE:=$(IPW2200_NAME)-$(IPW2200_VERSION).tgz
   MD5SUM=eaba788643c7cc7483dd67ace70f6e99
 endef
-$(eval $(call Download,net-ipw2200))
+$(eval $(call Download,ipw2200))
 
-define KernelPackage/net-ipw2200
+define KernelPackage/ipw2200
   $(call KernelPackage/mac80211/Default)
   TITLE:=Intel IPW2200 driver
-  DEPENDS:=@PCI_SUPPORT +kmod-net-libipw
+  DEPENDS:=@PCI_SUPPORT +kmod-libipw
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ipw2x00/ipw2200.ko
   AUTOLOAD:=$(call AutoProbe,ipw2200)
 endef
 
-define KernelPackage/net-ipw2200/description
+define KernelPackage/ipw2200/description
  Kernel support for Intel IPW2200
  Includes:
  - ipw2200
 endef
 
 
-define KernelPackage/net-hermes
+define KernelPackage/hermes
   $(call KernelPackage/mac80211/Default)
   TITLE:=Hermes 802.11b chipset support
   DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT
@@ -785,43 +785,43 @@ define KernelPackage/net-hermes
   AUTOLOAD:=$(call AutoProbe,orinoco)
 endef
 
-define KernelPackage/net-hermes/description
+define KernelPackage/hermes/description
  Kernel support for Hermes 802.11b chipsets
 endef
 
-define KernelPackage/net-hermes-pci
+define KernelPackage/hermes-pci
   $(call KernelPackage/mac80211/Default)
   TITLE:=Intersil Prism 2.5 PCI support
-  DEPENDS:=@PCI_SUPPORT +kmod-net-hermes
+  DEPENDS:=@PCI_SUPPORT +kmod-hermes
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco_pci.ko
   AUTOLOAD:=$(call AutoProbe,orinoco_pci)
 endef
 
-define KernelPackage/net-hermes-pci/description
+define KernelPackage/hermes-pci/description
  Kernel modules for Intersil Prism 2.5 PCI support
 endef
 
-define KernelPackage/net-hermes-plx
+define KernelPackage/hermes-plx
   $(call KernelPackage/mac80211/Default)
   TITLE:=PLX9052 based PCI adaptor
-  DEPENDS:=@PCI_SUPPORT +kmod-net-hermes
+  DEPENDS:=@PCI_SUPPORT +kmod-hermes
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco_plx.ko
   AUTOLOAD:=$(call AutoProbe,orinoco_plx)
 endef
 
-define KernelPackage/net-hermes-plx/description
+define KernelPackage/hermes-plx/description
  Kernel modules for Hermes in PLX9052 based PCI adaptors
 endef
 
-define KernelPackage/net-hermes-pcmcia
+define KernelPackage/hermes-pcmcia
   $(call

[OpenWrt-Devel] [PATCH 3/3] mac80211: rename iwlagn to iwlwifi

2015-09-16 Thread Dirk Neukirchen

follow upstream module rename
commit 3c607d27c818cf4a5d28f2c73b18a88f8fbdfa33

Signed-off-by: Dirk Neukirchen 
---
 package/kernel/mac80211/Makefile | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index fa253f4..70a5ad0 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -28,7 +28,7 @@ PKG_DRIVERS = \
b43 b43legacy \
carl9170 \
hermes hermes-pci hermes-pcmcia hermes-plx\
-   iwl-legacy iwl3945 iwl4965 iwlagn \
+   iwl-legacy iwl3945 iwl4965 iwlwifi \
lib80211 \
libipw ipw2100 ipw2200 \
libertas-sdio libertas-usb \
@@ -841,7 +841,7 @@ define KernelPackage/hermes-pcmcia/description
 endef
 
 
-define KernelPackage/iwlagn
+define KernelPackage/iwlwifi
   $(call KernelPackage/mac80211/Default)
   DEPENDS:= +kmod-mac80211 @PCI_SUPPORT +@DRIVER_11N_SUPPORT
   TITLE:=Intel AGN Wireless support
@@ -853,8 +853,8 @@ define KernelPackage/iwlagn
   MENU:=1
 endef
 
-define KernelPackage/iwlagn/description
- iwlagn kernel module for
+define KernelPackage/iwlwifi/description
+ iwlwifi kernel module for
  Intel Wireless WiFi Link 6250AGN Adapter
  Intel 6000 Series Wi-Fi Adapters (6200AGN and 6300AGN)
  Intel WiFi Link 1000BGN
@@ -872,11 +872,11 @@ define KernelPackage/iwlagn/description
  Intel 3165 Wi-Fi Adapter
 endef
 
-define KernelPackage/iwlagn/config
-  if PACKAGE_kmod-iwlagn
+define KernelPackage/iwlwifi/config
+  if PACKAGE_kmod-iwlwifi
 
config PACKAGE_IWLWIFI_DEBUG
-   bool "Enable full debugging output in the iwlagn driver"
+   bool "Enable full debugging output in the iwlwifi driver"
default n
help
  This option will enable debug tracing output for the iwlwifi 
drivers
@@ -1725,7 +1725,7 @@ config-y += RT2800USB_RT33XX RT2800USB_RT35XX 
RT2800USB_RT3573 RT2800USB_RT53XX
 config-$(call config_package,iwl-legacy) += IWLEGACY
 config-$(call config_package,iwl3945) += IWL3945
 config-$(call config_package,iwl4965) += IWL4965
-config-$(call config_package,iwlagn) += IWLWIFI IWLDVM IWLMVM
+config-$(call config_package,iwlwifi) += IWLWIFI IWLDVM IWLMVM
 config-$(CONFIG_PACKAGE_IWLWIFI_DEBUG)+= IWLWIFI_DEBUG
 config-$(CONFIG_PACKAGE_IWLWIFI_DEBUGFS)+= IWLWIFI_DEBUGFS
 
@@ -1959,7 +1959,7 @@ define KernelPackage/ipw2200/install
$(INSTALL_DATA) 
$(PKG_BUILD_DIR)/$(IPW2200_NAME)-$(IPW2200_VERSION)/ipw2200*.fw 
$(1)/lib/firmware
 endef
 
-define KernelPackage/iwlagn/install
+define KernelPackage/iwlwifi/install
$(INSTALL_DIR) $(1)/lib/firmware
 ifneq ($(CONFIG_IWL100_FW),)
$(INSTALL_DATA) 
$(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-100-5.ucode 
$(1)/lib/firmware
@@ -2154,7 +2154,7 @@ $(eval $(call KernelPackage,hermes))
 $(eval $(call KernelPackage,hermes-pci))
 $(eval $(call KernelPackage,hermes-plx))
 $(eval $(call KernelPackage,hermes-pcmcia))
-$(eval $(call KernelPackage,iwlagn))
+$(eval $(call KernelPackage,iwlwifi))
 $(eval $(call KernelPackage,iwl-legacy))
 $(eval $(call KernelPackage,iwl4965))
 $(eval $(call KernelPackage,iwl3945))
-- 
2.5.2
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] OpenWrt /etc/hotplug.d/button/00-wps

2015-09-16 Thread Bastian Bittorf

* John kerry  [16.09.2015 11:32]:
> even i checked on http://www.shellcheck.net/ , its not giving any feedback,
> it seems correct but still its not working.

add 1 line on top of your script for debugging:

set | logger

and check with 'logread -f' the output when you press the button.

bye, bastian
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH procd] move /dev/shm to /tmp/shm

2015-09-16 Thread John Crispin



On 15/09/2015 17:05, Daniel Gimpelevich wrote:
> I see procd got an update. Any reason this patch was left out?
> 
> On Fri, 2015-09-11 at 13:05 -0700, Daniel Gimpelevich wrote:
>> Is there an ETA for merging this?
>>
>> On Sun, 2015-07-19 at 19:14 -0700, Daniel Gimpelevich wrote:
>>> I'm intending for this fix to be backported to CC as well.
>>>
>>> On Tue, 2015-07-14 at 09:59 -0700, Daniel Gimpelevich wrote:
 OpenSSL session caches create shared memory segments that appear as
 files under /dev/shm. If there is not enough room there, execution
 terminates with SIGBUS upon access. Even a single instance would
 exceed
 512K.

 On Tue, 2015-07-14 at 11:50 +0200, John Crispin wrote:
> what kind of usage do you expect ?
>
> On 11/07/2015 03:58, Daniel Gimpelevich wrote:
>> Since the /dev filesystem is tiny, /dev/shm needs to live
 somewhere
>> else.


Hi,

there was no ... ah wait its a trap ... you were just impatient. i was
working on the release and after that i started working through patchwork.

John
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH 4/6] generic: fix unrecognized opcode wsbh when building for MIPS16.

2015-09-16 Thread John Crispin



On 01/09/2015 14:14, Yousong Zhou wrote:
> The issue was found and reported by hynman [1] when compiling reaver for 
> ar71xx
> (Big Endian MIPS).
> 
> {standard input}: Assembler messages:
> {standard input}:79: Error: unrecognized opcode `wsbh $2,$2'
> {standard input}:90: Error: unrecognized opcode `wsbh $3,$17'
> {standard input}:208: Error: unrecognized opcode `wsbh $2,$2'
> make[3]: *** [builder.o] Error 1
> 
>  [1] 
> https://github.com/openwrt/packages/commit/1e29676a8ac74f797f8ca799364681cec575ae6f#commitcomment-12901931
> 

Hi,

in accordance with the dicussion on the lmo mailing list i will close
these as rejected and wait for the alternate fix to be accepted upstream
so that we can backport it.

John
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH] opkg: Extend 'opkg list' command to optionally display package size

2015-09-16 Thread John Crispin



On 30/08/2015 16:37, Hannu Nyman wrote:
> 'opkg list' command only displays the available packages' name, version
> and description.
> It would be useful to also see the approximate size of the available
> package.
> 
> This patch extends "opkg list" command with "--size" to optionally show
> also the *.ipk size in the listing.
> * Default behaviour is to print the list of available packages as
> earlier: "name - version - description"
> * with "--size" the output of is "name - version - size - description".
> 
> All current functionality should continue working without any change.
> Luci might be extended to utilize the new options to e.g. answer
> https://github.com/openwrt/luci/issues/19
> 
> Signed-off-by: Hannu Nyman < hannu.ny...@iki.fi>
> 
> 

Looks good but needs a rebase to apply. can you send a V2 please

John




---
> 
> Tested with ar71xx / WNDR3700:
> 
> opkg package size increase is minimal:
> 
> root@OpenWrt2:~# ls -l /bin/opkg
> -rwxr-xr-x1 root root101532 Aug 29 23:05 /bin/opkg
> 
> root@OpenWrt2:~# opkg install
> /tmp/opkg_9c97d5ecd795709c8584e972bfdf3aee3a5b846d-9_ar71xx.ipk
> Upgrading opkg on root from 9c97d5ecd795709c8584e972bfdf3aee3a5b846d-8
> to 9c97d5ecd795709c8584e972bfdf3aee3a5b846d-9...
> Configuring opkg.
> 
> root@OpenWrt2:~# ls -l /bin/opkg
> -rwxr-xr-x1 root root101548 Aug 29 23:05 /bin/opkg
> 
> --size works as expected:
> (packages not from "packages" feed have been removed for clarity)
> 
> root@OpenWrt2:/tmp# opkg list j*
> jansson - 2.7-1 - Jansson is a C library for encoding, decoding and
> manipulating JSON data
> joe - 4.0-4 - Joe is world-famous Wordstar like text editor, that also
> features
>  Emacs and Pico emulation
> jpeg-tools - 9a-1 - The Independent JPEG Group's JPEG manipulation tools
> json4lua - 0.9.53-1 - JSON and JSONRPC for Lua
> 
> root@OpenWrt2:/tmp# opkg list --size j*
> jansson - 2.7-1 - 19182 - Jansson is a C library for encoding, decoding
> and manipulating JSON data
> joe - 4.0-4 - 173911 - Joe is world-famous Wordstar like text editor,
> that also features
>  Emacs and Pico emulation
> jpeg-tools - 9a-1 - 31188 - The Independent JPEG Group's JPEG
> manipulation tools
> json4lua - 0.9.53-1 - 7205 - JSON and JSONRPC for Lua
> 
> -
> https://downloads.openwrt.org/snapshots/trunk/ar71xx/generic/packages/packages/
> 
> 
> jansson_2.7-1_ar71xx.ipk   26-Aug-2015
> 05:20   19182
> joe_4.0-4_ar71xx.ipk   26-Aug-2015
> 05:20  173911
> jpeg-tools_9a-1_ar71xx.ipk 26-Aug-2015
> 00:04   31188
> json4lua_0.9.53-1_ar71xx.ipk   26-Aug-2015
> 05:217205
> 
> 
> 
> 
> 
> ___
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
> 
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH v3] opkg: Extend 'opkg list' command to optionally display package size

2015-09-16 Thread Hannu Nyman

'opkg list' command only displays the available packages' name, version and 
description. It would be useful to also see the approximate size of the
available package.

This patch extends "opkg list" command with "--size" to optionally show also 
the *.ipk size.
* Default behaviour is to list the available packages as earlier: 
  "name - version - description"
* with "--size" the output of is "name - version - size - description".

Signed-off-by: Hannu Nyman 

---
Patch v2: bump opkg PKG_RELEASE and rebase
Patch v3: modify patch for the "git am" compatibility requirement

This patch superseeds https://patchwork.ozlabs.org/patch/512231/
and https://patchwork.ozlabs.org/patch/518287/


Example:
root@OpenWrt:~# opkg list kr*
krb5-client - 1.13.1-1 - Kerberos 5 Client
krb5-libs - 1.13.1-1 - Kerberos 5 Shared Libraries
krb5-server - 1.13.1-1 - Kerberos 5 Server

root@OpenWrt:~# opkg list --size kr*
krb5-client - 1.13.1-1 - 37297 - Kerberos 5 Client
krb5-libs - 1.13.1-1 - 667427 - Kerberos 5 Shared Libraries
krb5-server - 1.13.1-1 - 122460 - Kerberos 5 Server

Example implementation that utilises this opkg change to show the 
.ipk size to the user in GUI:
https://github.com/openwrt/luci/issues/19#issuecomment-136397807




Index: package/system/opkg/Makefile
===
--- a/package/system/opkg/Makefile
+++ b/package/system/opkg/Makefile
@@ -12,7 +12,7 @@
 PKG_NAME:=opkg
 PKG_REV:=9c97d5ecd795709c8584e972bfdf3aee3a5b846d
 PKG_VERSION:=$(PKG_REV)
-PKG_RELEASE:=9
+PKG_RELEASE:=10
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=$(PKG_REV)
Index: package/system/opkg/patches/260-add-print-package-size.patch
===
--- /dev/null
+++ b/package/system/opkg/patches/260-add-print-package-size.patch
@@ -0,0 +1,74 @@
+--- a/libopkg/opkg_conf.c
 b/libopkg/opkg_conf.c
+@@ -69,6 +69,7 @@ opkg_option_t options[] = {
+ { "proxy_passwd", OPKG_OPT_TYPE_STRING, &_conf.proxy_passwd },
+ { "proxy_user", OPKG_OPT_TYPE_STRING, &_conf.proxy_user },
+ { "query-all", OPKG_OPT_TYPE_BOOL, &_conf.query_all },
++{ "size", OPKG_OPT_TYPE_BOOL, &_conf.size },
+ { "tmp_dir", OPKG_OPT_TYPE_STRING, &_conf.tmp_dir },
+ { "verbosity", OPKG_OPT_TYPE_INT, &_conf.verbosity },
+ #if defined(HAVE_OPENSSL)
+--- a/libopkg/opkg_conf.h
 b/libopkg/opkg_conf.h
+@@ -88,6 +88,7 @@ struct opkg_conf
+  int query_all;
+  int verbosity;
+  int noaction;
++ int size;
+  int download_only;
+  char *cache;
+ 
+--- a/src/opkg-cl.c
 b/src/opkg-cl.c
+@@ -52,6 +52,7 @@ enum {
+   ARGS_OPT_AUTOREMOVE,
+   ARGS_OPT_CACHE,
+   ARGS_OPT_FORCE_SIGNATURE,
++  ARGS_OPT_SIZE,
+ };
+ 
+ static struct option long_options[] = {
+@@ -98,6 +99,7 @@ static struct option long_options[] = {
+   {"offline-root", 1, 0, 'o'},
+   {"add-arch", 1, 0, ARGS_OPT_ADD_ARCH},
+   {"add-dest", 1, 0, ARGS_OPT_ADD_DEST},
++  {"size", 0, 0, ARGS_OPT_SIZE},
+   {"test", 0, 0, ARGS_OPT_NOACTION},
+   {"tmp-dir", 1, 0, 't'},
+   {"tmp_dir", 1, 0, 't'},
+@@ -212,6 +214,9 @@ args_parse(int argc, char *argv[])
+   }
+   free(tuple);
+   break;
++  case ARGS_OPT_SIZE:
++  conf->size = 1;
++  break;
+   case ARGS_OPT_NOACTION:
+   conf->noaction = 1;
+   break;
+@@ -315,6 +320,7 @@ usage()
+   printf("\t--download-only   No action -- download only\n");
+   printf("\t--nodeps  Do not follow dependencies\n");
+   printf("\t--nocase  Perform case insensitive pattern 
matching\n");
++  printf("\t--sizePrint package size when listing 
available packages\n");
+   printf("\t--force-removal-of-dependent-packages\n");
+   printf("\t  Remove package and all dependencies\n");
+   printf("\t--autoremove  Remove packages that were installed\n");
+--- a/libopkg/opkg_cmd.c
 b/libopkg/opkg_cmd.c
+@@ -47,10 +47,12 @@ static void
+ print_pkg(pkg_t *pkg)
+ {
+   char *version = pkg_version_str_alloc(pkg);
++  printf("%s - %s", pkg->name, version);
++  if (conf->size)
++  printf(" - %lu", pkg->size);
+   if (pkg->description)
+-  printf("%s - %s - %s\n", pkg->name, version, pkg->description);
+-  else
+-  printf("%s - %s\n", pkg->name, version);
++  printf(" - %s", pkg->description);
++  printf("\n");
+   free(version);
+ }
+ 
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] OpenWrt /etc/hotplug.d/button/00-wps

2015-09-16 Thread Bastian Bittorf

* John kerry  [16.09.2015 08:10]:
> Hi,
> 
> I have changed the script as below:
> 
> MYDEV='eth0.2'
> 
>  ["$ACTION" = "pressed" -a "$BUTTON" = "BUT_2" -a "INTERFACE" = 'wan'] &&
   ^^^ a space here, so [ "$ACTION" - the same at the end: 'wan' ]
use "$INTERFACE" with the '$'

please learn shell-scripting. maybe it's an good idea to use a static
checker like http://www.shellcheck.net/

>{
> devstatus "$MYDEV" | grep '"up": true' &&
>{
> echo "255" >
> /sys/devices/platform/leds-gpio/leds/db120:green:status/brightness
> }
> }
> 
> 
> but its not working.
> 
> What mistake i am doing.

bye, bastian - greetings to china?!
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH 1/1] sysupgrade, wndr3700/wndr3800: Add allnet safety check

2015-09-16 Thread John Crispin



On 02/08/2015 09:58, Daniel Dickinson wrote:
> This patch may not actually be necessary, but adds the allnet
> uboot-envtools safety checks before allow a firmware upgrade to
> and Netgear WNDR3700/3800 device.
> 
> Note that the Netgear devices already have a hardware id check so
> this may be superfulous.
> 

looking at the code i believe this is not needed. i marked the patch as
rejected

John


> Signed-off-by: Daniel Dickinson 
> ---
>  target/linux/ar71xx/base-files/lib/upgrade/platform.sh | 5 -
>  target/linux/ar71xx/generic/profiles/netgear.mk| 2 +-
>  2 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh 
> b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
> index bc53040..5241752 100755
> --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
> +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
> @@ -400,7 +400,10 @@ platform_check_image() {
>   }
>   return 0
>   ;;
> - wndr3700 | \
> + wndr3700)
> + # Use the new ubootenvtools safety check
> + platform_check_image_allnet "$1" || return 1
> + # Fall through to common wnndr/wnr hardware check
>   wnr2000-v3 | \
>   wnr612-v2 | \
>   wnr1000-v2)
> diff --git a/target/linux/ar71xx/generic/profiles/netgear.mk 
> b/target/linux/ar71xx/generic/profiles/netgear.mk
> index 16b1087..34067c6 100644
> --- a/target/linux/ar71xx/generic/profiles/netgear.mk
> +++ b/target/linux/ar71xx/generic/profiles/netgear.mk
> @@ -18,7 +18,7 @@ $(eval $(call Profile,WNDAP360))
>  
>  define Profile/WNDR3700
>   NAME:=NETGEAR WNDR3700/WNDR3800/WNDRMAC
> - PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev 
> kmod-leds-wndr3700-usb
> + PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev 
> kmod-leds-wndr3700-usb uboot-envtools
>  endef
>  
>  define Profile/WNDR3700/Description
> ___
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
> 
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH 1/2 v2] mac80211: cleanup remove net prefixes

2015-09-16 Thread John Crispin



On 24/08/2015 17:25, Dirk Neukirchen wrote:
> Signed-off-by: Dirk Neukirchen 
> ---
> v2 : split 6/7 into two commits
> 

sorry we need a v3 please this one does not apply anymore. the actual
patch looks fine

John

>  package/kernel/mac80211/Makefile | 82 
> 
>  1 file changed, 41 insertions(+), 41 deletions(-)
> 
> diff --git a/package/kernel/mac80211/Makefile 
> b/package/kernel/mac80211/Makefile
> index be179f2..b7471b9 100644
> --- a/package/kernel/mac80211/Makefile
> +++ b/package/kernel/mac80211/Makefile
> @@ -27,8 +27,8 @@ PKG_DRIVERS = \
>   rt2x00-lib rt2x00-pci rt2x00-usb rt2800-lib rt2400-pci rt2500-pci \
>   rt2500-usb rt61-pci rt73-usb rt2800-mmio rt2800-pci rt2800-usb 
> rt2800-soc \
>   rtl8180 rtl8187 zd1211rw mac80211-hwsim carl9170 b43 b43legacy \
> - ath9k-common ath9k ath9k-htc ath10k ath net-libipw net-ipw2100 
> net-ipw2200 \
> - mwl8k mwifiex-pcie net-hermes net-hermes-pci net-hermes-plx 
> net-hermes-pcmcia \
> + ath9k-common ath9k ath9k-htc ath10k ath libipw ipw2100 ipw2200 \
> + mwl8k mwifiex-pcie hermes hermes-pci hermes-plx hermes-pcmcia \
>   iwl-legacy iwl3945 iwl4965 iwlagn wlcore wl12xx wl18xx lib80211 \
>   rtlwifi rtlwifi-pci rtlwifi-usb rtl8192c-common rtl8192ce rtl8192se \
>   rtl8192de rtl8192cu mt7601u
> @@ -716,7 +716,7 @@ define KernelPackage/mt7601u
>AUTOLOAD:=$(call AutoProbe,mt7601)
>  endef
>  
> -define KernelPackage/net-libipw
> +define KernelPackage/libipw
>$(call KernelPackage/mac80211/Default)
>TITLE:=libipw for ipw2100 and ipw2200
>DEPENDS:=@PCI_SUPPORT +kmod-crypto-core +kmod-crypto-arc4 
> +kmod-crypto-michael-mic +kmod-lib80211 +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT 
> @!BIG_ENDIAN
> @@ -724,29 +724,29 @@ define KernelPackage/net-libipw
>AUTOLOAD:=$(call AutoProbe,libipw)
>  endef
>  
> -define KernelPackage/net-libipw/description
> +define KernelPackage/libipw/description
>   Hardware independent IEEE 802.11 networking stack for ipw2100 and ipw2200.
>  endef
>  
>  IPW2100_NAME:=ipw2100-fw
>  IPW2100_VERSION:=1.3
>  
> -define Download/net-ipw2100
> +define Download/ipw2100
>URL:=http://bughost.org/firmware/
>FILE:=$(IPW2100_NAME)-$(IPW2100_VERSION).tgz
>MD5SUM=46aa75bcda1a00efa841f9707bbbd113
>  endef
> -$(eval $(call Download,net-ipw2100))
> +$(eval $(call Download,ipw2100))
>  
> -define KernelPackage/net-ipw2100
> +define KernelPackage/ipw2100
>$(call KernelPackage/mac80211/Default)
>TITLE:=Intel IPW2100 driver
> -  DEPENDS:=@PCI_SUPPORT +kmod-net-libipw
> +  DEPENDS:=@PCI_SUPPORT +kmod-libipw
>FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ipw2x00/ipw2100.ko
>AUTOLOAD:=$(call AutoProbe,ipw2100)
>  endef
>  
> -define KernelPackage/net-ipw2100/description
> +define KernelPackage/ipw2100/description
>   Kernel support for Intel IPW2100
>   Includes:
>   - ipw2100
> @@ -755,29 +755,29 @@ endef
>  IPW2200_NAME:=ipw2200-fw
>  IPW2200_VERSION:=3.1
>  
> -define Download/net-ipw2200
> +define Download/ipw2200
>URL:=http://bughost.org/firmware/
>FILE:=$(IPW2200_NAME)-$(IPW2200_VERSION).tgz
>MD5SUM=eaba788643c7cc7483dd67ace70f6e99
>  endef
> -$(eval $(call Download,net-ipw2200))
> +$(eval $(call Download,ipw2200))
>  
> -define KernelPackage/net-ipw2200
> +define KernelPackage/ipw2200
>$(call KernelPackage/mac80211/Default)
>TITLE:=Intel IPW2200 driver
> -  DEPENDS:=@PCI_SUPPORT +kmod-net-libipw
> +  DEPENDS:=@PCI_SUPPORT +kmod-libipw
>FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ipw2x00/ipw2200.ko
>AUTOLOAD:=$(call AutoProbe,ipw2200)
>  endef
>  
> -define KernelPackage/net-ipw2200/description
> +define KernelPackage/ipw2200/description
>   Kernel support for Intel IPW2200
>   Includes:
>   - ipw2200
>  endef
>  
>  
> -define KernelPackage/net-hermes
> +define KernelPackage/hermes
>$(call KernelPackage/mac80211/Default)
>TITLE:=Hermes 802.11b chipset support
>DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT
> @@ -785,43 +785,43 @@ define KernelPackage/net-hermes
>AUTOLOAD:=$(call AutoProbe,orinoco)
>  endef
>  
> -define KernelPackage/net-hermes/description
> +define KernelPackage/hermes/description
>   Kernel support for Hermes 802.11b chipsets
>  endef
>  
> -define KernelPackage/net-hermes-pci
> +define KernelPackage/hermes-pci
>$(call KernelPackage/mac80211/Default)
>TITLE:=Intersil Prism 2.5 PCI support
> -  DEPENDS:=@PCI_SUPPORT +kmod-net-hermes
> +  DEPENDS:=@PCI_SUPPORT +kmod-hermes
>FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco_pci.ko
>AUTOLOAD:=$(call AutoProbe,orinoco_pci)
>  endef
>  
> -define KernelPackage/net-hermes-pci/description
> +define KernelPackage/hermes-pci/description
>   Kernel modules for Intersil Prism 2.5 PCI support
>  endef
>  
> -define KernelPackage/net-hermes-plx
> +define KernelPackage/hermes-plx
>$(call KernelPackage/mac80211/Default)
>TITLE:=PLX9052 based

Re: [OpenWrt-Devel] OpenWrt /etc/hotplug.d/button/00-wps

2015-09-16 Thread John kerry

Hi ,

[ "$ACTION" = "pressed" ] && [ "$BUTTON" = "lanwifi" ] && [ "$INTERFACE" =
"wan" ] &&
  {
 devstatus "$MYDEV" | grep '"up": true' &&
 {

echo "" > /dev/console
echo "SWITCH TO RJ45" > /dev/console
echo "255" >
/sys/devices/platform/leds-gpio/leds/db120:green:status/brightness
  }
   }

even i checked on http://www.shellcheck.net/ , its not giving any feedback,
it seems correct but still its not working.

I writing this script under /etc/hotplug.d/button/50-button file.

I have to change any other file?

Regards,
john

On Wed, Sep 16, 2015 at 2:43 PM, Bastian Bittorf 
wrote:

> * John kerry  [16.09.2015 08:10]:
> > Hi,
> >
> > I have changed the script as below:
> >
> > MYDEV='eth0.2'
> >
> >  ["$ACTION" = "pressed" -a "$BUTTON" = "BUT_2" -a "INTERFACE" = 'wan'] &&
>^^^ a space here, so [ "$ACTION" - the same at the end: 'wan' ]
> use "$INTERFACE" with the '$'
>
> please learn shell-scripting. maybe it's an good idea to use a static
> checker like http://www.shellcheck.net/
>
> >{
> > devstatus "$MYDEV" | grep '"up": true' &&
> >{
> > echo "255" >
> > /sys/devices/platform/leds-gpio/leds/db120:green:status/brightness
> > }
> > }
> >
> >
> > but its not working.
> >
> > What mistake i am doing.
>
> bye, bastian - greetings to china?!
>
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH 7/7] mac80211: rename iwlagn to iwlwifi

2015-09-16 Thread John Crispin



On 23/08/2015 13:00, Dirk Neukirchen wrote:
> follow upstream module rename
> commit 3c607d27c818cf4a5d28f2c73b18a88f8fbdfa33
> 
> Signed-off-by: Dirk Neukirchen 

this one does not apply either. can you resend all 3 in a new series please

John

> ---
>  package/kernel/mac80211/Makefile | 20 ++--
>  1 file changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/package/kernel/mac80211/Makefile 
> b/package/kernel/mac80211/Makefile
> index 061f117..cb38ab0 100644
> --- a/package/kernel/mac80211/Makefile
> +++ b/package/kernel/mac80211/Makefile
> @@ -28,7 +28,7 @@ PKG_DRIVERS = \
>   b43 b43legacy \
>   carl9170 \
>   hermes hermes-pci hermes-pcmcia hermes-plx \
> - iwl-legacy iwl3945 iwl4965 iwlagn \
> + iwl-legacy iwl3945 iwl4965 iwlwifi \
>   libipw ipw2100 ipw2200 \
>   libertas-usb libertas-sdio \
>   lib80211 \
> @@ -904,7 +904,7 @@ define KernelPackage/ipw2200/description
>  endef
>  
>  
> -define KernelPackage/iwlagn
> +define KernelPackage/iwlwifi
>$(call KernelPackage/mac80211/Default)
>DEPENDS:= +kmod-mac80211 @PCI_SUPPORT +@DRIVER_11N_SUPPORT
>TITLE:=Intel AGN Wireless support
> @@ -916,8 +916,8 @@ define KernelPackage/iwlagn
>MENU:=1
>  endef
>  
> -define KernelPackage/iwlagn/description
> - iwlagn kernel module for
> +define KernelPackage/iwlwifi/description
> + iwlwifi kernel module for
>   Intel Wireless WiFi Link 6250AGN Adapter
>   Intel 6000 Series Wi-Fi Adapters (6200AGN and 6300AGN)
>   Intel WiFi Link 1000BGN
> @@ -935,11 +935,11 @@ define KernelPackage/iwlagn/description
>   Intel 3165 Wi-Fi Adapter
>  endef
>  
> -define KernelPackage/iwlagn/config
> -  if PACKAGE_kmod-iwlagn
> +define KernelPackage/iwlwifi/config
> +  if PACKAGE_kmod-iwlwifi
>  
>   config PACKAGE_IWLWIFI_DEBUG
> - bool "Enable full debugging output in the iwlagn driver"
> + bool "Enable full debugging output in the iwlwif driver"
>   default n
>   help
> This option will enable debug tracing output for the iwlwifi 
> drivers
> @@ -1747,7 +1747,7 @@ config-$(call config_package,ipw2200) += IPW2200
>  config-$(call config_package,iwl-legacy) += IWLEGACY
>  config-$(call config_package,iwl3945) += IWL3945
>  config-$(call config_package,iwl4965) += IWL4965
> -config-$(call config_package,iwlagn) += IWLWIFI IWLDVM IWLMVM
> +config-$(call config_package,iwlwifi) += IWLWIFI IWLDVM IWLMVM
>  config-$(CONFIG_PACKAGE_IWLWIFI_DEBUG)+= IWLWIFI_DEBUG
>  config-$(CONFIG_PACKAGE_IWLWIFI_DEBUGFS)+= IWLWIFI_DEBUGFS
>  
> @@ -2001,7 +2001,7 @@ define KernelPackage/ipw2200/install
>   $(INSTALL_DATA) 
> $(PKG_BUILD_DIR)/$(IPW2200_NAME)-$(IPW2200_VERSION)/ipw2200*.fw 
> $(1)/lib/firmware
>  endef
>  
> -define KernelPackage/iwlagn/install
> +define KernelPackage/iwlwifi/install
>   $(INSTALL_DIR) $(1)/lib/firmware
>  ifneq ($(CONFIG_IWL100_FW),)
>   $(INSTALL_DATA) 
> $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-100-5.ucode 
> $(1)/lib/firmware
> @@ -2205,7 +2205,7 @@ $(eval $(call KernelPackage,carl9170))
>  $(eval $(call KernelPackage,cfg80211))
>  $(eval $(call KernelPackage,iwl3945))
>  $(eval $(call KernelPackage,iwl4965))
> -$(eval $(call KernelPackage,iwlagn))
> +$(eval $(call KernelPackage,iwlwifi))
>  $(eval $(call KernelPackage,iwl-legacy))
>  $(eval $(call KernelPackage,lib80211))
>  $(eval $(call KernelPackage,libertas-sdio))
> 
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH] include: download.mk: If checkouts fail, attempt default download method

2015-09-16 Thread John Crispin



On 15/09/2015 22:01, Pushpal Sidhu wrote:
> This will allow a more robust download system, especially in cases when
> building an older release where a source checkout system is gone.
> 
> Signed-off-by: Pushpal Sidhu 

although this looks good at first glance we notice on a closer
inspection that the DL will happen without the md5 check and o on.

sorry, cant merge it like that.






> ---
>  include/download.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/download.mk b/include/download.mk
> index adaa2e6..eb86faf 100644
> --- a/include/download.mk
> +++ b/include/download.mk
> @@ -46,7 +46,7 @@ define DownloadMethod/default
>  endef
>  
>  define wrap_mirror
> - $(if $(if $(MIRROR),$(filter-out 
> x,$(MIRROR_MD5SUM))),@$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" 
> "$(MIRROR_MD5SUM)" || ( $(1) ),$(1))
> + $(if $(if $(MIRROR),$(filter-out 
> x,$(MIRROR_MD5SUM))),@$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" 
> "$(MIRROR_MD5SUM)" || ( $(1) ), ( $(1) ) || $(DownloadMethod/default))
>  endef
>  
>  define DownloadMethod/cvs
> 
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH] musl: fix build on sh3

2015-09-16 Thread John Crispin

Hi,

On 14/09/2015 10:38, Zoltan HERPAI wrote:
> musl fails to build when compiled with gcc on sh3 (GCC target/#67260).
> Work it around.
> 
> Signed-off-by: Zoltan HERPAI 
> ---
>  toolchain/musl/common.mk |5 +
>  1 file changed, 5 insertions(+)
> 
> diff --git a/toolchain/musl/common.mk b/toolchain/musl/common.mk
> index 82c1543..ba467fb 100644
> --- a/toolchain/musl/common.mk
> +++ b/toolchain/musl/common.mk
> @@ -23,6 +23,11 @@
> HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)-$(PKG_VERSION)
>  include $(INCLUDE_DIR)/toolchain-build.mk
>  include $(INCLUDE_DIR)/hardening.mk
> 
> +ifeq ($(CONFIG_sh3),y)
> +TARGET_CFLAGS+= \
> +   -fno-optimize-sibling-calls
> +endif
> +

i am worried that this will be added and never removed as we will forget
about it. how about making it also depend on the broken gcc version.

John

>  MUSL_CONFIGURE:= \
> $(TARGET_CONFIGURE_OPTS) \
> CFLAGS="$(TARGET_CFLAGS)" \
> -- 
> 1.7.10.4
> ___
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH v2 4/4] ramips: Fix pinmux functions for MT7621

2015-09-16 Thread John Crispin



On 31/07/2015 11:14, Sven Eckelmann wrote:
> The pinctrl-rt2880 code doesn't support multiple functions with the same
> name. This will result in a incorrect pinmux configuration.
> 
> Signed-off-by: Sven Eckelmann 
> ---
> This is the patch which John Crispin  wanted to
> drop and instead rewrite the pinctrl-rt2880. It is just here for
> completeness.
> 


i merged this as i had no time to come up with a better fix yet. i
already looked at the driver and it will require a bit of code moving to
get this working so dont hold your breath.


> v2:
>  - split into multiple patches
> 
> 
>  target/linux/ramips/dts/mt7621.dtsi| 14 +++---
>  .../0012-MIPS-ralink-add-MT7621-support.patch  | 18 
> +-
>  2 files changed, 16 insertions(+), 16 deletions(-)
> 
> diff --git a/target/linux/ramips/dts/mt7621.dtsi 
> b/target/linux/ramips/dts/mt7621.dtsi
> index 53b215f40f10..f09ec3e5b694 100644
> --- a/target/linux/ramips/dts/mt7621.dtsi
> +++ b/target/linux/ramips/dts/mt7621.dtsi
> @@ -130,31 +130,31 @@
>   uart1_pins: uart1 {
>   uart1 {
>   ralink,group = "uart1";
> - ralink,function = "uart";
> + ralink,function = "uart1";
>   };
>   };
>   uart2_pins: uart2 {
>   uart2 {
>   ralink,group = "uart2";
> - ralink,function = "uart";
> + ralink,function = "uart2";
>   };
>   };
>   uart3_pins: uart3 {
>   uart3 {
>   ralink,group = "uart3";
> - ralink,function = "uart";
> + ralink,function = "uart3";
>   };
>   };
>   rgmii1_pins: rgmii1 {
>   rgmii1 {
>   ralink,group = "rgmii1";
> - ralink,function = "rgmii";
> + ralink,function = "rgmii1";
>   };
>   };
>   rgmii2_pins: rgmii2 {
>   rgmii2 {
>   ralink,group = "rgmii2";
> - ralink,function = "rgmii";
> + ralink,function = "rgmii2";
>   };
>   };
>   mdio_pins: mdio {
> @@ -172,11 +172,11 @@
>   nand_pins: nand {
>   spi-nand {
>   ralink,group = "spi";
> - ralink,function = "nand";
> + ralink,function = "nand1";
>   };
>   sdhci-nand {
>   ralink,group = "sdhci";
> - ralink,function = "nand";
> + ralink,function = "nand2";
>   };
>   };
>   sdhci_pins: sdhci {
> diff --git 
> a/target/linux/ramips/patches-3.18/0012-MIPS-ralink-add-MT7621-support.patch 
> b/target/linux/ramips/patches-3.18/0012-MIPS-ralink-add-MT7621-support.patch
> index 69401549becd..23d32681bf77 100644
> --- 
> a/target/linux/ramips/patches-3.18/0012-MIPS-ralink-add-MT7621-support.patch
> +++ 
> b/target/linux/ramips/patches-3.18/0012-MIPS-ralink-add-MT7621-support.patch
> @@ -582,17 +582,17 @@ Signed-off-by: John Crispin 
>  +#define MT7621_GPIO_MODE_SDHCI_SHIFT18
>  +#define MT7621_GPIO_MODE_SDHCI_GPIO 1
>  +
> -+static struct rt2880_pmx_func uart1_grp[] =  { FUNC("uart", 0, 1, 2) };
> ++static struct rt2880_pmx_func uart1_grp[] =  { FUNC("uart1", 0, 1, 2) };
>  +static struct rt2880_pmx_func i2c_grp[] =  { FUNC("i2c", 0, 3, 2) };
>  +static struct rt2880_pmx_func uart3_grp[] = {
> -+FUNC("uart", 0, 5, 4),
> ++FUNC("uart3", 0, 5, 4),
>  +FUNC("i2s", 2, 5, 4),
> -+FUNC("spdif", 3, 5, 4),
> ++FUNC("spdif3", 3, 5, 4),
>  +};
>  +static struct rt2880_pmx_func uart2_grp[] = {
> -+FUNC("uart", 0, 9, 4),
> ++FUNC("uart2", 0, 9, 4),
>  +FUNC("pcm", 2, 9, 4),
> -+FUNC("spdif", 3, 9, 4),
> ++FUNC("spdif2", 3, 9, 4),
>  +};
>  +static struct rt2880_pmx_func jtag_grp[] = { FUNC("jtag", 0, 13, 5) };
>  +static struct rt2880_pmx_func wdt_grp[] = {
> @@ -604,16 +604,16 @@ Signed-off-by: John Crispin 
>  +FUNC("pcie refclk", MT7621_GPIO_MODE_PCIE_REF, 19, 1)
>  +};
>  +static struct rt2880_pmx_func mdio_grp[] = { FUNC("mdio", 0, 20, 2) };
> -+static struct rt2880_pmx_func rgmii2_grp[] = { FUNC("rgmii", 0, 22, 12) };
> ++static struct rt2880_pmx_func rgmii2_grp[] = { FUNC("rgmii2", 0, 22, 12) };
>  +static struct rt2880_pmx_func spi_grp[] = {
>  +FUNC("spi", 0, 34, 7),
> -+FUNC("nand", 2, 34, 7),
> ++

Re: [OpenWrt-Devel] [PATCH] musl: fix build on sh3

2015-09-16 Thread Felix Fietkau

On 2015-09-16 09:27, John Crispin wrote:
> Hi,
> 
> On 14/09/2015 10:38, Zoltan HERPAI wrote:
>> musl fails to build when compiled with gcc on sh3 (GCC target/#67260).
>> Work it around.
>> 
>> Signed-off-by: Zoltan HERPAI 
>> ---
>>  toolchain/musl/common.mk |5 +
>>  1 file changed, 5 insertions(+)
>> 
>> diff --git a/toolchain/musl/common.mk b/toolchain/musl/common.mk
>> index 82c1543..ba467fb 100644
>> --- a/toolchain/musl/common.mk
>> +++ b/toolchain/musl/common.mk
>> @@ -23,6 +23,11 @@
>> HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)-$(PKG_VERSION)
>>  include $(INCLUDE_DIR)/toolchain-build.mk
>>  include $(INCLUDE_DIR)/hardening.mk
>> 
>> +ifeq ($(CONFIG_sh3),y)
>> +TARGET_CFLAGS+= \
>> +   -fno-optimize-sibling-calls
>> +endif
>> +
> 
> i am worried that this will be added and never removed as we will forget
> about it. how about making it also depend on the broken gcc version.
There is no non-broken gcc version yet. I think we should at least have
a link to the gcc bug report directly above these lines, so we don't
have to dig through the log to figure out why this was added.

- Felix
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] Warning: ABI breakage - rebuild your ATM trees

2015-09-16 Thread John Crispin

Hi,

i pushed a patch today that removes some serious ABI brain damage of the
ATM layer that i introduced 1/2 a decade ago

http://git.openwrt.org/?p=openwrt.git;a=commit;h=c5d4911448898f7fabdd2c4737ed0820ced4fc4d

https://dev.openwrt.org/ticket/20523

as a side effect you will need to rebuild your trees if you are using
ATM. a "make clean" wont cut the cheese on this one, you need to do a
full distclean to force the toolchain to rebuild, so that the new kernel
headers are staged etc etc.

this will particularly hit those of you that are using lantiq or ar7
units but also users of that geode board with the 2 connexant dsl chips
on it are effected.

John
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] OpenWrt /etc/hotplug.d/button/00-wps

2015-09-16 Thread Bastian Bittorf

* John kerry  [16.09.2015 12:18]:
> I am getting below log:

ok, i see: INTERFACE is not set, so you have to remove the check for
this var and hardcode it.

please stop sending mails like this, debug on your own with a local friend.

bye, bastian
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] OpenWrt /etc/hotplug.d/button/00-wps

2015-09-16 Thread John kerry

Hi,

I understand its not good to mail like this, But I am quite new on this and
even no body knows in my friends about this. Could you please help

I hard coded the interface as below:

set | logger


[ "$ACTION" = "pressed" ] && [ "$BUTTON" = "lanwifi" ] &&
 {
 devstatus "eth0.2" | grep "up":true &&
 {
echo "" > /dev/console
echo "SWITCH TO RJ45" > /dev/console
echo "255" >
/sys/devices/platform/leds-gpio/leds/db120:green:status/brightness
  }
  }

But still same problem.

Regards,
John

On Wed, Sep 16, 2015 at 6:23 PM, Bastian Bittorf 
wrote:

> * John kerry  [16.09.2015 12:18]:
> > I am getting below log:
>
> ok, i see: INTERFACE is not set, so you have to remove the check for
> this var and hardcode it.
>
> please stop sending mails like this, debug on your own with a local friend.
>
> bye, bastian
>
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] Warning: ABI breakage - rebuild your ATM trees

2015-09-16 Thread John Crispin



On 16/09/2015 13:20, John Crispin wrote:
> Hi,
> 
> i pushed a patch today that removes some serious ABI brain damage of the
> ATM layer that i introduced 1/2 a decade ago
> 
> http://git.openwrt.org/?p=openwrt.git;a=commit;h=c5d4911448898f7fabdd2c4737ed0820ced4fc4d
> 
> https://dev.openwrt.org/ticket/20523
> 
> as a side effect you will need to rebuild your trees if you are using
> ATM. a "make clean" wont cut the cheese on this one, you need to do a
> full distclean to force the toolchain to rebuild, so that the new kernel
> headers are staged etc etc.
> 
> this will particularly hit those of you that are using lantiq or ar7
> units but also users of that geode board with the 2 connexant dsl chips
> on it are effected.
> 
>   John

thinking about this, the new elements should also be guarded by a #ifdef
CONFIG_lantiq will add that now

John
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] Warning: ABI breakage - rebuild your ATM trees

2015-09-16 Thread John Crispin

On 16/09/2015 15:17, David Woodhouse wrote:
> On Wed, 2015-09-16 at 13:23 +0200, John Crispin wrote:
>> thinking about this, the new elements should also be guarded by a #ifdef
>> CONFIG_lantiq will add that now
> 
> You can't do that in user-visible headers. CONFIG_LANTIQ isn't defined
> in t he userspace builds, so userspace will get a version *without* the
> additions, and its ABI will be different to that of the kernel.
> 
> And even if it *did* work that way, you'd still end up needing a
> *different* build of userspace tools like pppd, depending on the
> platform it's going to be run on.
> 
> If you really need these new fields to be visible to userspace, then I
> think the best option is to add a *new* SO_ATMQOS2 sockopt, and leave
> the original SO_ATMQOS entirely alone.
> 

how i hate this shitty dsl driver ... adding new sockopt is nort an
option. that would involve editing the dsl driver and userland and even
looking at the code causes permanent brain damage as can be seen by the
patches and fixes ... i will find a different hack to make this only
apply when lantiq is selected.
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] Warning: ABI breakage - rebuild your ATM trees

2015-09-16 Thread David Woodhouse

On Wed, 2015-09-16 at 13:23 +0200, John Crispin wrote:
> thinking about this, the new elements should also be guarded by a #ifdef
> CONFIG_lantiq will add that now

You can't do that in user-visible headers. CONFIG_LANTIQ isn't defined
in t he userspace builds, so userspace will get a version *without* the
additions, and its ABI will be different to that of the kernel.

And even if it *did* work that way, you'd still end up needing a
*different* build of userspace tools like pppd, depending on the
platform it's going to be run on.

If you really need these new fields to be visible to userspace, then I
think the best option is to add a *new* SO_ATMQOS2 sockopt, and leave
the original SO_ATMQOS entirely alone.

-- 
David WoodhouseOpen Source Technology Centre
david.woodho...@intel.com  Intel Corporation

smime.p7s
Description: S/MIME cryptographic signature
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH] include: download.mk: If checkouts fail, attempt default download method

2015-09-16 Thread Pushpal Sidhu

Hi,

On Wed, Sep 16, 2015 at 1:26 AM, John Crispin  wrote:
>
>
> On 15/09/2015 22:01, Pushpal Sidhu wrote:
>> This will allow a more robust download system, especially in cases when
>> building an older release where a source checkout system is gone.
>>
>> Signed-off-by: Pushpal Sidhu 
>
> although this looks good at first glance we notice on a closer
> inspection that the DL will happen without the md5 check and o on.
>
> sorry, cant merge it like that.

After thinking about it, I understand what you're saying. Unless a
package defines a mirror md5sum, in which case the wrap_mirror
function already takes care of it.

I find that when packages define a mirror md5sum, wrap_mirror checks
mirror sites before using the preferred method of download by the
package. This leads to many packages commenting out the mirror md5sum
(or worse, omit it's inclusion all together) because they don't want
to burden mirror sites (especially the two openwrt defaults). Until an
individual manually patches every package as sources become obsolete,
this will remain a problem, but that's not always easy for some
people, plus can be a distribution nightmare in some cases (maybe
github will change it's name and everyone on 14.07 and before will
start having huge issues when building until patched).

How about a patch that instead uses the default source method (e.g.
git checkout), then checks against mirrors? I'm not sure of the
original reasoning for deciding this, but please consider changing the
behavior of this. This will have the affect of packages starting to
use the mirror md5sum more readily, won't burden sites that mirror
packages until a source has been obsoleted, and is easier than
manually editing each package that goes down. It just seems that there
is an inconsistency with how download.mk handles mirrors vs. how
package maintainers handle it.

- Pushpal
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] Project specific settings

2015-09-16 Thread Bruno Randolf

Hi Christoph,

On 09/15/2015 07:32 PM, Rüdiger, Christoph wrote:
> Our build tree is full of custom patches to different packages,
> mainly in the openwrt/package directory. This makes it close to
> impossible to update the repository to a new OpenWrt version without
> producing a good bunch of merge conflicts.

I have go thru this pain every time I do a major upgrade between OpenWRT
releases, but AFAIK there is no real solution, except keeping your diffs
minimal...

You can override packages from openwrt/packages with a package from your
own feeds with the "./scripts/feeds install -f" option (see commit I
quote below), but as openwrt/packages are considered essential packages
and are usually tightly integrated into the whole system, in general
you'd have to update/merge your own overriding package anyhow, so in
practice you might as well change openwrt/packages directly...

Usually, and when done regularly, "git merge upstream-15.05/master"
works, but sometimes it creates merge errors. In this case it can help
to do merge like this, to favour upstream, but keep your own additions:

  git merge -s recursive -X theirs upstream-15.05/master

Followed by thorough diffing to upstream-15.05/master and your own
branch to make sure you keep all necessary changes from both branches.

Anyone who knows a better way, please let us know...

bruno

---
commit 80710b0f2796c0573e78d200ec185e3d8d7db0c8
Author: blogic 
Date:   Mon Feb 9 12:09:23 2015 +

build: allow openwrt.git packages to be replaced by feeds

Currently, replacing a package available in openwrt.git requires
modifications in openwrt.git, or requires duplicating the package in a
feed but with a different name, which causes all kind of problems
related to dependencies (all packages selecting it would have to be
modified accordingly to select the new package).

With this change, if a package with the same name is present both in
feeds/ and package/ folders, the one in feeds/ can override the one
in package/, both in the menuconfig and during the build, by passing the
"-f" option to "./scripts/feeds install"

This mechanism is particularly useful for vendor tree, or in general for
application which needs to replace one particular package which exists
within openwrt.git by a custom/newer version.

Signed-off-by: Mathieu Olivari 
---
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] AP121 target: fix board detection in ar71xx.sh

2015-09-16 Thread Attila Lendvai

Signed-off-by: Attila Lendvai 
---
 target/linux/ar71xx/base-files/lib/ar71xx.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh 
b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index cacf362..d879a4b 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -344,7 +344,7 @@ ar71xx_board_detect() {
*AP113)
name="ap113"
;;
-   *AP121)
+   *"AP121 reference board")
name="ap121"
;;
*AP121-MINI)
-- 
2.1.4
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH] AP121 target: fix board detection in ar71xx.sh

2015-09-16 Thread Attila Lendvai

> the patch needs to be sent inline. the email needs to have the subject
> and description that is currently int he attachment.

ok, i've sent it again using git send-email.

the new patch is at: https://patchwork.ozlabs.org/patch/518448/

-- 
• attila lendvai
• PGP: 963F 5D5F 45C7 DFCD 0A39
--
“If you argue and rankle and contradict, you may achieve a victory
sometimes; but it will be an empty victory because you will never get
your opponent's good will.”
— Benjamin Franklin (1706–1790)
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [OpenWrt-Commits] r46981 - trunk/target/linux/generic/patches-3.18

2015-09-16 Thread Florian Fainelli

On 16/09/15 05:08, openwrt-comm...@openwrt.org wrote:
> Author: blogic
> Date: 2015-09-16 14:08:05 +0200 (Wed, 16 Sep 2015)
> New Revision: 46981
> 
> Modified:
>trunk/target/linux/generic/patches-3.18/652-atm_header_changes.patch
> Log:
> kernel: properly guard the lantiq atm abi hack with an ifdef

Would not it make sense to move this to target/linux/lantiq now that
this is target-specific?

> 
> Signed-off-by: John Crispin 
> 
> Modified: trunk/target/linux/generic/patches-3.18/652-atm_header_changes.patch
> ===
> --- trunk/target/linux/generic/patches-3.18/652-atm_header_changes.patch  
> 2015-09-16 09:37:39 UTC (rev 46980)
> +++ trunk/target/linux/generic/patches-3.18/652-atm_header_changes.patch  
> 2015-09-16 12:08:05 UTC (rev 46981)
> @@ -1,12 +1,14 @@
>  --- a/include/uapi/linux/atm.h
>  +++ b/include/uapi/linux/atm.h
> -@@ -154,6 +154,9 @@
> +@@ -154,6 +154,11 @@
>   unsigned int adtf  :10; /* ACR Decrease Time Factor (10-bit) */
>   unsigned int cdf   :3;  /* Cutoff Decrease Factor (3-bit) */
>   unsigned int spare :9;  /* spare bits */ 
> ++#ifdef CONFIG_LANTIQ
>  +int scr;/* sustained rate in cells per second */
>  +int mbs;/* maximum burst size (MBS) in cells */
>  +int cdv;/* Cell delay varition */
> ++#endif
>   };
>   
>   struct atm_qos {
> ___
> openwrt-commits mailing list
> openwrt-comm...@lists.openwrt.org
> https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
> 
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [OpenWrt-Commits] r46981 - trunk/target/linux/generic/patches-3.18

2015-09-16 Thread John Crispin



On 16/09/2015 21:10, Florian Fainelli wrote:
> On 16/09/15 05:08, openwrt-comm...@openwrt.org wrote:
>> Author: blogic
>> Date: 2015-09-16 14:08:05 +0200 (Wed, 16 Sep 2015)
>> New Revision: 46981
>>
>> Modified:
>>trunk/target/linux/generic/patches-3.18/652-atm_header_changes.patch
>> Log:
>> kernel: properly guard the lantiq atm abi hack with an ifdef
> 
> Would not it make sense to move this to target/linux/lantiq now that
> this is target-specific?

no because then it wont be part of the kernel-headers and linux-atm will
not see it


> 
>>
>> Signed-off-by: John Crispin 
>>
>> Modified: 
>> trunk/target/linux/generic/patches-3.18/652-atm_header_changes.patch
>> ===
>> --- trunk/target/linux/generic/patches-3.18/652-atm_header_changes.patch 
>> 2015-09-16 09:37:39 UTC (rev 46980)
>> +++ trunk/target/linux/generic/patches-3.18/652-atm_header_changes.patch 
>> 2015-09-16 12:08:05 UTC (rev 46981)
>> @@ -1,12 +1,14 @@
>>  --- a/include/uapi/linux/atm.h
>>  +++ b/include/uapi/linux/atm.h
>> -@@ -154,6 +154,9 @@
>> +@@ -154,6 +154,11 @@
>>  unsigned int adtf  :10; /* ACR Decrease Time Factor (10-bit) */
>>  unsigned int cdf   :3;  /* Cutoff Decrease Factor (3-bit) */
>>   unsigned int spare :9;  /* spare bits */ 
>> ++#ifdef CONFIG_LANTIQ
>>  +   int scr;/* sustained rate in cells per second */
>>  +   int mbs;/* maximum burst size (MBS) in cells */
>>  +   int cdv;/* Cell delay varition */
>> ++#endif
>>   };
>>   
>>   struct atm_qos {
>> ___
>> openwrt-commits mailing list
>> openwrt-comm...@lists.openwrt.org
>> https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
>>
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] i2c device not in /dev

2015-09-16 Thread Baptiste Clenet

Works now! Think the .dts wasn't taken into account correctly.

2015-09-15 17:32 GMT+02:00 Baptiste Clenet :
> 2015-09-15 13:57 GMT+02:00 Baptiste Clenet :
>> 2015-09-14 20:17 GMT+02:00 John Crispin :
>>>
>>>
>>> On 14/09/2015 20:09, Daniel Golle wrote:
 On Mon, Sep 14, 2015 at 07:47:08PM +0200, John Crispin wrote:
> On 14/09/2015 19:28, Baptiste Clenet wrote:
>> Hi,
>>
>> I'm using a MT7628 chip and I try to implement an I2C device which
>> will use i2c-ralink adapter. I registered my i2c device with
>> module_i2c_driver(i2c_device_driver);
>>
>> I can see it on my bus:
>> ./sys/bus/i2c/drivers/i2c_device_driver
>> But it doesn't appear in /dev.
>>
>> What am I doing wrong?
>>
>> Regards,
>>
>
> you are missing CONFIG_I2C_CHARDEV in the kernel config

 or maybe i2c-dev isn't loaded? try
 modprobe i2c-dev

>>>
>>> i2c-dev is part of i2c-core if that symbol is selected. i2c-core uses
>>> AutoLoad and not AutoProbe so it should always load.
>>
>> Thnaks for the answer.
>>
>> i2c-dev and i2c-core are loaded as well as i2c-ralink and my i2c
>> driver. How to add CONFIG_I2C_CHARDEV? I added it in
>> /target/linux/ramips config file of my board but it hasn't changed
>> anything. How may I check that the config has really been added?
>>
>> By the way, is there a similar CONFIG for SPI, like CONFIG_SPI_CHARDEV ?
>>
>>>
>>> John
>>> ___
>>> openwrt-devel mailing list
>>> openwrt-devel@lists.openwrt.org
>>> https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
>>
>>
>>
>> --
>> Baptiste
>
>
> Actually, here is my configuration:
> I've got my driver in /sys/bus/i2c/drivers
> Nothing in /sys/bus/i2c/devices
> Nothing in /sys/class/i2c-dev as well.
>
> Concerning CONFIG_I2C_CHARDEV, it seems that it is automatically added
> with i2c-core so it should be compiled in my distrib. (Do you know how
> I can check?)
>
> Cheers,
>
>
> --
> Baptiste

The probleme was not in my driver file but in the adapter file,
i2c-dev.h was not included.

-- 
Baptiste
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH v2] opkg: Extend 'opkg list' command to optionally display package size

Re: [OpenWrt-Devel] [PATCH v2] opkg: Extend 'opkg list' command to optionally display package size

[OpenWrt-Devel] [PATCH v2] opkg: Extend 'opkg list' command to optionally display package size

[OpenWrt-Devel] [PATCH 2/3] mac80211: cleanup sort

[OpenWrt-Devel] [PATCH 1/3] mac80211: cleanup remove net prefixes

[OpenWrt-Devel] [PATCH 3/3] mac80211: rename iwlagn to iwlwifi

Re: [OpenWrt-Devel] OpenWrt /etc/hotplug.d/button/00-wps

Re: [OpenWrt-Devel] [PATCH procd] move /dev/shm to /tmp/shm

Re: [OpenWrt-Devel] [PATCH 4/6] generic: fix unrecognized opcode wsbh when building for MIPS16.

Re: [OpenWrt-Devel] [PATCH] opkg: Extend 'opkg list' command to optionally display package size

[OpenWrt-Devel] [PATCH v3] opkg: Extend 'opkg list' command to optionally display package size

Re: [OpenWrt-Devel] OpenWrt /etc/hotplug.d/button/00-wps

Re: [OpenWrt-Devel] [PATCH 1/1] sysupgrade, wndr3700/wndr3800: Add allnet safety check

Re: [OpenWrt-Devel] [PATCH 1/2 v2] mac80211: cleanup remove net prefixes

Re: [OpenWrt-Devel] OpenWrt /etc/hotplug.d/button/00-wps

Re: [OpenWrt-Devel] [PATCH 7/7] mac80211: rename iwlagn to iwlwifi

Re: [OpenWrt-Devel] [PATCH] include: download.mk: If checkouts fail, attempt default download method

Re: [OpenWrt-Devel] [PATCH] musl: fix build on sh3

Re: [OpenWrt-Devel] [PATCH v2 4/4] ramips: Fix pinmux functions for MT7621

Re: [OpenWrt-Devel] [PATCH] musl: fix build on sh3

[OpenWrt-Devel] Warning: ABI breakage - rebuild your ATM trees

Re: [OpenWrt-Devel] OpenWrt /etc/hotplug.d/button/00-wps

Re: [OpenWrt-Devel] OpenWrt /etc/hotplug.d/button/00-wps

Re: [OpenWrt-Devel] Warning: ABI breakage - rebuild your ATM trees

Re: [OpenWrt-Devel] Warning: ABI breakage - rebuild your ATM trees

Re: [OpenWrt-Devel] Warning: ABI breakage - rebuild your ATM trees

Re: [OpenWrt-Devel] [PATCH] include: download.mk: If checkouts fail, attempt default download method

Re: [OpenWrt-Devel] Project specific settings

[OpenWrt-Devel] [PATCH] AP121 target: fix board detection in ar71xx.sh

Re: [OpenWrt-Devel] [PATCH] AP121 target: fix board detection in ar71xx.sh

Re: [OpenWrt-Devel] [OpenWrt-Commits] r46981 - trunk/target/linux/generic/patches-3.18

Re: [OpenWrt-Devel] [OpenWrt-Commits] r46981 - trunk/target/linux/generic/patches-3.18

Re: [OpenWrt-Devel] i2c device not in /dev

33 matches

Site Navigation

Mail list logo

Footer information