Re: [OpenWrt-Devel] Build failing of eglibc
On 10/30/10 1:56 PM, Philip Prindeville wrote: I'm doing a build after syncing up a couple of hours ago... Last change rev is 23715. It fails on eglibc: ... make subdir=nscd -C nscd ..=../ subdir_install make[6]: Entering directory `/home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495/libc/nscd' /usr/bin/install -c -m 644 /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/gnu/option-groups.h /home/philipp/openwrt2/staging_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/include/gnu/option-groups.h i486-openwrt-linux-gnu-gcc -pie -Wl,-O1 -nostdlib -nostartfiles -o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nscd/nscd -Wl,-dynamic-linker=/lib/ld-linux.so.2 -Wl,-z,combreloc -Wl,-z,relro -Wl,-z,now -Wl,--hash-style=both /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/csu/Scrt1.o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/csu/crti.o `i486-openwrt-linux-gnu-gcc --print-file-name=crtbeginS.o` /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nscd/nscd.o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nscd/connections.o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nscd/pwdcache.o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nscd/getpwn am _r.o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nscd/getpwuid_r.o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nscd/grpcache.o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nscd/getgrnam_r.o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nscd/getgrgid_r.o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nscd/hstcache.o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nscd/gethstbyad_r.o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nscd/gethstbynm3_r.o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nscd/getsrvbynm_r.o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc - 2.12-r10495-final/nscd/getsrvbypt_r.o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nscd/servicescache.o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nscd/dbg_log.o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nscd/nscd_conf.o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nscd/nscd_stat.o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nscd/cache.o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nscd/mem.o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nscd/nscd_setup_thread.o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nscd/xmalloc.o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5. 1 _eglibc-2.12/eglibc-2.12-r10495-final/nscd/xstrdup.o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nscd/aicache.o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nscd/initgrcache.o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nscd/gai.o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nscd/res_hconf.o /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/rt/librt.so /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nptl/libpthread_nonshared.a /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nptl/libpthread.so /home/philipp/openwrt2/build_dir/toolchain-i386_gcc-4.5.1_eglibc-2.12/eglibc-2.12-r10495-final/nis/libnsl.so -Wl,-rpath-link=/home/philipp/openwrt2/ b
[OpenWrt-Devel] [PATCH] add input subsystem to hotplug rules
This patch adds the input subsystem to the hotplug rules, making it possible to
react on the addition of input devices (e.g. USB numpads).
Signed-off-by: Stefan Tomanek stefan.tomanek+open...@wertarbyte.de
---
package/hotplug2/files/hotplug2.rules |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/hotplug2/files/hotplug2.rules
b/package/hotplug2/files/hotplug2.rules
index e8847f2..9800658 100644
--- a/package/hotplug2/files/hotplug2.rules
+++ b/package/hotplug2/files/hotplug2.rules
@@ -1,6 +1,6 @@
$include /etc/hotplug2-common.rules
-SUBSYSTEM ~~ (net|button|usb|platform|ieee1394|block|atm) {
+SUBSYSTEM ~~ (net|input|button|usb|platform|ieee1394|block|atm) {
exec /sbin/hotplug-call %SUBSYSTEM%
}
--
1.7.1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [package] add triggerhappy hotkey daemon
Triggerhappy is a lightweight hotkey daemon that can launch arbitrary commands
on input events. It supports the hotplugging of devices and the processing of
key combinations.
Signed-off-by: Stefan Tomanek stefan.tomanek+open...@wertarbyte.de
---
utils/triggerhappy/Makefile| 49
utils/triggerhappy/files/triggerhappy-example.conf | 15 ++
utils/triggerhappy/files/triggerhappy.hotplug | 15 ++
utils/triggerhappy/files/triggerhappy.init | 10
4 files changed, 89 insertions(+), 0 deletions(-)
create mode 100644 utils/triggerhappy/Makefile
create mode 100644 utils/triggerhappy/files/triggerhappy-example.conf
create mode 100644 utils/triggerhappy/files/triggerhappy.hotplug
create mode 100644 utils/triggerhappy/files/triggerhappy.init
diff --git a/utils/triggerhappy/Makefile b/utils/triggerhappy/Makefile
new file mode 100644
index 000..41092a6
--- /dev/null
+++ b/utils/triggerhappy/Makefile
@@ -0,0 +1,49 @@
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=triggerhappy
+PKG_VERSION:=0.1.3
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://github.com/wertarbyte/triggerhappy/tarball/release/
+PKG_MD5SUM:=7da137a7d2ba1ce396231e821e68de4e
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/wertarbyte-triggerhappy-f7c4216/
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/triggerhappy
+ SECTION:=utils
+ CATEGORY:=Utilities
+ TITLE:=execute commands when a key or switch is pressed, released or hold
down
+ URL:=http://github.com/wertarbyte/triggerhappy
+endef
+
+define Package/triggerhappy/description
+ triggerhappy - execute commands when a key or switched is pressed, or
hold down
+endef
+
+MAKE_FLAGS += \
+ $(TARGET_CONFIGURE_OPTS) \
+ $(1)
+
+define Package/triggerhappy/install
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_DIR) $(1)/etc
+ $(INSTALL_DIR) $(1)/etc/init.d
+ $(INSTALL_DIR) $(1)/etc/triggerhappy
+ $(INSTALL_DIR) $(1)/etc/triggerhappy/triggers.d/
+ $(INSTALL_DIR) $(1)/etc/hotplug.d/input/
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/thd $(1)/usr/sbin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/th-cmd $(1)/usr/sbin
+ $(INSTALL_BIN) ./files/triggerhappy.init $(1)/etc/init.d/triggerhappy
+ $(INSTALL_BIN) ./files/triggerhappy.hotplug
$(1)/etc/hotplug.d/input/10-triggerhappy
+ $(INSTALL_BIN) ./files/triggerhappy-example.conf
$(1)/etc/triggerhappy/triggers.d/example.conf
+endef
+
+$(eval $(call BuildPackage,triggerhappy))
diff --git a/utils/triggerhappy/files/triggerhappy-example.conf
b/utils/triggerhappy/files/triggerhappy-example.conf
new file mode 100644
index 000..bcff574
--- /dev/null
+++ b/utils/triggerhappy/files/triggerhappy-example.conf
@@ -0,0 +1,15 @@
+# This is an example configuration for the triggerhappy daemon (thd)
+# please note that every file to be processed must end in .conf
+#
+# To view a list of supported event codes, use thd --listevents or
+# thd --dump /dev/input/event*
+#
+# Format:
+# eventcode value command
+#
+# values for key events are 1 (pressed), 0 (released) or 2 (held)
+#
+#
+## control an mpd instance
+# KEY_NEXTSONG 1 /usr/bin/mpc next
+# KEY_PREVSONG 1 /usr/bin/mpc prev
diff --git a/utils/triggerhappy/files/triggerhappy.hotplug
b/utils/triggerhappy/files/triggerhappy.hotplug
new file mode 100644
index 000..78ad349
--- /dev/null
+++ b/utils/triggerhappy/files/triggerhappy.hotplug
@@ -0,0 +1,15 @@
+#!/bin/sh
+THD_SOCKET=/tmp/triggerhappy.socket
+[ -S $THD_SOCKET ] || exit
+
+case $ACTION in
+ add)
+ DEVICE=/dev/$DEVNAME
+ [ -c $DEVICE ] || exit
+ # offer device to triggerhappy daemon
+ /usr/sbin/th-cmd --socket $THD_SOCKET --add $DEVICE
+ ;;
+remove)
+ # nothing to do
+ ;;
+esac
diff --git a/utils/triggerhappy/files/triggerhappy.init
b/utils/triggerhappy/files/triggerhappy.init
new file mode 100644
index 000..e846d29
--- /dev/null
+++ b/utils/triggerhappy/files/triggerhappy.init
@@ -0,0 +1,10 @@
+#!/bin/sh /etc/rc.common
+START=93
+
+start() {
+ /usr/sbin/thd --socket /tmp/triggerhappy.socket --triggers
/etc/triggerhappy/triggers.d/ --daemon /dev/input/event*
+}
+
+stop() {
+ /usr/sbin/th-cmd --socket /tmp/triggerhappy.socket --quit
+}
--
1.7.1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] lm-sensors package upgrade
Upgrade lm-sensors package. Patch enables compiling applications that
depend on libsensors library.
Signed-off-by: Luka Perkov openwrt --to-- lukaperkov.net
---
Index: lm-sensors/Makefile
===
--- lm-sensors/Makefile (revision 23647)
+++ lm-sensors/Makefile (working copy)
@@ -9,27 +9,27 @@
PKG_NAME:=lm-sensors
PKG_VERSION:=3.2.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=lm_sensors-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://dl.lm-sensors.org/lm-sensors/releases/
PKG_MD5SUM:=829d88fb09d67723fbf42853eb84d1fd
-
+
PKG_BUILD_DIR:=$(BUILD_DIR)/lm_sensors-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
define Package/lm-sensors/Default
- SECTION:=utils
- CATEGORY:=Utilities
- TITLE:=lm-sensors
DEPENDS:=+sysfsutils
URL:=http://www.lm-sensors.org/
endef
define Package/lm-sensors
$(call Package/lm-sensors/Default)
- TITLE+=(programs)
+ SECTION:=utils
+ CATEGORY:=Utilities
+ TITLE:=lm-sensors
DEPENDS+=+libsensors
endef
@@ -37,7 +37,7 @@
$(call Package/lm-sensors/Default)
SECTION:=libs
CATEGORY:=Libraries
- TITLE+=libraries
+ TITLE:=libsensors
endef
define Package/lm-sensors/description
@@ -49,11 +49,12 @@
endef
define Package/lm-sensors/conffiles
-/etc/sensors.conf
+ /etc/sensors.conf
endef
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
+ $(TARGET_CONFIGURE_OPTS) \
KERNELVERSION=$(LINUX_VERSION) \
LINUX=$(LINUX_DIR) \
CC=$(TARGET_CC) \
@@ -63,6 +64,17 @@
user
endef
+define Build/InstallDev
+ mkdir -p $(1)/usr/include/sensors
+ $(CP) \
+ $(PKG_BUILD_DIR)/lib/sensors.h \
+ $(1)/usr/include/sensors
+ mkdir -p $(1)/usr/lib
+ $(CP) \
+ $(PKG_BUILD_DIR)/lib/libsensors.{a,so*} \
+ $(1)/usr/lib/
+endef
+
define Package/lm-sensors/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/prog/sensors/sensors $(1)/usr/sbin/
@@ -76,6 +88,5 @@
$(CP) $(PKG_BUILD_DIR)/lib/libsensors.so* $(1)/usr/lib/
endef
-
$(eval $(call BuildPackage,lm-sensors))
$(eval $(call BuildPackage,libsensors))
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v2 1/4] Firmware-utils: Add support for board id overrides for bcm63xx.
Add a switch for using the information1 field to hardcode a board
id in the bcm tag for boards that don't provide any usable
identification but need special handling.
Signed-off-by: Jonas Gorski jonas.gorski+open...@gmail.com
---
tools/firmware-utils/src/imagetag.c | 19 ++-
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/tools/firmware-utils/src/imagetag.c
b/tools/firmware-utils/src/imagetag.c
index 1fb45e9..bfed81f 100644
--- a/tools/firmware-utils/src/imagetag.c
+++ b/tools/firmware-utils/src/imagetag.c
@@ -130,7 +130,8 @@ int tagfile(const char *kernel, const char *rootfs, const
char *bin,
const char *boardid, const char *chipid, const uint32_t fwaddr,
const uint32_t loadaddr, const uint32_t entry,
const char *ver, const char *magic2, const uint32_t flash_bs,
- const char *rsignature, const char *layoutver)
+ const char *rsignature, const char *realboardid,
+ const char *layoutver)
{
struct bcm_tag tag;
struct kernelhdr khdr;
@@ -270,6 +271,10 @@ int tagfile(const char *kernel, const char *rootfs, const
char *bin,
strncpy(tag.rsa_signature, rsignature, RSASIG_LEN);
}
+ if (realboardid) {
+ snprintf(tag.information1, TAGINFO1_LEN, BRD=%s, realboardid);
+ }
+
if (layoutver) {
strncpy(tag.flashLayoutVer, layoutver, TAGLAYOUT_LEN);
}
@@ -302,12 +307,12 @@ int tagfile(const char *kernel, const char *rootfs, const
char *bin,
int main(int argc, char **argv)
{
int c, i;
- char *kernel, *rootfs, *bin, *boardid, *chipid, *magic2, *ver, *tagid,
*rsignature, *layoutver;
+ char *kernel, *rootfs, *bin, *boardid, *chipid, *magic2, *ver, *tagid,
*rsignature, *realboardid, *layoutver;
uint32_t flashstart, fwoffset, loadaddr, entry;
uint32_t fwaddr, flash_bs;
int tagidfound = 0;
- kernel = rootfs = bin = boardid = chipid = magic2 = ver = rsignature =
layoutver = NULL;
+ kernel = rootfs = bin = boardid = chipid = magic2 = ver = rsignature =
realboardid = layoutver = NULL;
entry = 0;
flashstart = DEFAULT_FLASH_START;
@@ -319,7 +324,7 @@ int main(int argc, char **argv)
printf(Copyright (C) 2008 Axel Gembe\n);
printf(Copyright (C) 2009-2010 Daniel Dickinson\n);
- while ((c = getopt(argc, argv, i:f:o:b:c:s:n:v:m:k:l:e:h:r:y:)) !=
-1) {
+ while ((c = getopt(argc, argv, i:f:o:b:c:s:n:v:m:k:l:e:h:r:d:y:)) !=
-1) {
switch (c) {
case 'i':
kernel = optarg;
@@ -360,6 +365,9 @@ int main(int argc, char **argv)
case 'r':
rsignature = optarg;
break;
+ case 'd':
+ realboardid = optarg;
+ break;
case 'y':
layoutver = optarg;
break;
@@ -379,6 +387,7 @@ int main(int argc, char **argv)
fprintf(stderr,-l loadaddr
- Address where the kernel expects to be loaded (defaults to 0x8001)\n);
fprintf(stderr,-e entry
- Address where the kernel entry point will end up\n);
fprintf(stderr,-r signature
- vendor specific signature, for those that need it);
+ fprintf(stderr,-d boardid
- force board detection to this board id\n);
fprintf(stderr,-y layoutver
- Flash Layout Version (2.2x code versions need this));
fprintf(stderr,-h
- Displays this text\n\n);
return 1;
@@ -418,5 +427,5 @@ int main(int argc, char **argv)
}
- return tagfile(kernel, rootfs, bin, boardid, chipid, fwaddr, loadaddr,
entry, ver, magic2, flash_bs, rsignature, layoutver);
+ return tagfile(kernel, rootfs, bin, boardid, chipid, fwaddr, loadaddr,
entry, ver, magic2, flash_bs, rsignature, realboardid, layoutver);
}
--
1.5.6.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v2 2/4] bcm63xx: Add board id override fixup.
Add a fixup for the kernel to check the bcm tag of the image for a board id in
the
information1 field, and use that instead of the supplied one by cfe.
Signed-off-by: Jonas Gorski jonas.gorski+open...@gmail.com
---
.../patches-2.6.35/400-generic_boardid_fixup.patch | 42
1 files changed, 42 insertions(+), 0 deletions(-)
create mode 100644
target/linux/brcm63xx/patches-2.6.35/400-generic_boardid_fixup.patch
diff --git
a/target/linux/brcm63xx/patches-2.6.35/400-generic_boardid_fixup.patch
b/target/linux/brcm63xx/patches-2.6.35/400-generic_boardid_fixup.patch
new file mode 100644
index 000..1053d8b
--- /dev/null
+++ b/target/linux/brcm63xx/patches-2.6.35/400-generic_boardid_fixup.patch
@@ -0,0 +1,42 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -44,6 +44,12 @@
+ #define NEUFBOX4_GPIO_74HC164_CLK 6
+ #define NXP_74HC64_GPIO(X)(NEUFBOX4_EXP_GPIO_BASE + (X))
+
++#define TAG_INFO1_OFFSET 0xa2
++#define TAG_BOARD_MAGIC BRD=
++#define TAG_MAGIC_LEN 4
++#define CFE_OFFSET_64K0x1
++#define CFE_OFFSET_128K 0x2
++
+ static struct bcm963xx_nvram nvram;
+ static unsigned int mac_addr_used;
+ static struct board_info board;
+@@ -1428,6 +1434,16 @@ static void __init neufbox4_nvram_fixup(
+ }
+ }
+
++static void __init boardid_fixup(u8 *boot_addr)
++{
++ u8 *p = boot_addr + TAG_INFO1_OFFSET;
++
++ if (!memcmp(p + CFE_OFFSET_64K, TAG_BOARD_MAGIC, TAG_MAGIC_LEN))
++ memcpy(nvram.name, p + CFE_OFFSET_64K + TAG_MAGIC_LEN,
sizeof(nvram.name));
++ else if (!memcmp(p + CFE_OFFSET_128K, TAG_BOARD_MAGIC, TAG_MAGIC_LEN))
++ memcpy(nvram.name, p + CFE_OFFSET_128K + TAG_MAGIC_LEN,
sizeof(nvram.name));
++}
++
+ /*
+ * early init callback, read nvram data from flash and checksum it
+ */
+@@ -1479,6 +1495,9 @@ void __init board_prom_init(void)
+ /* Fixup broken neufbox4 board name */
+ neufbox4_nvram_fixup();
+
++ /* fixup board id */
++ boardid_fixup(boot_addr);
++
+ /* find board by name */
+ for (i = 0; i ARRAY_SIZE(bcm963xx_boards); i++) {
+ if (strncmp(nvram.name, bcm963xx_boards[i]-name,
--
1.5.6.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v2 3/4] bcm63xx: Add defconfigs.
Port the mechanism for different default configurations from ar71xx and
use the old configuration as the default configuration. This should have
no functional differences to before.
While we are at it, remove the obsolete nat option.
Signed-off-by: Jonas Gorski jonas.gorski+open...@gmail.com
---
.../linux/brcm63xx/base-files/etc/config/network | 19 ---
.../base-files/etc/defconfig/generic/network | 18 ++
.../linux/brcm63xx/base-files/etc/init.d/defconfig | 20
3 files changed, 38 insertions(+), 19 deletions(-)
delete mode 100644 target/linux/brcm63xx/base-files/etc/config/network
create mode 100644
target/linux/brcm63xx/base-files/etc/defconfig/generic/network
create mode 100755 target/linux/brcm63xx/base-files/etc/init.d/defconfig
diff --git a/target/linux/brcm63xx/base-files/etc/config/network
b/target/linux/brcm63xx/base-files/etc/config/network
deleted file mode 100644
index c15fdd8..000
--- a/target/linux/brcm63xx/base-files/etc/config/network
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (C) 2008 OpenWrt.org
-
-config interface loopback
-option ifname lo
-option protostatic
-option ipaddr 127.0.0.1
-option netmask 255.0.0.0
-
-config interface lan
-option type bridge
-option ifname eth1
-option protostatic
-option ipaddr 192.168.1.1
-option netmask 255.255.255.0
-option nat 1
-
-config interface wan
- option ifname eth0
- option protodhcp
diff --git a/target/linux/brcm63xx/base-files/etc/defconfig/generic/network
b/target/linux/brcm63xx/base-files/etc/defconfig/generic/network
new file mode 100644
index 000..bc2c69b
--- /dev/null
+++ b/target/linux/brcm63xx/base-files/etc/defconfig/generic/network
@@ -0,0 +1,18 @@
+# Copyright (C) 2008 OpenWrt.org
+
+config interface loopback
+option ifname lo
+option protostatic
+option ipaddr 127.0.0.1
+option netmask 255.0.0.0
+
+config interface lan
+option type bridge
+option ifname eth1
+option protostatic
+option ipaddr 192.168.1.1
+option netmask 255.255.255.0
+
+config interface wan
+ option ifname eth0
+ option protodhcp
diff --git a/target/linux/brcm63xx/base-files/etc/init.d/defconfig
b/target/linux/brcm63xx/base-files/etc/init.d/defconfig
new file mode 100755
index 000..5403b7e
--- /dev/null
+++ b/target/linux/brcm63xx/base-files/etc/init.d/defconfig
@@ -0,0 +1,20 @@
+#!/bin/sh /etc/rc.common
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+
+START=05
+
+start() {
+ . /lib/bcm63xx.sh
+
+ local board=$boardname
+
+ [ ! -d /etc/defconfig/$board ] board=generic
+
+ for f in $( ls /etc/defconfig/$board ); do
+ if [ ! -e /etc/config/$f ]; then
+ cp /etc/defconfig/$board/$f /etc/config/
+ fi
+ done
+}
--
1.5.6.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] lm-sensors package upgrade
On Sun, 2010-10-31 at 23:25 +0100, Luka Perkov wrote: +PKG_BUILD_PARALLEL:=1 define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ + $(TARGET_CONFIGURE_OPTS) \ KERNELVERSION=$(LINUX_VERSION) \ LINUX=$(LINUX_DIR) \ CC=$(TARGET_CC) \ @@ -63,6 +64,17 @@ user endef PKG_BUILD_PARALLEL does nothing unless you use the default build macro, or PKG_JOBS. So you either want to $(call Build/Compile/Default) and set the appropriate MAKE_FLAGS, or add PKG_JOBS to your Build/Compile macro. +define Build/InstallDev + mkdir -p $(1)/usr/include/sensors I think you should use $(INSTALL_DIR) instead of mkdir -p. -- Greetings Michael. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] fix gnuplot compile error
Hi this patch add intl, iconv patch to TARGET FLAGS, add intl and iconv to DEPENDS. attach is the patch. this patch is base on : URL: svn://svn.openwrt.org/openwrt/packages Repository Root: svn://svn.openwrt.org/openwrt Repository UUID: 3c298f89-4303-0410-b956-a3cf2f4a3e73 Revision: 23742 -- Best Regards Xiangfu Liu http://www.openmobilefree.net Index: Makefile === --- Makefile (revision 23742) +++ Makefile (working copy) @@ -12,9 +12,15 @@ include $(INCLUDE_DIR)/package.mk -EXTRA_LDFLAGS += \ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib +TARGET_CFLAGS += \ + -I$(STAGING_DIR)/usr/lib/libintl/include \ + -I$(STAGING_DIR)/usr/lib/libiconv/include +TARGET_LDFLAGS+= \ + -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ + -L$(STAGING_DIR)/usr/lib/libintl/lib \ + -L$(STAGING_DIR)/usr/lib/libiconv/lib + CONFIGURE_VARS += \ CPPFLAGS=CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++ \ CXXFLAGS=CXXFLAGS -fno-builtin -fno-rtti -nostdinc++ \ @@ -23,7 +29,7 @@ define Package/gnuplot SECTION:=utils CATEGORY:=Utilities - DEPENDS:=+libncurses +uclibcxx +zlib +libpng +libfreetype +libgd + DEPENDS:=+libncurses +uclibcxx +zlib +libpng +libfreetype +libgd +libintl +libiconv TITLE:=A portable command-line driven graphing utility URL:=http://sourceforge.net/projects/gnuplot/ endef ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Add include leds-net5501 module
On 10/30/10 3:38 PM, Florian Fainelli wrote: Le Friday 15 October 2010 19:18:44, Philip Prindeville a écrit : Trying the following patch, but it's not building the module. What am I missing? Looking closer at the Kconfig dependencies, we should have: LEDS_GPIO_PLATFORM and GPIO_CS5535 enabled for LEDS_NET5501 to be selectable. But LEDS_GPIO can be selected only when the architecture defines CONFIG_GENERIC_GPIO, which is not the case with the current kernel configuration. The other problem is that the default CS5535 GPIO implementation is the one in drivers/char/ instead of the gpiolib in drivers/gpio/ the leds driver relies on. After changing all of these you can successfully build leds-net5501. Applied in r23729. -- Florian Ok, tried the latest image... # insmod leds-net5501 leds_net5501: Unknown symbol platform_device_register (err 0) insmod: can't insert 'leds-net5501': unknown symbol in module, or unknown parameter # What are we missing? ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
