[OpenWrt-Devel] [PATCH 1/1] ppp: version bump to 2.4.5
Bump to the current version of PPP.
A few of the patches are either in 2.4.5 or something functionally equivalent
is, so those patches were removed.
1 patch was added to accommodate pppol2pv3_addr which is referenced in a linux
kernel header file, but isn't defined in the kernel header files packaged with
PPP.
Signed-off-by: Philip Prindeville phil...@redfish-solutions.com
Index: package/ppp/patches/350-survive_bad_pads_packets.patch
===
--- package/ppp/patches/350-survive_bad_pads_packets.patch (revision 27451)
+++ package/ppp/patches/350-survive_bad_pads_packets.patch (working copy)
@@ -1,109 +0,0 @@
a/pppd/plugins/rp-pppoe/common.c
-+++ b/pppd/plugins/rp-pppoe/common.c
-@@ -75,7 +75,9 @@ parsePacket(PPPoEPacket *packet, ParseFu
- error(Invalid PPPoE tag length (%u), tagLen);
- return -1;
- }
-- func(tagType, tagLen, curTag+TAG_HDR_SIZE, extra);
-+ if (func(tagType, tagLen, curTag+TAG_HDR_SIZE, extra)) {
-+ return -1;
-+ }
- curTag = curTag + TAG_HDR_SIZE + tagLen;
- }
- return 0;
a/pppd/plugins/rp-pppoe/discovery.c
-+++ b/pppd/plugins/rp-pppoe/discovery.c
-@@ -48,7 +48,7 @@ static char const RCSID[] =
- *%DESCRIPTION:
- * If a HostUnique tag is found which matches our PID, sets *extra to 1.
- ***/
--void
-+int
- parseForHostUniq(UINT16_t type, UINT16_t len, unsigned char *data,
-void *extra)
- {
-@@ -60,6 +60,7 @@ parseForHostUniq(UINT16_t type, UINT16_t
- *val = 1;
- }
- }
-+return 0;
- }
-
- /**
-@@ -102,7 +103,7 @@ packetIsForMe(PPPoEConnection *conn, PPP
- *%DESCRIPTION:
- * Picks interesting tags out of a PADO packet
- ***/
--void
-+int
- parsePADOTags(UINT16_t type, UINT16_t len, unsigned char *data,
- void *extra)
- {
-@@ -181,6 +182,7 @@ parsePADOTags(UINT16_t type, UINT16_t le
- }
- break;
- }
-+return 0;
- }
-
- /**
-@@ -195,7 +197,7 @@ parsePADOTags(UINT16_t type, UINT16_t le
- *%DESCRIPTION:
- * Picks interesting tags out of a PADS packet
- ***/
--void
-+int
- parsePADSTags(UINT16_t type, UINT16_t len, unsigned char *data,
- void *extra)
- {
-@@ -205,17 +207,21 @@ parsePADSTags(UINT16_t type, UINT16_t le
- dbglog(PADS: Service-Name: '%.*s', (int) len, data);
- break;
- case TAG_SERVICE_NAME_ERROR:
-- fatal(PADS: Service-Name-Error: %.*s, (int) len, data);
-+ error(PADS: Service-Name-Error: %.*s, (int) len, data);
-+ return -1;
- case TAG_AC_SYSTEM_ERROR:
-- fatal(PADS: System-Error: %.*s, (int) len, data);
-+ error(PADS: System-Error: %.*s, (int) len, data);
-+ return -1;
- case TAG_GENERIC_ERROR:
-- fatal(PADS: Generic-Error: %.*s, (int) len, data);
-+ error(PADS: Generic-Error: %.*s, (int) len, data);
-+ return -1;
- case TAG_RELAY_SESSION_ID:
- conn-relayId.type = htons(type);
- conn-relayId.length = htons(len);
- memcpy(conn-relayId.payload, data, len);
- break;
- }
-+return 0;
- }
-
- /***
-@@ -532,9 +538,11 @@ waitForPADS(PPPoEConnection *conn, int t
- /* Is it PADS? */
- if (packet.code == CODE_PADS) {
- /* Parse for goodies */
-- parsePacket(packet, parsePADSTags, conn);
-- conn-discoveryState = STATE_SESSION;
-- break;
-+ if (!parsePacket(packet, parsePADSTags, conn))
-+ {
-+ conn-discoveryState = STATE_SESSION;
-+ break;
-+ }
- }
- } while (conn-discoveryState != STATE_SESSION);
-
a/pppd/plugins/rp-pppoe/pppoe.h
-+++ b/pppd/plugins/rp-pppoe/pppoe.h
-@@ -238,7 +238,7 @@ typedef struct PPPoETagStruct {
- #define READ_CHUNK 4096
-
- /* Function passed to parsePacket */
--typedef void ParseFunc(UINT16_t type,
-+typedef int ParseFunc(UINT16_t type,
- UINT16_t len,
- unsigned char *data,
- void *extra);
Index: package/ppp/patches/104-debian_fix_mschapv2_ppp.patch
===
--- package/ppp/patches/104-debian_fix_mschapv2_ppp.patch (revision 27451)
+++ package/ppp/patches/104-debian_fix_mschapv2_ppp.patch (working copy)
@@ -1,11 +0,0 @@
a/pppd/chap_ms.c
-+++ b/pppd/chap_ms.c
-@@ -852,7 +852,7 @@ ChapMS2(u_char *rchallenge, u_char *Peer
- u_char *p = response[MS_CHAP2_PEER_CHALLENGE];
- int i;
-
--BZERO(response, sizeof(*response));
-+BZERO(response, MS_CHAP2_RESPONSE_LEN);
-
Re: [OpenWrt-Devel] [PATCH] Orion doesn't build anymore
On Tue, 2011-07-05 at 22:47 +0200, Matthias Buecher / Germany wrote: Thanks Maarten, now kernel compiles again. One of your patches had a typo (COFIG instead of CONFIG), corrected it and recreated it for the latest trunk revision. You're welcome, as I said I experienced similar problems just before you did and just created them (although, somehow I got the CONFIG wrong and it still was working...) Since these patches seem work, should I 'officially' submit them as patches to get them patched into the trunk? Greetings, Maarten ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] v4l-utils support
Hello,
Due to the fact that videodev.h was removed from the kernels from
2.6.38 AFAIK, current libv4l seems too old.
The attached patch adds support for v4l-utils (should replace libv4l).
Kind regards,
Maxim
From 87ce6479d65a61419713c491347805be7a48a3ac Mon Sep 17 00:00:00 2001
From: Maxim Osipov maxim.osi...@gmail.com
Date: Sun, 26 Jun 2011 23:27:02 +0100
Subject: [PATCH 1/4] Add flexibity version of v4l-utils
Signed-off-by: Maxim Osipov maxim.osi...@gmail.com
---
v4l-utils/Makefile | 77 +++
v4l-utils/patches/001-libargp.patch | 48 ++
2 files changed, 125 insertions(+), 0 deletions(-)
create mode 100644 v4l-utils/Makefile
create mode 100644 v4l-utils/patches/001-libargp.patch
diff --git a/v4l-utils/Makefile b/v4l-utils/Makefile
new file mode 100644
index 000..d407cc3
--- /dev/null
+++ b/v4l-utils/Makefile
@@ -0,0 +1,77 @@
+#
+# Copyright (C) 2011 Maxim Osipov maxim.osi...@gmail.com
+# Copyright (C) 2009 David Cooper d...@kupesoft.com
+# Copyright (C) 2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=v4l-utils
+PKG_VERSION:=0.8.4
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://linuxtv.org/downloads/v4l-utils/
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/v4l-utils
+ SECTION:=libs
+ CATEGORY:=Libraries
+ TITLE:=Video 4 Linux utilities
+ URL:=http://people.atrpms.net/~hdegoede/
+ DEPENDS:=+libpthread @!LINUX_2_4 +argp-standalone +argtable +libjpeg
+endef
+
+define Package/v4l-utils/description
+ v4l-utils is a collection of libraries which adds a thin abstraction layer on
+ top of video4linux2 devices. The purpose of this (thin) layer is to make it
+ easy for application writers to support a wide variety of devices without
+ having to write separate code for different devices in the same class. libv4l
+ consists of 3 different libraries: libv4lconvert, libv4l1 and libv4l2.
+
+ libv4l1 offers the (deprecated) v4l1 API on top of v4l2 devices, independent
+ of the drivers for those devices supporting v4l1 compatibility (which many
+ v4l2 drivers do not).
+
+ libv4l2 offers the v4l2 API on top of v4l2 devices, while adding for the
+ application transparent libv4lconvert conversion where necessary.
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+define Build/Compile
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ DESTDIR=$(PKG_INSTALL_DIR) PREFIX=/usr \
+ $(CONFIGURE_VARS) \
+ all install
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ DESTDIR=$(PKG_INSTALL_DIR) PREFIX=/usr \
+ $(CONFIGURE_VARS) \
+ LINKTYPE=static \
+ all install
+endef
+
+define Build/InstallDev
+ $(INSTALL_DIR) $(1)/usr/include
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libv4l{1,2,convert}.{a,so*} $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libv4l{1,2,convert}.pc $(1)/usr/lib/pkgconfig/
+endef
+
+define Package/v4l-utils/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libv4l{1,2,convert}.so.* $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+ $(INSTALL_DIR) $(1)/usr/lib/libv4l
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libv4l/v4l{1compat,2convert}.so $(1)/usr/lib/libv4l
+endef
+
+$(eval $(call BuildPackage,v4l-utils))
+
diff --git a/v4l-utils/patches/001-libargp.patch b/v4l-utils/patches/001-libargp.patch
new file mode 100644
index 000..29b28ae
--- /dev/null
+++ b/v4l-utils/patches/001-libargp.patch
@@ -0,0 +1,48 @@
+diff -Nuar v4l-utils-0.8.4-orig/utils/decode_tm6000/Makefile v4l-utils-0.8.4/utils/decode_tm6000/Makefile
+--- v4l-utils-0.8.4-orig/utils/decode_tm6000/Makefile 2011-06-01 12:23:03.0 +0100
v4l-utils-0.8.4/utils/decode_tm6000/Makefile 2011-06-29 23:23:17.721058396 +0100
+@@ -5,7 +5,7 @@
+ -include *.d
+
+ decode_tm6000: decode_tm6000.o ../libv4l2util/libv4l2util.a
+- $(CC) $(LDFLAGS) -o $@ $^
++ $(CC) $(LDFLAGS) -o $@ $^ -largp
+
+ install: $(TARGETS)
+ mkdir -p $(DESTDIR)$(PREFIX)/bin
+diff -Nuar v4l-utils-0.8.4-orig/utils/keytable/Makefile v4l-utils-0.8.4/utils/keytable/Makefile
+--- v4l-utils-0.8.4-orig/utils/keytable/Makefile 2011-06-01 12:23:03.0 +0100
v4l-utils-0.8.4/utils/keytable/Makefile 2011-06-29 23:23:43.041058396 +0100
+@@ -5,7 +5,7 @@
+ -include *.d
+
+ ir-keytable: keytable.o
+- $(CC) $(LDFLAGS) -o $@ $^
++ $(CC) $(LDFLAGS) -o $@ $^ -largp
+
+ keytable.o: keytable.c parse.h
+
+diff -Nuar v4l-utils-0.8.4-orig/utils/v4l2-compliance/Makefile v4l-utils-0.8.4/utils/v4l2-compliance/Makefile
+--- v4l-utils-0.8.4-orig/utils/v4l2-compliance/Makefile 2011-06-01 12:23:03.0 +0100
v4l-utils-0.8.4/utils/v4l2-compliance/Makefile 2011-06-29 23:42:07.217058397 +0100
+@@ -6,7 +6,7 @@
+
+ v4l2-compliance: v4l2-compliance.o v4l2-test-debug.o
Re: [OpenWrt-Devel] [PATCH] Orion doesn't build anymore
On Wed, July 6, 2011 11:54, Maarten Bezemer wrote: On Tue, 2011-07-05 at 22:47 +0200, Matthias Buecher / Germany wrote: Thanks Maarten, now kernel compiles again. One of your patches had a typo (COFIG instead of CONFIG), corrected it and recreated it for the latest trunk revision. You're welcome, as I said I experienced similar problems just before you did and just created them (although, somehow I got the CONFIG wrong and it still was working...) Since these patches seem work, should I 'officially' submit them as patches to get them patched into the trunk? Greetings, Maarten I'm currently at work, and started build run this night. When I'm at home I will see if everything built fine. Maddes ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Rubygems issue
Hello all, I use the board WRT160nl with the following configuration: - OpenWrt backfire 10.03.1-rc4 ar71xx - ruby-core 1.9.2p0, installed from snapshots - gem 1.3.7 The problem is that I got several errors when I try to use gem to install a package. The first error i got was with zlib not been able to load. I realize that the package ruby-zlib didn't install zlib.so and the solution I found for that was to change that package for the one with version ruby-zlib (1.9.1-p376-3). The next problem I can't figure out to solve is this one: root@OpenWrt:/# gem install amqp ERROR: Loading command: install (ArgumentError) unknown encoding name: iso-8859-1 ERROR: While executing gem ... (NameError) uninitialized constant Gem::Commands::InstallCommand I installed the following package but with no help: kmod-nls-base - 2.6.32.25-1 kmod-nls-iso8859-1 - 2.6.32.25-1 kmod-nls-utf8 - 2.6.32.25-1 And I checked they are loaded: Module Size Used byTainted: P nls_iso8859_12832 0 nls_utf8 8160 nls_base4800 3 nls_iso8859_1,nls_utf8,usbcore But I still got the same error. Any ideas? Thanks. Ismael Padron. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Orion doesn't build anymore
On 06.07.2011 11:54, Maarten Bezemer wrote: On Tue, 2011-07-05 at 22:47 +0200, Matthias Buecher / Germany wrote: Thanks Maarten, now kernel compiles again. One of your patches had a typo (COFIG instead of CONFIG), corrected it and recreated it for the latest trunk revision. You're welcome, as I said I experienced similar problems just before you did and just created them (although, somehow I got the CONFIG wrong and it still was working...) Since these patches seem work, should I 'officially' submit them as patches to get them patched into the trunk? Greetings, Maarten After getting rid of Lantiq packages for Orion in r27494, there are still issues related to crypto-hash when enabling Select all packages: make[3]: Entering directory `/home/maddes/openwrt/trunk/package/kernel' IPKG_TMP=/home/maddes/openwrt/trunk/tmp/ipkg IPKG_INSTROOT=/home/maddes/openwrt/trunk/build_dir/target-arm_v5t_uClibc-0.9.32_eabi/root-orion IPKG_CONF_DIR=/home/maddes/openwrt/trunk/staging_dir/target-arm_v5t_uClibc-0.9.32_eabi/etc IPKG_OFFLINE_ROOT=/home/maddes/openwrt/trunk/build_dir/target-arm_v5t_uClibc-0.9.32_eabi/root-orion /home/maddes/openwrt/trunk/staging_dir/host/bin/opkg --offline-root /home/maddes/openwrt/trunk/build_dir/target-arm_v5t_uClibc-0.9.32_eabi/root-orion --force-depends --force-overwrite --force-postinstall --force-maintainer --add-dest root:/ --add-arch all:100 --add-arch orion:200 install /home/maddes/openwrt/trunk/bin/orion/packages/kernel_2.6.37.6-1_orion.ipk Installing kernel (2.6.37.6-1) to root... Configuring kernel. for flag in hold; do IPKG_TMP=/home/maddes/openwrt/trunk/tmp/ipkg IPKG_INSTROOT=/home/maddes/openwrt/trunk/build_dir/target-arm_v5t_uClibc-0.9.32_eabi/root-orion IPKG_CONF_DIR=/home/maddes/openwrt/trunk/staging_dir/target-arm_v5t_uClibc-0.9.32_eabi/etc IPKG_OFFLINE_ROOT=/home/maddes/openwrt/trunk/build_dir/target-arm_v5t_uClibc-0.9.32_eabi/root-orion /home/maddes/openwrt/trunk/staging_dir/host/bin/opkg --offline-root /home/maddes/openwrt/trunk/build_dir/target-arm_v5t_uClibc-0.9.32_eabi/root-orion --force-depends --force-overwrite --force-postinstall --force-maintainer --add-dest root:/ --add-arch all:100 --add-arch orion:200 flag $flag kernel; done Setting flags for package kernel to hold. mkdir -p /home/maddes/openwrt/trunk/bin/orion/packages /home/maddes/openwrt/trunk/build_dir/linux-orion_generic/packages/ipkg-orion/kmod-crypto-hash/CONTROL mkdir -p /home/maddes/openwrt/trunk/build_dir/linux-orion_generic/packages/ipkg-orion/kmod-crypto-hash/lib/modules/2.6.37.6 cp -fpR -L /home/maddes/openwrt/trunk/build_dir/linux-orion_generic/linux-2.6.37.6/crypto/crypto_hash.ko /home/maddes/openwrt/trunk/build_dir/linux-orion_generic/packages/ipkg-orion/kmod-crypto-hash/lib/modules/2.6.37.6/ cp: cannot stat `/home/maddes/openwrt/trunk/build_dir/linux-orion_generic/linux-2.6.37.6/crypto/crypto_hash.ko': No such file or directory make[3]: *** [/home/maddes/openwrt/trunk/bin/orion/packages/kmod-crypto-hash_2.6.37.6-1_orion.ipk] Error 1 make[3]: Leaving directory `/home/maddes/openwrt/trunk/package/kernel' I will try with HASH2 config symbol only, so I will remove HASH config symbol. We'll see. Maddes ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Orion doesn't build anymore
On 06/07/11 20:32, Matthias Buecher / Germany wrote: On 06.07.2011 11:54, Maarten Bezemer wrote: On Tue, 2011-07-05 at 22:47 +0200, Matthias Buecher / Germany wrote: Thanks Maarten, now kernel compiles again. One of your patches had a typo (COFIG instead of CONFIG), corrected it and recreated it for the latest trunk revision. You're welcome, as I said I experienced similar problems just before you did and just created them (although, somehow I got the CONFIG wrong and it still was working...) Since these patches seem work, should I 'officially' submit them as patches to get them patched into the trunk? Greetings, Maarten After getting rid of Lantiq packages for Orion in r27494, there are hi, after applying your ltq-tapi patch earlier, i just reverted it and applied a different fix. if this new fix causes any problems let me know John ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Lantiq TAPI driver also build for other platforms
On 06.07.2011 21:09, John Crispin wrote: On 06/07/11 20:32, Matthias Buecher / Germany wrote: On 06.07.2011 11:54, Maarten Bezemer wrote: On Tue, 2011-07-05 at 22:47 +0200, Matthias Buecher / Germany wrote: Thanks Maarten, now kernel compiles again. One of your patches had a typo (COFIG instead of CONFIG), corrected it and recreated it for the latest trunk revision. You're welcome, as I said I experienced similar problems just before you did and just created them (although, somehow I got the CONFIG wrong and it still was working...) Since these patches seem work, should I 'officially' submit them as patches to get them patched into the trunk? Greetings, Maarten After getting rid of Lantiq packages for Orion in r27494, there are hi, after applying your ltq-tapi patch earlier, i just reverted it and applied a different fix. if this new fix causes any problems let me know John Hi John, I just retested with r27498 and no Lantiq packages were build. Thanks. Maddes ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Lantiq TAPI driver also build for other platforms
Hi John, I just retested with r27498 and no Lantiq packages were build. Thanks. Maddes thx for testing ;) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Orion doesn't build anymore / kmod-crypto-hash and kmod-crypto-core
On 06.07.2011 11:54, Maarten Bezemer wrote: On Tue, 2011-07-05 at 22:47 +0200, Matthias Buecher / Germany wrote: Thanks Maarten, now kernel compiles again. One of your patches had a typo (COFIG instead of CONFIG), corrected it and recreated it for the latest trunk revision. You're welcome, as I said I experienced similar problems just before you did and just created them (although, somehow I got the CONFIG wrong and it still was working...) Since these patches seem work, should I 'officially' submit them as patches to get them patched into the trunk? Greetings, Maarten I rebuild Orion/Generic with r27498, used Select all packages (no feeds installed) and still get an issue with kmod-crypto-hash. By closer looking at the log I found a weird warning message: WARNING: kmod-crypto-core is not available in the kernel config mkdir -p /home/maddes/openwrt/trunk/bin/orion/packages /home/maddes/openwrt/trunk/build_dir/linux-orion_generic/packages/ipkg-orion/kmod-crypto-hash/CONTROL mkdir -p /home/maddes/openwrt/trunk/build_dir/linux-orion_generic/packages/ipkg-orion/kmod-crypto-hash/lib/modules/2.6.37.6 cp -fpR -L /home/maddes/openwrt/trunk/build_dir/linux-orion_generic/linux-2.6.37.6/crypto/crypto_hash.ko /home/maddes/openwrt/trunk/build_dir/linux-orion_generic/packages/ipkg-orion/kmod-crypto-hash/lib/modules/2.6.37.6/ cp: cannot stat `/home/maddes/openwrt/trunk/build_dir/linux-orion_generic/linux-2.6.37.6/crypto/crypto_hash.ko': No such file or directory make[3]: *** [/home/maddes/openwrt/trunk/bin/orion/packages/kmod-crypto-hash_2.6.37.6-1_orion.ipk] Error 1 make[3]: Leaving directory `/home/maddes/openwrt/trunk/package/kernel' ERROR: package/kernel failed to build. ... make[3]: Entering directory `/home/maddes/openwrt/trunk/package/kernel' IPKG_TMP=/home/maddes/openwrt/trunk/tmp/ipkg IPKG_INSTROOT=/home/maddes/openwrt/trunk/build_dir/target-arm_v5t_uClibc-0.9.32_eabi/root-orion IPKG_CONF_DIR=/home/maddes/openwrt/trunk/staging_dir/target-arm_v5t_uClibc-0.9.32_eabi/etc IPKG_OFFLINE_ROOT=/home/maddes/openwrt/trunk/build_dir/target-arm_v5t_uClibc-0.9.32_eabi/root-orion /home/maddes/openwrt/trunk/staging_dir/host/bin/opkg --offline-root /home/maddes/openwrt/trunk/build_dir/target-arm_v5t_uClibc-0.9.32_eabi/root-orion --force-depends --force-overwrite --force-postinstall --force-maintainer --add-dest root:/ --add-arch all:100 --add-arch orion:200 install /home/maddes/openwrt/trunk/bin/orion/packages/kernel_2.6.37.6-1_orion.ipk Installing kernel (2.6.37.6-1) to root... Configuring kernel. for flag in hold; do IPKG_TMP=/home/maddes/openwrt/trunk/tmp/ipkg IPKG_INSTROOT=/home/maddes/openwrt/trunk/build_dir/target-arm_v5t_uClibc-0.9.32_eabi/root-orion IPKG_CONF_DIR=/home/maddes/openwrt/trunk/staging_dir/target-arm_v5t_uClibc-0.9.32_eabi/etc IPKG_OFFLINE_ROOT=/home/maddes/openwrt/trunk/build_dir/target-arm_v5t_uClibc-0.9.32_eabi/root-orion /home/maddes/openwrt/trunk/staging_dir/host/bin/opkg --offline-root /home/maddes/openwrt/trunk/build_dir/target-arm_v5t_uClibc-0.9.32_eabi/root-orion --force-depends --force-overwrite --force-postinstall --force-maintainer --add-dest root:/ --add-arch all:100 --add-arch orion:200 flag $flag kernel; done Setting flags for package kernel to hold. mkdir -p /home/maddes/openwrt/trunk/bin/orion/packages /home/maddes/openwrt/trunk/build_dir/linux-orion_generic/packages/ipkg-orion/kmod-crypto-hash/CONTROL mkdir -p /home/maddes/openwrt/trunk/build_dir/linux-orion_generic/packages/ipkg-orion/kmod-crypto-hash/lib/modules/2.6.37.6 cp -fpR -L /home/maddes/openwrt/trunk/build_dir/linux-orion_generic/linux-2.6.37.6/crypto/crypto_hash.ko /home/maddes/openwrt/trunk/build_dir/linux-orion_generic/packages/ipkg-orion/kmod-crypto-hash/lib/modules/2.6.37.6/ cp: cannot stat `/home/maddes/openwrt/trunk/build_dir/linux-orion_generic/linux-2.6.37.6/crypto/crypto_hash.ko': No such file or directory make[3]: *** [/home/maddes/openwrt/trunk/bin/orion/packages/kmod-crypto-hash_2.6.37.6-1_orion.ipk] Error 1 make[3]: Leaving directory `/home/maddes/openwrt/trunk/package/kernel' make[2]: *** [package/kernel/install] Error 2 Does this make sense to anyone? Maddes ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] net/bind: update to 9.8.0-P4
Signed-off-by: Alexey I. Froloff ra...@altlinux.org
---
net/bind/Makefile |4 +-
net/bind/patches/100-configure-GOST.patch | 13
net/bind/patches/100-cross_compile.patch | 96 -
3 files changed, 15 insertions(+), 98 deletions(-)
create mode 100644 net/bind/patches/100-configure-GOST.patch
delete mode 100644 net/bind/patches/100-cross_compile.patch
diff --git a/net/bind/Makefile b/net/bind/Makefile
index cd46948..8c547d7 100644
--- a/net/bind/Makefile
+++ b/net/bind/Makefile
@@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=bind
-PKG_VERSION:=9.7.2-P3
+PKG_VERSION:=9.8.0-P4
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:= \
ftp://ftp.isc.org/isc/bind9/$(PKG_VERSION) \
http://www.mirrorservice.org/sites/ftp.isc.org/isc/bind9/$(PKG_VERSION)
-PKG_MD5SUM:=b4537cbae38b2daef36775bf49f33db9
+PKG_MD5SUM:=13e36e3f28dc1ce7675b45a4192e8389
PKG_FIXUP:=libtool
diff --git a/net/bind/patches/100-configure-GOST.patch
b/net/bind/patches/100-configure-GOST.patch
new file mode 100644
index 000..aaf7336
--- /dev/null
+++ b/net/bind/patches/100-configure-GOST.patch
@@ -0,0 +1,13 @@
+--- a/configure.in 2011-06-29 19:14:25.053420788 +0400
b/configure.in 2011-06-29 19:26:34.860280457 +0400
+@@ -699,7 +699,9 @@
+ [AC_MSG_RESULT(yes)
+ have_gost=yes],
+ [AC_MSG_RESULT(no)
+- have_gost=no])
++ have_gost=no],
++ [AC_MSG_RESULT(assuming target platform has no GOST support)
++ have_gost=no])
+ case $have_gost in
+ yes)
+ OPENSSL_GOST=yes
diff --git a/net/bind/patches/100-cross_compile.patch
b/net/bind/patches/100-cross_compile.patch
deleted file mode 100644
index 5c51312..000
--- a/net/bind/patches/100-cross_compile.patch
+++ /dev/null
@@ -1,96 +0,0 @@
a/configure
-+++ b/configure
-@@ -22418,8 +22418,7 @@ $as_echo_n checking epoll support...
- { { $as_echo $as_me:$LINENO: error: cannot run test program while cross
compiling
- See \`config.log' for more details. 5
- $as_echo $as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details. 2;}
-- { (exit 1); exit 1; }; }
-+See \`config.log' for more details. 2;} }
- else
- cat conftest.$ac_ext _ACEOF
- /* confdefs.h. */
-@@ -24275,8 +24274,7 @@ if { as_var=$as_ac_File; eval test \\$
- else
- test $cross_compiling = yes
- { { $as_echo $as_me:$LINENO: error: cannot check for file existence when
cross compiling 5
--$as_echo $as_me: error: cannot check for file existence when cross
compiling 2;}
-- { (exit 1); exit 1; }; }
-+$as_echo $as_me: error: cannot check for file existence when cross
compiling 2;} }
- if test -r $devrandom; then
- eval $as_ac_File=yes
- else
-@@ -27949,73 +27947,6 @@ rm -f core conftest.err conftest.$ac_obj
- # which provides some (all?) of the desired functions.
- #
-
--{ $as_echo $as_me:$LINENO: checking for inet_ntop with IPv6 support 5
--$as_echo_n checking for inet_ntop with IPv6 support... 6; }
--if test $cross_compiling = yes; then
-- { $as_echo $as_me:$LINENO: result: assuming inet_ntop needed 5
--$as_echo assuming inet_ntop needed 6; }
-- ISC_EXTRA_OBJS=$ISC_EXTRA_OBJS inet_ntop.$O
-- ISC_EXTRA_SRCS=$ISC_EXTRA_SRCS inet_ntop.c
-- ISC_PLATFORM_NEEDNTOP=#define ISC_PLATFORM_NEEDNTOP 1
--else
-- cat conftest.$ac_ext _ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h conftest.$ac_ext
--cat conftest.$ac_ext _ACEOF
--/* end confdefs.h. */
--
--#include sys/types.h
--#include sys/socket.h
--#include netinet/in.h
--#include arpa/inet.h
--main() {
--char a[16],b[64]; return(inet_ntop(AF_INET6, a, b, sizeof(b)) == (char*)0);}
--_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try=$ac_link
--case (($ac_try in
-- *\* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo=\\$as_me:$LINENO: $ac_try_echo\
--$as_echo $ac_try_echo) 5
-- (eval $ac_link) 25
-- ac_status=$?
-- $as_echo $as_me:$LINENO: \$? = $ac_status 5
-- (exit $ac_status); } { ac_try='./conftest$ac_exeext'
-- { (case (($ac_try in
-- *\* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo=\\$as_me:$LINENO: $ac_try_echo\
--$as_echo $ac_try_echo) 5
-- (eval $ac_try) 25
-- ac_status=$?
-- $as_echo $as_me:$LINENO: \$? = $ac_status 5
-- (exit $ac_status); }; }; then
-- { $as_echo $as_me:$LINENO: result: yes 5
--$as_echo yes 6; }
-- ISC_PLATFORM_NEEDNTOP=#undef ISC_PLATFORM_NEEDNTOP
--else
-- $as_echo $as_me: program exited with status $ac_status 5
--$as_echo $as_me: failed program was: 5
--sed 's/^/| /' conftest.$ac_ext 5
--
--( exit $ac_status )
--{ $as_echo $as_me:$LINENO: result: no 5
--$as_echo no 6; }
-- ISC_EXTRA_OBJS=$ISC_EXTRA_OBJS inet_ntop.$O
-- ISC_EXTRA_SRCS=$ISC_EXTRA_SRCS inet_ntop.c
-- ISC_PLATFORM_NEEDNTOP=#define
