| Re: Re : [crisos] cris patch for DarwinFox |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/crisos Archives
]
Using the patch gives this errors:
[michele@localhost trunk]$ patch -p0 < openpatch.patch
patching file target/linux/etrax/image/Makefile
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 23.
2 out of 2 hunks FAILED -- saving rejects to file
target/linux/etrax/image/Makefile.rej
patching file update.sh
patching file package/iptables/files/firewall.config
patching file package/base-files/files/etc/passwd
patching file package/util-linux-ng/Makefile
patching file package/foxboard-utils/Makefile
Hunk #2 FAILED at 34.
1 out of 2 hunks FAILED -- saving rejects to file
package/foxboard-utils/Makefile.rej
patching file feeds.conf
Hunk #1 succeeded at 1 with fuzz 2.
[michele@localhost trunk]$
Any idea?
Should the patchh be applied to the devel trunk or official trunk?
Regards
Michele
> Hi all
> yes it's true.. my hope was to include this and other change on
> openwrt svn but some issues arise...
>
> Some of the cahnges of this patch should be re engegnered or upstream
> to openwrt maintainer after the release of 808 kamikaze version.
>
> Using this patch you can update your sdk using update.sh script
> included, it is used as workaround to a know problem yet reported
> on trac ticket system.
>
> Happy hacking!
>
>
> Index: target/linux/etrax/image/Makefile
> ===================================================================
> --- target/linux/etrax/image/Makefile (revisione 11966)
> +++ target/linux/etrax/image/Makefile (copia locale)
> @@ -1,5 +1,5 @@
> #
> -# Copyright (C) 2006 OpenWrt.org
> +# Copyright (C) 2008 CrisOs.org
> #
> # This is free software, licensed under the GNU General Public License
> v2.
> # See /LICENSE for more information.
> @@ -23,17 +23,20 @@
> mkfimage $(KDIR)/vmlinuz $(KDIR)/vmlinuz.tmp
> cat $(KDIR)/vmlinuz.tmp $(KDIR)/root.$(1) > $(KDIR)/fimage.$(1).tmp
> dd if=$(KDIR)/fimage.$(1).tmp of=$(KDIR)/fimage.$(1) bs=$(2) conv=sync
> - cp $(KDIR)/fimage.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(1)-fimage
> + cp $(KDIR)/fimage.$(1) $(BIN_DIR)/crisos-darwinfox-$(1)-$(3)
> +
> endef
>
> define Image/Build/jffs2-64k
> $(call prepare_generic_jffs-64k,$(KDIR)/root.jff2-64k)
> - $(call Image/Build/generic,$(1),4194304)
> + $(call Image/Build/generic,$(1),4194304,4MB)
> + $(call Image/Build/generic,$(1),8388608,8MB)
> endef
>
> define Image/Build/squashfs
> $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
> - $(call Image/Build/generic,$(1),4194304)
> + $(call Image/Build/generic,$(1),4194304,4MB)
> + $(call Image/Build/generic,$(1),8388608,8MB)
> endef
>
> define Image/Build
> Index: update.sh
> ===================================================================
> --- update.sh (revisione 0)
> +++ update.sh (revisione 0)
> @@ -0,0 +1,12 @@
> +#!/bin/sh
> +
> +TMP=`cat ./target/linux/etrax/Makefile`
> +svn revert target/linux/etrax/Makefile
> +svn up
> +./scripts/feeds update
> +cd target/linux/etrax
> +svn up -r 11048
> +
> +echo $TMP > ./target/linux/etrax/Makefile
> +
> +
>
> Proprietà modificate su: update.sh
> ___________________________________________________________________
> Nome: svn:executable
> + *
>
> Index: package/iptables/files/firewall.config
> ===================================================================
> --- package/iptables/files/firewall.config (revisione 11966)
> +++ package/iptables/files/firewall.config (copia locale)
> @@ -44,5 +44,6 @@
> # EXAMPLES:
> #
> # drop:dport=22 src=1.3.3.7
> -# accept:proto=tcp dport=22
> +accept:proto=tcp dport=22
> +accept:proto=tcp dport=80
> # forward:dport=60168:192.168.1.2:60169
> Index: package/base-files/files/etc/passwd
> ===================================================================
> --- package/base-files/files/etc/passwd (revisione 11966)
> +++ package/base-files/files/etc/passwd (copia locale)
> @@ -1,3 +1,3 @@
> -root:!:0:0:root:/root:/bin/ash
> +root:$1$6upaSrHM$W/0IQ8kf7IYxCxEkJQ2D60:0:0:root:/root:/bin/ash
> nobody:*:65534:65534:nobody:/var:/bin/false
> daemon:*:65534:65534:daemon:/var:/bin/false
> Index: package/util-linux-ng/Makefile
> ===================================================================
> --- package/util-linux-ng/Makefile (revisione 11966)
> +++ package/util-linux-ng/Makefile (copia locale)
> @@ -22,7 +22,7 @@
> define Package/util-linux/Default
> SECTION:=utils
> CATEGORY:=Utilities
> - DEPENDS:=@!TARGET_etrax
> + DEPENDS:=
> URL:=http://www.kernel.org/pub/linux/utils/util-linux-ng/
> endef
>
> Index: package/foxboard-utils/Makefile
> ===================================================================
> --- package/foxboard-utils/Makefile (revisione 11966)
> +++ package/foxboard-utils/Makefile (copia locale)
> @@ -4,16 +4,16 @@
> # This is free software, licensed under the GNU General Public License
> v2.
> # See /LICENSE for more information.
> #
> -# $Id: Makefile 7006 2007-04-19 12:06:39Z kaloz $
> +# $Id$
>
> include $(TOPDIR)/rules.mk
>
> PKG_NAME:=foxboard-utils
> -PKG_VERSION:=1
> -PKG_RELEASE:=1
> +PKG_VERSION:=1.0
> +PKG_RELEASE:=2
>
> -PKG_SOURCE:=foxboard-utils.tar.bz2
> -PKG_SOURCE_URL:=http://www.acmesystems.it/download/owrt
> +PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
> +PKG_SOURCE_URL:=http://download.tuxfamily.org/crisos/repository/source/
> PKG_MD5SUM:=
>
> PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
> @@ -34,15 +34,13 @@
> endef
>
> define Build/Compile
> - $(MAKE) -C $(PKG_BUILD_DIR) CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)"
> + $(MAKE) -C $(PKG_BUILD_DIR) CFLAGS=$(TARTGET_CFLAGS) CC=$(TARGET_CC)
> $(MAKE) -C $(PKG_BUILD_DIR) PREFIX="$(PKG_INSTALL_DIR)" install
> endef
>
> define Package/foxboard-utils/install
> $(INSTALL_DIR) $(1)/
> $(CP) $(PKG_INSTALL_DIR)/* $(1)
> - mkdir -p $(1)/www/cgi-bin
> - cd $(1)/www/cgi-bin; ln -s ../../bin/editcgi.cgi .
> endef
>
> $(eval $(call BuildPackage,foxboard-utils))
> Index: feeds.conf
> ===================================================================
> --- feeds.conf (revisione 11966)
> +++ feeds.conf (copia locale)
> @@ -1,2 +1,5 @@
> src-svn packages https://svn.openwrt.org/openwrt/packages
> src-svn xwrt http://x-wrt.googlecode.com/svn/trunk/package
> +src-svn luci
> https://dev.leipzig.freifunk.net/svn/ff-luci/trunk/contrib/package
> +src-svn crisos svn://svn.tuxfamily.org/svnroot/crisos/svn/packages/crisos
> +
>
>
> 2008/7/28, Gilles Doffe <gilles.doffe@xxxxxxxx>:
>> Hi,
>> Same problem here for me.
>> I searched all the site and repository but found nothing. :(
>> I want to test DarwinFox ! ^^
>> Thanks,
>> Gilles
>>
>>
>>
>> ----- Message d'origine ----
>> De : Pieter Steyn <pieterste@xxxxxxxxx>
>> À : crisos@xxxxxxxxxxxxxxxxxxx
>> Envoyé le : Mercredi, 23 Juillet 2008, 12h29mn 08s
>> Objet : [crisos] cris patch for DarwinFox
>>
>> Hi guys,
>>
>> You mention on this page:
>> http://crisos.tuxfamily.org/dokuwiki/doku.php?id=documentation:sdk
>> that there is a patch that can be downloaded from the download page,
>> but I cannot see it there.
>>
>> I've checked the repo out, and haven't seen it in there either.
>>
>> Thanks,
>> Pieter
>>
>> ---
>> CrisOs mailing list
>> Official multi-language http://www.crisos.org/ mailing list
>>
>> For unsubscribe send empty mail to: crisos-request@xxxxxxxxxxxxxxxxxxx
>> with
>> subject unsubscribe.
>>
>>
>>
>>
>> _____________________________________________________________________________
>> Envoyez avec Yahoo! Mail. Une boite mail plus intelligente
>> http://mail.yahoo.fr
>
>
> --
> Claudio
> User linux #415284
> - http://www.crisos.org/
>
> ---
> CrisOs mailing list
> Official multi-language http://www.crisos.org/ mailing list
>
> For unsubscribe send empty mail to: crisos-request@xxxxxxxxxxxxxxxxxxx
> with subject unsubscribe.
>
---
CrisOs mailing list
Official multi-language http://www.crisos.org/ mailing list
For unsubscribe send empty mail to: crisos-request@xxxxxxxxxxxxxxxxxxx with subject unsubscribe.