[OpenWrt-Devel] [PATCH] Adds support for libsocketcan package
Please find a link to a patch for adding libsocketcan package Signed-off-by: Gerhard Bertelsmann info at gerhard-bertelsmann http://lnxpps.de/can2udpe/libsocketcan_patch.txt ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 1/1, V1] Bump klish version to 1.6.0
Le 07/07/2012 09:13, Luka Perkov a écrit : On Fri, Jun 29, 2012 at 06:06:17PM +0200, Emmanuel Deloget wrote: Bump klish version to 1.6.0. You should use buildvariants for this. Take a look at freecwmp: packages/utils/freecwmp/Makefile I will give a look to this in the next hours/days and I will propose another patch. Luka Best regards, -- Emmanuel Deloget ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [RFC][DONT APPLY][PATCH] brcm47xx: BROKEN image for Netgear WNDR4500
--- I tried to use LZMA-compressed loader for LZMA-compressed kernel. We can't juse use CFE's bootloader to load standard LZMA-compressed kernel, because CFE doesn't support LZMA compression with dictionary. Not using dictionary results in not optimal size of compressed kernel. Unfortunately this patch DOES NOT work, booting hangs on Starting program at 0x80001000 Does anyone see any mistake in my code? Hauke? P.S. Don't be angry at me for hardcoding /home/zajec/openwrt.git/staging_dir/host it was quick hack for not-accessible $(STAGING_DIR_HOST) --- target/linux/brcm47xx/image/Makefile | 13 + target/linux/brcm47xx/image/lzma-loader/Makefile |2 +- .../linux/brcm47xx/image/lzma-loader/src/Makefile |5 - 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/target/linux/brcm47xx/image/Makefile b/target/linux/brcm47xx/image/Makefile index b247571..5243b84 100644 --- a/target/linux/brcm47xx/image/Makefile +++ b/target/linux/brcm47xx/image/Makefile @@ -13,12 +13,14 @@ endef define Image/Prepare cat $(KDIR)/vmlinux | $(STAGING_DIR_HOST)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 $(KDIR)/vmlinux.lzma + rm -f $(KDIR)/loader.gz $(MAKE) -C lzma-loader \ BUILD_DIR=$(KDIR) \ TARGET=$(KDIR) \ clean install echo -ne \\x00 $(KDIR)/loader.gz + rm -f $(KDIR)/fs_mark echo -ne '\xde\xad\xc0\xde' $(KDIR)/fs_mark $(call prepare_generic_squashfs,$(KDIR)/fs_mark) @@ -104,10 +106,20 @@ define Image/Build/Chk $(STAGING_DIR_HOST)/bin/mkchkimg -o $(BIN_DIR)/openwrt-$(2)-$(5).chk -k $(BIN_DIR)/$(IMG_PREFIX)-$(1).trx -b $(3) -r $(4) endef +define Image/Build/ChkWNDR4500 + $(STAGING_DIR_HOST)/bin/mkchkimg -o $(BIN_DIR)/openwrt-$(2)-$(5).chk -k $(BIN_DIR)/$(IMG_PREFIX)-$(1)-wndr4500.trx -b $(3) -r $(4) +endef + define Image/Build $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/$(IMG_PREFIX)-$(1).trx \ -f $(KDIR)/loader.gz -f $(KDIR)/vmlinux.lzma \ $(call trxalign/$(1),$(1)) + + # Loader compressed with non-optimal LZMA (without dictionary) - for WNDR4500 + $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/$(IMG_PREFIX)-$(1)-wndr4500.trx \ + -f $(KDIR)/loader.lzma -f $(KDIR)/vmlinux.lzma \ + $(call trxalign/$(1),$(1)) + $(call Image/Build/$(1),$(1)) $(call Image/Build/Motorola,$(1),wr850g,1,$(1)) $(call Image/Build/USR,$(1),usr5461,$(1)) @@ -117,6 +129,7 @@ define Image/Build # $(call Image/Build/Chk,$(1),wndr3400_v1,U12H155T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) # $(call Image/Build/Chk,$(1),wndr3400_vcna,U12H155T01_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) # $(call Image/Build/Chk,$(1),wndr4000,U12H181T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) +# $(call Image/Build/ChkWNDR4500,$(1),wndr4500,U12H189T00_NETGEAR,1,$(patsubst jffs2-%,jffs2,$(1))) $(call Image/Build/Chk,$(1),wnr834b_v2,U12H081T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) # $(call Image/Build/Chk,$(1),wnr2000v2,U12H114T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) # $(call Image/Build/Chk,$(1),wnr3500L,U12H136T99_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) diff --git a/target/linux/brcm47xx/image/lzma-loader/Makefile b/target/linux/brcm47xx/image/lzma-loader/Makefile index 5dd6f50..c274f98 100644 --- a/target/linux/brcm47xx/image/lzma-loader/Makefile +++ b/target/linux/brcm47xx/image/lzma-loader/Makefile @@ -26,7 +26,7 @@ install: ifneq ($(TARGET),) install: compile - $(CP) $(PKG_BUILD_DIR)/loader.gz $(PKG_BUILD_DIR)/loader.elf $(TARGET)/ + $(CP) $(PKG_BUILD_DIR)/loader.gz $(PKG_BUILD_DIR)/loader.lzma $(PKG_BUILD_DIR)/loader.elf $(TARGET)/ endif clean: diff --git a/target/linux/brcm47xx/image/lzma-loader/src/Makefile b/target/linux/brcm47xx/image/lzma-loader/src/Makefile index 3320e56..6de20c5 100644 --- a/target/linux/brcm47xx/image/lzma-loader/src/Makefile +++ b/target/linux/brcm47xx/image/lzma-loader/src/Makefile @@ -34,7 +34,7 @@ SEDFLAGS := s/BZ_TEXT_START/$(BZ_TEXT_START)/;s/TEXT_START/$(TEXT_START)/ OBJECTS:= head.o data.o -all: loader.gz loader.elf +all: loader.gz loader.lzma loader.elf # Don't build dependencies, this may die if $(CC) isn't gcc dep: @@ -44,6 +44,9 @@ install: loader.gz: loader gzip -nc9 $ $@ +loader.lzma: loader + /home/zajec/openwrt.git/staging_dir/host/bin/lzma e -d16 $ $@ + loader.elf: loader.o cp $ $@ -- 1.7.7 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Adds support for libsocketcan package
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi, I copied commented your patch inline below. - --- /dev/null 2012-07-05 10:42:19.287097043 +0200 +++ package/libsocketcan/Makefile 2012-07-05 18:35:26.763462631 +0200 @@ -0,0 +1,62 @@ +# +# Copyright (C) 2006-2012 OpenWrt.org That should only be 2012 +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libsocketcan +PKG_VERSION:=0.0.8 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://www.pengutronix.de/software/libsocketcan/download/ +PKG_MD5SUM:=7fa608d46553c1e33b6b34cab0a83c00 + +include $(INCLUDE_DIR)/package.mk + +define Package/libsocketcan + SECTION:=libs + CATEGORY:=Libraries + TITLE:=socketcan library + URL:=http://www.pengutronix.de/software/libsocketcan/download/ +endef + +define Package/libsocketcan/description + This package contains a library for applications dealing with CAN sockets +endef + +TARGET_CFLAGS += -ffunction-sections $(FPIC) This is redundant, delete the line and move the $(FPIC) below... + +define Build/Compile + $(call Build/Compile/Default) + make -C $(PKG_BUILD_DIR) \ + DESTDIR=$(PKG_INSTALL_DIR) \ + install +endef You can remove the entire Build/Compile override and set PKG_INSTALL:=1 at the top, it does exactly this. + +TARGET_CFLAGS += \ +-ffunction-sections \ +-fdata-sections Add the $(FPIC) here. + +CONFIGURE_VARS += \ +ac_cv_linux_vers=$(LINUX_VERSION) + +MAKE_FLAGS += \ +CCOPT=$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include The include path looks bogus. + + +define Build/InstallDev + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + mkdir -p $(1)/usr/include/libsocketcan What is the empty directory for? +endef + +define Package/libsocketcan/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsocketcan.so.* $(1)/usr/lib/ .so.* does not include .so, is this intended? +endef + +$(eval $(call BuildPackage,libsocketcan)) ~ Jow -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk/6yg0ACgkQdputYINPTPPTewCfTdBFfY2p0RV41KD03Jw/Zj3x XaIAoJYSkcf1qq2Mf9xHQvvVNxjJVda+ =ep96 -END PGP SIGNATURE- ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] mountd: ext4 support
This patch adds the ext4 filesystem support to mountd. Tested with ext2, ext3
and ext4 partitions.
Signed-off-by: Jaroslaw Swierczynski jarek1...@gmail.com
---
diff -ruN trunk.orig/package/mountd/patches/030-ext4_support.patch
trunk/package/mountd/patches/030-ext4_support.patch
--- trunk.orig/package/mountd/patches/030-ext4_support.patch1970-01-01
01:00:00.0 +0100
+++ trunk/package/mountd/patches/030-ext4_support.patch 2012-07-08
19:36:32.0 +0200
@@ -0,0 +1,85 @@
+diff -ruN mountd-0.1.orig/include/fs.h mountd-0.1/include/fs.h
+--- mountd-0.1.orig/include/fs.h 2009-10-02 22:57:04.0 +0200
mountd-0.1/include/fs.h2012-07-08 18:42:32.0 +0200
+@@ -7,5 +7,6 @@
+ #define EFI 7
+ #define NTFS 8
+ #define EXTENDED 9
++#define EXT4 10
+
+ int detect_fs(char *device);
+diff -ruN mountd-0.1.orig/lib/fs.c mountd-0.1/lib/fs.c
+--- mountd-0.1.orig/lib/fs.c 2009-10-02 23:26:22.0 +0200
mountd-0.1/lib/fs.c2012-07-08 19:28:08.0 +0200
+@@ -91,9 +91,14 @@
+ goto out;
+ if(get_le_short(buffer + 56) == 0xEF53)
+ {
+- if((get_le_long(buffer + 96) 0x0008)
+- || (get_le_long(buffer + 92) 0x0004))
+- ret = EXT3;
++ if(get_le_long(buffer + 92) 0x0004)
++ {
++ if ((get_le_long(buffer + 96) 0x040)
++ (get_le_long(buffer + 100) 0x008))
++ ret = EXT3;
++ else
++ ret = EXT4;
++ }
+ else
+ ret = EXT2;
+ }
+diff -ruN mountd-0.1.orig/lib/mount.c mountd-0.1/lib/mount.c
+--- mountd-0.1.orig/lib/mount.c2009-10-03 12:54:57.0 +0200
mountd-0.1/lib/mount.c 2012-07-08 19:04:29.0 +0200
+@@ -53,7 +53,10 @@
+ EXT3,
+ FAT,
+ HFSPLUS,
+- NTFS
++ ,
++ NTFS,
++ ,
++ EXT4
+ };
+
+ #define MAX_MOUNTED 32
+@@ -93,7 +96,7 @@
+ ucix_add_option(ctx, mountd, q-serial, rev, q-rev);
+ snprintf(t, 64, size%d, atoi(q-dev[3]));
+ ucix_add_option(ctx, mountd, q-serial, t, q-size);
+- if(q-fs MBR q-fs = NTFS)
++ if(q-fs MBR q-fs = EXT4)
+ {
+ snprintf(t, 64, fs%d, atoi(q-dev[3]));
+ ucix_add_option(ctx, mountd, q-serial, t,
fs_names[q-fs]);
+@@ -131,7 +134,7 @@
+ {
+ struct mount *mount;
+ char tmp[64], tmp2[64];
+- if(fs = MBR || fs NTFS)
++ if(fs = MBR || fs EXT4)
+ return;
+ mount = malloc(sizeof(struct mount));
+ INIT_LIST_HEAD(mount-list);
+@@ -147,7 +150,7 @@
+ mount-mounted = 0;
+ mount-fs = fs;
+ list_add(mount-list, mounts);
+- if((!mount-ignore) (mount-fs MBR) (mount-fs = NTFS))
++ if((!mount-ignore) (mount-fs MBR) (mount-fs = EXT4))
+ {
+ log_printf(new mount : %s - %s (%s)\n, name, dev,
fs_names[mount-fs]);
+ snprintf(tmp, 64, %s%s, uci_path, name);
+@@ -226,6 +229,11 @@
+ log_printf(mount -t vfat -o rw,uid=1000,gid=1000
/dev/%s %s, mount-dev, tmp);
+ ret = system_printf(mount -t vfat -o
rw,uid=1000,gid=1000 /dev/%s %s, mount-dev, tmp);
+ }
++ if(mount-fs == EXT4)
++ {
++ log_printf(mount -t ext4 -o rw,defaults /dev/%s %s,
mount-dev, tmp);
++ ret = system_printf(mount -t ext4 -o rw,defaults
/dev/%s %s, mount-dev, tmp);
++ }
+ if(mount-fs == EXT3)
+ {
+ log_printf(mount -t ext3 -o rw,defaults /dev/%s %s,
mount-dev, tmp);
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Fwd: [PATCH] Add support for Edimax 3G-6200N
I don't why it happened but my mail client wrapped some of the lines. Sending
patches again as an attachment.
Index: target/linux/ramips/base-files/lib/upgrade/platform.sh
===
--- target/linux/ramips/base-files/lib/upgrade/platform.sh (revision 32505)
+++ target/linux/ramips/base-files/lib/upgrade/platform.sh (working copy)
@@ -14,6 +14,7 @@
[ $ARGC -gt 1 ] return 1
case $board in
+ 3g-6200n | \
all0256n | \
bc2 | \
dir-300-b1 | \
Index: target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
===
--- target/linux/ramips/base-files/lib/preinit/06_set_iface_mac (revision 32505)
+++ target/linux/ramips/base-files/lib/preinit/06_set_iface_mac (working copy)
@@ -8,6 +8,10 @@
. /lib/ramips.sh
case $(ramips_board_name) in
+ 3g-6200n)
+ mac=$(ramips_get_mac_binary factory 4)
+ ifconfig eth0 hw ether $mac 2/dev/null
+ ;;
bc2 |\
esr-9753 |\
freestation5 |\
Index: target/linux/ramips/base-files/lib/ramips.sh
===
--- target/linux/ramips/base-files/lib/ramips.sh (revision 32505)
+++ target/linux/ramips/base-files/lib/ramips.sh (working copy)
@@ -47,6 +47,9 @@
machine=$(awk 'BEGIN{FS=[ \t]+:[ \t]} /machine/ {print $2}' /proc/cpuinfo)
case $machine in
+ *Edimax 3g-6200n)
+ name=3g-6200n
+ ;;
*Allnet ALL0256N)
name=all0256n
;;
Index: target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
===
--- target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom (revision 32505)
+++ target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom (working copy)
@@ -47,7 +47,8 @@
f5d8235-v2)
rt2x00_eeprom_extract u-boot 262144 272
;;
-
+
+ 3g-6200n | \
all0256n | \
argus-atp52b | \
bc2 | \
Index: target/linux/ramips/base-files/etc/uci-defaults/leds
===
--- target/linux/ramips/base-files/etc/uci-defaults/leds (revision 32505)
+++ target/linux/ramips/base-files/etc/uci-defaults/leds (working copy)
@@ -14,6 +14,10 @@
board=$(ramips_board_name)
case $board in
+ 3g-6200n)
+ set_wifi_led edimax:amber:wlan
+ set_usb_led edimax:blue:3g
+ ;;
all0256n)
set_wifi_led rt2800pci-phy0::radio
;;
Index: target/linux/ramips/base-files/etc/uci-defaults/network
===
--- target/linux/ramips/base-files/etc/uci-defaults/network (revision 32505)
+++ target/linux/ramips/base-files/etc/uci-defaults/network (working copy)
@@ -20,7 +20,8 @@
wl-330n)
ucidef_set_interface_lan eth0.1
;;
-
+
+ 3g-6200n | \
argus-atp52b | \
b2c | \
nw718 | \
@@ -89,7 +90,7 @@
all0256n)
lan_mac=$(ramips_get_mac_binary factory 40)
;;
-
+ 3g-6200n | \
argus-atp52b | \
b2c | \
f5d8235-v1 | \
Index: target/linux/ramips/base-files/etc/diag.sh
===
--- target/linux/ramips/base-files/etc/diag.sh (revision 32505)
+++ target/linux/ramips/base-files/etc/diag.sh (working copy)
@@ -30,6 +30,9 @@
get_status_led() {
case $(ramips_board_name) in
+ 3g-6200n)
+ status_led=edimax:green:power
+ ;;
argus-atp52b)
status_led=argus-atp52b:green:run
;;
Index: target/linux/ramips/image/Makefile
===
--- target/linux/ramips/image/Makefile (revision 32505)
+++ target/linux/ramips/image/Makefile (working copy)
@@ -124,6 +124,11 @@
$(call BuildFirmware/Generic/initramfs,$(1),$(2),$(call mkcmdline,$(3),$(4),$(5)) $(call mkmtd/$(6),$(mtdlayout_8M)))
endef
+mtdlayout_edimax_3g6200n=192k(u-boot)ro,64k(u-boot-env)ro,64k(factory)ro,896k(kernel),2752k(rootfs),128k@0x3e(cimage)ro,3648k@0x5(firmware)
+define BuildFirmware/3G6200N
+ $(call BuildFirmware/Generic,$(1),$(2),$(call mkcmdline,$(3),$(4),$(5)) $(call mkmtd/$(6),$(mtdlayout_edimax_3g6200n)),917504,2818048)
+endef
+
mtdlayout_argus_atp52b=192k(bootloader)ro,64k(config),64k(factory),1152k(kernel),6656k(rootfs),7808k@0x5(firmware)
mtd_argus_atp52b_kernel_part_size=1179648
mtd_argus_atp52b_rootfs_part_size=6815744
@@ -312,6 +317,10 @@
#
# RT305X Profiles
#
+define Image/Build/Profile/3G6200N
+ $(call Image/Build/Template/$(fs_squash)/$(1),3G6200N,3g-6200n,3G-6200N,ttyS1,57600,phys)
+endef
+
define Image/Build/Profile/ALL0256N
$(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_4M,all0256n,ALL0256N,ttyS1,57600,spi)
endef
@@ -444,6 +453,7 @@
ifeq ($(CONFIG_RALINK_RT305X),y)
define Image/Build/Profile/Default
+ $(call Image/Build/Profile/3G6200N,$(1))
$(call Image/Build/Profile/ALL0256N,$(1))
$(call Image/Build/Profile/ARGUS_ATP52B,$(1))
$(call Image/Build/Profile/BC2,$(1))
Index: target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h
Re: [OpenWrt-Devel] [RFC][DONT APPLY][PATCH] brcm47xx: BROKEN image for Netgear WNDR4500
On 07/09/2012 01:54 PM, Rafał Miłecki wrote: --- I tried to use LZMA-compressed loader for LZMA-compressed kernel. We can't juse use CFE's bootloader to load standard LZMA-compressed kernel, because CFE doesn't support LZMA compression with dictionary. Not using dictionary results in not optimal size of compressed kernel. Unfortunately this patch DOES NOT work, booting hangs on Starting program at 0x80001000 With lzma e -d16 -a0 I get the same results with OpenWrt's lzma encoder as with Netgear's one from ./tools/lzma. Does anyone see any mistake in my code? Hauke? P.S. Don't be angry at me for hardcoding /home/zajec/openwrt.git/staging_dir/host it was quick hack for not-accessible $(STAGING_DIR_HOST) You should forward $(STAGING_DIR_HOST) to the Makefile or add that to the exec search patch for that Makefile, but I do not know a good solution for doing so. --- target/linux/brcm47xx/image/Makefile | 13 + target/linux/brcm47xx/image/lzma-loader/Makefile |2 +- .../linux/brcm47xx/image/lzma-loader/src/Makefile |5 - 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/target/linux/brcm47xx/image/Makefile b/target/linux/brcm47xx/image/Makefile index b247571..5243b84 100644 --- a/target/linux/brcm47xx/image/Makefile +++ b/target/linux/brcm47xx/image/Makefile @@ -13,12 +13,14 @@ endef define Image/Prepare cat $(KDIR)/vmlinux | $(STAGING_DIR_HOST)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 $(KDIR)/vmlinux.lzma + rm -f $(KDIR)/loader.gz $(MAKE) -C lzma-loader \ BUILD_DIR=$(KDIR) \ TARGET=$(KDIR) \ clean install echo -ne \\x00 $(KDIR)/loader.gz + rm -f $(KDIR)/fs_mark echo -ne '\xde\xad\xc0\xde' $(KDIR)/fs_mark $(call prepare_generic_squashfs,$(KDIR)/fs_mark) @@ -104,10 +106,20 @@ define Image/Build/Chk $(STAGING_DIR_HOST)/bin/mkchkimg -o $(BIN_DIR)/openwrt-$(2)-$(5).chk -k $(BIN_DIR)/$(IMG_PREFIX)-$(1).trx -b $(3) -r $(4) endef +define Image/Build/ChkWNDR4500 + $(STAGING_DIR_HOST)/bin/mkchkimg -o $(BIN_DIR)/openwrt-$(2)-$(5).chk -k $(BIN_DIR)/$(IMG_PREFIX)-$(1)-wndr4500.trx -b $(3) -r $(4) +endef + define Image/Build $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/$(IMG_PREFIX)-$(1).trx \ -f $(KDIR)/loader.gz -f $(KDIR)/vmlinux.lzma \ $(call trxalign/$(1),$(1)) + + # Loader compressed with non-optimal LZMA (without dictionary) - for WNDR4500 + $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/$(IMG_PREFIX)-$(1)-wndr4500.trx \ + -f $(KDIR)/loader.lzma -f $(KDIR)/vmlinux.lzma \ + $(call trxalign/$(1),$(1)) + $(call Image/Build/$(1),$(1)) $(call Image/Build/Motorola,$(1),wr850g,1,$(1)) $(call Image/Build/USR,$(1),usr5461,$(1)) @@ -117,6 +129,7 @@ define Image/Build #$(call Image/Build/Chk,$(1),wndr3400_v1,U12H155T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) #$(call Image/Build/Chk,$(1),wndr3400_vcna,U12H155T01_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) #$(call Image/Build/Chk,$(1),wndr4000,U12H181T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) +#$(call Image/Build/ChkWNDR4500,$(1),wndr4500,U12H189T00_NETGEAR,1,$(patsubst jffs2-%,jffs2,$(1))) $(call Image/Build/Chk,$(1),wnr834b_v2,U12H081T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) #$(call Image/Build/Chk,$(1),wnr2000v2,U12H114T00_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) #$(call Image/Build/Chk,$(1),wnr3500L,U12H136T99_NETGEAR,2,$(patsubst jffs2-%,jffs2,$(1))) diff --git a/target/linux/brcm47xx/image/lzma-loader/Makefile b/target/linux/brcm47xx/image/lzma-loader/Makefile index 5dd6f50..c274f98 100644 --- a/target/linux/brcm47xx/image/lzma-loader/Makefile +++ b/target/linux/brcm47xx/image/lzma-loader/Makefile @@ -26,7 +26,7 @@ install: ifneq ($(TARGET),) install: compile - $(CP) $(PKG_BUILD_DIR)/loader.gz $(PKG_BUILD_DIR)/loader.elf $(TARGET)/ + $(CP) $(PKG_BUILD_DIR)/loader.gz $(PKG_BUILD_DIR)/loader.lzma $(PKG_BUILD_DIR)/loader.elf $(TARGET)/ endif clean: diff --git a/target/linux/brcm47xx/image/lzma-loader/src/Makefile b/target/linux/brcm47xx/image/lzma-loader/src/Makefile index 3320e56..6de20c5 100644 --- a/target/linux/brcm47xx/image/lzma-loader/src/Makefile +++ b/target/linux/brcm47xx/image/lzma-loader/src/Makefile @@ -34,7 +34,7 @@ SEDFLAGS:= s/BZ_TEXT_START/$(BZ_TEXT_START)/;s/TEXT_START/$(TEXT_START)/ OBJECTS := head.o data.o -all: loader.gz loader.elf +all: loader.gz loader.lzma loader.elf # Don't build dependencies, this may die if $(CC) isn't gcc dep: @@ -44,6 +44,9 @@ install: loader.gz: loader gzip -nc9 $ $@ +loader.lzma: loader + /home/zajec/openwrt.git/staging_dir/host/bin/lzma e -d16 $ $@ + loader.elf: loader.o cp $ $@ ___ openwrt-devel
[OpenWrt-Devel] [PATCH] gpsd: update to 3.7
The openwrt specific patches have been merged into gpsd 3.7 and
are no longer needed.
---
net/gpsd/Makefile |4 ++--
net/gpsd/patches/001-add-staging-prefix.patch | 10 --
net/gpsd/patches/002-no_rpath.patch | 11 ---
3 files changed, 2 insertions(+), 23 deletions(-)
delete mode 100644 net/gpsd/patches/001-add-staging-prefix.patch
delete mode 100644 net/gpsd/patches/002-no_rpath.patch
diff --git a/net/gpsd/Makefile b/net/gpsd/Makefile
index 47dd279..ca4983a 100644
--- a/net/gpsd/Makefile
+++ b/net/gpsd/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=gpsd
-PKG_VERSION:=3.6
+PKG_VERSION:=3.7
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://download-mirror.savannah.gnu.org/releases/gpsd
-PKG_MD5SUM:=064a5ad75593f8c3ea3fe85010647832
+PKG_MD5SUM:=52d9785eaf1a51298bb8900dbde88f98
PKG_BUILD_DEPENDS:=libncurses libusb-1.0
diff --git a/net/gpsd/patches/001-add-staging-prefix.patch
b/net/gpsd/patches/001-add-staging-prefix.patch
deleted file mode 100644
index b88171b..000
--- a/net/gpsd/patches/001-add-staging-prefix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
a/SConstruct
-+++ b/SConstruct
-@@ -200,6 +200,7 @@ import_env = (
- 'PATH',# Required for ccache and Coverity scan-build
- 'PKG_CONFIG_PATH', # Set .pc file directory in a crossbuild
- 'STAGING_DIR', # Required by the OpenWRT build.
-+'STAGING_PREFIX', # Required by the OpenWRT build.
- )
- envs = {}
- for var in import_env:
diff --git a/net/gpsd/patches/002-no_rpath.patch
b/net/gpsd/patches/002-no_rpath.patch
deleted file mode 100644
index 38ba782..000
--- a/net/gpsd/patches/002-no_rpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
a/SConstruct
-+++ b/SConstruct
-@@ -269,8 +269,6 @@ def installdir(dir, add_destdir=True):
-
- # Honor the specified installation prefix in link paths.
- env.Prepend(LIBPATH=[installdir('libdir')])
--if env[shared]:
--env.Prepend(RPATH=[installdir('libdir')])
-
- # Give deheader a way to set compiler flags
- if 'MORECFLAGS' in os.environ:
--
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [RFC][DONT APPLY][PATCH] brcm47xx: BROKEN image for Netgear WNDR4500
2012/7/10 Hauke Mehrtens ha...@hauke-m.de:
On 07/09/2012 01:54 PM, Rafał Miłecki wrote:
---
I tried to use LZMA-compressed loader for LZMA-compressed kernel. We
can't juse use CFE's bootloader to load standard LZMA-compressed kernel,
because CFE doesn't support LZMA compression with dictionary.
Not using dictionary results in not optimal size of compressed kernel.
Unfortunately this patch DOES NOT work, booting hangs on
Starting program at 0x80001000
With lzma e -d16 -a0 I get the same results with OpenWrt's lzma
encoder as with Netgear's one from ./tools/lzma.
Hm, so far I didn't play with -a{N}, I didn't have to set it do 0 to
make LZMA-encoded kernel work with Netgear's CFE bootloader. So I
think it doesn't matter, CFE probably works with both LZMA formats:
-a0 and -a1. Just like it does with any values of -lc{N}, -lp{N} and
-pb{N}.
But I'll give it a change if you think it can be important.
--
Rafał
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
