[v3,02/15] openwrt: switch to lede

Submitted by Tim Niemeyer on Feb. 6, 2017, 8:21 p.m.

Details

Message ID 1486412503-18351-3-git-send-email-tim@tn-x.org
State Accepted
Commit dcdd1ec26348350461d35ad46b9124017c82c77c
Headers show

Patch hide | download patch | download mbox 

diff --git a/buildscript b/buildscript
index 152c4c3..59ccb40 100755
--- a/buildscript
+++ b/buildscript
@@ -13,8 +13,8 @@ 
 
 builddir=./build
 
-OPENWRTREV="1fea0d89f5b7867262213fc0ac459c4ab861e465"
-OPENWRTURL="git://git.openwrt.org/15.05/openwrt.git"
+OPENWRTREV="f2b885d82e6e7859f7cc32b557bbd80735e32b47" # LEDE 17.01
+OPENWRTURL="https://git.lede-project.org/source.git"
 PACKAGEREV="d3468397509bc98586712b601502e9ef84e061c6"
 PACKAGEURL="https://github.com/openwrt/packages.git"

Comments

Christian Dresel Feb. 8, 2017, 10:34 p.m. 
Hi

---
christiand@fff-gw-cd1:~/bsp/lede2/firmware$ ./buildscript prepare
Working with bsp/board_ar71xx.bsp
Working with community/franken.cfg

checking out https://git.lede-project.org/source.git to openwrt in
version f2b885d82e6e7859f7cc32b557bbd80735e32b47
Right remote detected
fatal: reference is not a tree: f2b885d82e6e7859f7cc32b557bbd80735e32b47
commitid not found trying to fetch new commits
remote: Counting objects: 1289, done.
remote: Compressing objects: 100% (691/691), done.
remote: Total 1289 (delta 867), reused 921 (delta 589)
Receiving objects: 100% (1289/1289), 2.36 MiB | 0 bytes/s, done.
Resolving deltas: 100% (867/867), completed with 488 local objects.
From https://git.lede-project.org/source
   5c4b2eb..86bd886  lede-17.01 -> origin/lede-17.01
   d2c4041..9eacb9d  master     -> origin/master
You are not currently on a branch. Please specify which
branch you want to merge with. See git-pull(1) for details.

...
---

Das klingt irgendwie ungesund ("fatal: reference is not a tree:"...).
Hab ich beim einspielen was verbummelt oder ist das normal oder...? Habs
mir grad nicht getraut das einfach mal auf gut Glück durchzubauen ;)

Bei mir sieht der Abschnitt nun so aus:

--
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#

builddir=./build

OPENWRTREV="f2b885d82e6e7859f7cc32b557bbd80735e32b47" # LEDE 17.01
OPENWRTURL="https://git.lede-project.org/source.git"
PACKAGEREV="06198d9c8c1ba061a0a5d566545a5c0bbce2b0a4" # lede-17.01
PACKAGEURL="https://github.com/openwrt/packages.git"

## Feed definition [0]: name aka directory, [1]: url, [2]: revision,
[3..n]: patches

#official openwrt packages
OPENWRT=(openwrt
         $PACKAGEURL
         $PACKAGEREV)
OPENWRT_PKGS="gpioctl-sysfs libugpio fastd haserl"
--

mfg

Christian

On 06.02.2017 21:21, Tim Niemeyer wrote:
> Signed-off-by: Tim Niemeyer <tim@tn-x.org>
> ---
> 
> Changes in v3:
> - changed git revision to lede branch
> 
> Changes in v2:
> - update git revision
> 
>  buildscript | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/buildscript b/buildscript
> index 152c4c3..59ccb40 100755
> --- a/buildscript
> +++ b/buildscript
> @@ -13,8 +13,8 @@
>  
>  builddir=./build
>  
> -OPENWRTREV="1fea0d89f5b7867262213fc0ac459c4ab861e465"
> -OPENWRTURL="git://git.openwrt.org/15.05/openwrt.git"
> +OPENWRTREV="f2b885d82e6e7859f7cc32b557bbd80735e32b47" # LEDE 17.01
> +OPENWRTURL="https://git.lede-project.org/source.git"
>  PACKAGEREV="d3468397509bc98586712b601502e9ef84e061c6"
>  PACKAGEURL="https://github.com/openwrt/packages.git"
>  
>
Tim Niemeyer Feb. 9, 2017, 6:41 a.m. 
Hi

Am Mittwoch, den 08.02.2017, 23:34 +0100 schrieb Christian Dresel:
> Hi
> 
> ---
> christiand@fff-gw-cd1:~/bsp/lede2/firmware$ ./buildscript prepare
> Working with bsp/board_ar71xx.bsp
> Working with community/franken.cfg
> 
> checking out https://git.lede-project.org/source.git to openwrt in
> version f2b885d82e6e7859f7cc32b557bbd80735e32b47
> Right remote detected
> fatal: reference is not a tree: f2b885d82e6e7859f7cc32b557bbd80735e32b47
Uff.. Ich hab die commitid nochmal gegen geprüft: passt.

> commitid not found trying to fetch new commits
> remote: Counting objects: 1289, done.
Da fehlt einiges..

> remote: Compressing objects: 100% (691/691), done.
> remote: Total 1289 (delta 867), reused 921 (delta 589)
> Receiving objects: 100% (1289/1289), 2.36 MiB | 0 bytes/s, done.
> Resolving deltas: 100% (867/867), completed with 488 local objects.
> From https://git.lede-project.org/source
>    5c4b2eb..86bd886  lede-17.01 -> origin/lede-17.01
>    d2c4041..9eacb9d  master     -> origin/master
> You are not currently on a branch. Please specify which
> branch you want to merge with. See git-pull(1) for details.

Bei mir:
------------ %< ---------------
reddog@redi7:~/repos/freifunk/firmware$ ./buildscript prepare
Working with bsp/board_ar71xx.bsp
Working with community/franken.cfg

checking out https://git.lede-project.org/source.git to openwrt in version f2b885d82e6e7859f7cc32b557bbd80735e32b47
We need to do a fresh checkout
Klone nach 'openwrt'...
remote: Counting objects: 377222, done.
remote: Compressing objects: 100% (105446/105446), done.
remote: Total 377222 (delta 257804), reused 374501 (delta 255156)
Empfange Objekte: 100% (377222/377222), 126.70 MiB | 24.22 MiB/s, Fertig.
Löse Unterschiede auf: 100% (257804/257804), Fertig.
Prüfe Konnektivität... Fertig.
Note: checking out 'f2b885d82e6e7859f7cc32b557bbd80735e32b47'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

  git checkout -b new_branch_name

HEAD ist jetzt bei f2b885d... bcm53xx: set Netgear R8000 USB LEDs
------------ >% ---------------
-> Alles gut.


> ...
> ---
> 
> Das klingt irgendwie ungesund ("fatal: reference is not a tree:"...).
Ja, tut es. :(

> Hab ich beim einspielen was verbummelt oder ist das normal oder...? Habs
> mir grad nicht getraut das einfach mal auf gut Glück durchzubauen ;)
> 
> Bei mir sieht der Abschnitt nun so aus:
> 
> --
> # This program is distributed in the hope that it will be useful,
> # but WITHOUT ANY WARRANTY; without even the implied warranty of
> # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> # GNU General Public License for more details.
> #
> 
> builddir=./build
> 
> OPENWRTREV="f2b885d82e6e7859f7cc32b557bbd80735e32b47" # LEDE 17.01
> OPENWRTURL="https://git.lede-project.org/source.git"
> PACKAGEREV="06198d9c8c1ba061a0a5d566545a5c0bbce2b0a4" # lede-17.01
> PACKAGEURL="https://github.com/openwrt/packages.git"
> 
> ## Feed definition [0]: name aka directory, [1]: url, [2]: revision,
> [3..n]: patches
> 
> #official openwrt packages
> OPENWRT=(openwrt
>          $PACKAGEURL
>          $PACKAGEREV)
> OPENWRT_PKGS="gpioctl-sysfs libugpio fastd haserl"
> --
------------ %< ---------------
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#

builddir=./build

OPENWRTREV="f2b885d82e6e7859f7cc32b557bbd80735e32b47" # LEDE 17.01
OPENWRTURL="https://git.lede-project.org/source.git"
PACKAGEREV="06198d9c8c1ba061a0a5d566545a5c0bbce2b0a4" # lede-17.01
PACKAGEURL="https://github.com/openwrt/packages.git"

## Feed definition [0]: name aka directory, [1]: url, [2]: revision, [3..n]: patches

#official openwrt packages
OPENWRT=(openwrt
         $PACKAGEURL
         $PACKAGEREV)
OPENWRT_PKGS="gpioctl-sysfs libugpio fastd haserl"
------------ >% ---------------
-> Sieht gut aus.


Hast du vor dem Einspielen ein "./buildscript clean" gemacht?

Da die Source-Quellen geändert sind erkennt das buildscript dies
vermutlich nicht automatisch.

Vielleicht hatte auch der git Server von lede grad Husten und du musst
nur nochmal probieren? Ansonsten gibt es nur noch die Erklärung, dass
irgendwas anderes falsch is, es aber zu früh is das zu erkennen.

Tim


> mfg
> 
> Christian
> 
> On 06.02.2017 21:21, Tim Niemeyer wrote:
> > Signed-off-by: Tim Niemeyer <tim@tn-x.org>
> > ---
> > 
> > Changes in v3:
> > - changed git revision to lede branch
> > 
> > Changes in v2:
> > - update git revision
> > 
> >  buildscript | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/buildscript b/buildscript
> > index 152c4c3..59ccb40 100755
> > --- a/buildscript
> > +++ b/buildscript
> > @@ -13,8 +13,8 @@
> >  
> >  builddir=./build
> >  
> > -OPENWRTREV="1fea0d89f5b7867262213fc0ac459c4ab861e465"
> > -OPENWRTURL="git://git.openwrt.org/15.05/openwrt.git"
> > +OPENWRTREV="f2b885d82e6e7859f7cc32b557bbd80735e32b47" # LEDE 17.01
> > +OPENWRTURL="https://git.lede-project.org/source.git"
> >  PACKAGEREV="d3468397509bc98586712b601502e9ef84e061c6"
> >  PACKAGEURL="https://github.com/openwrt/packages.git"
> >  
> > 
> 
> -- 
> franken-dev mailing list
> franken-dev@freifunk.net
> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
Christian Dresel Feb. 9, 2017, 8:45 a.m. 
Hi

ein ./buildscript clean hat das Problem gelöst. Hab das Zeug eben
durchgebaut und geflasht und es sieht so aus als würde jetzt die
Verbindung zum keyxchange klappen, ich hab peers da :)

Ich teste das jetzt alles nochmal durch, schau mir das Patch nochmal in
ruhe an und dann wirds hoffentlich auch ein review geben.

Für mein MAC Adressen Problem am 1043 v4 wäre ich über Hilfe noch dankbar ;)

mfg

Christian

On 09.02.2017 07:41, Tim Niemeyer wrote:
> Hi
> 
> Am Mittwoch, den 08.02.2017, 23:34 +0100 schrieb Christian Dresel:
>> Hi
>>
>> ---
>> christiand@fff-gw-cd1:~/bsp/lede2/firmware$ ./buildscript prepare
>> Working with bsp/board_ar71xx.bsp
>> Working with community/franken.cfg
>>
>> checking out https://git.lede-project.org/source.git to openwrt in
>> version f2b885d82e6e7859f7cc32b557bbd80735e32b47
>> Right remote detected
>> fatal: reference is not a tree: f2b885d82e6e7859f7cc32b557bbd80735e32b47
> Uff.. Ich hab die commitid nochmal gegen geprüft: passt.
> 
>> commitid not found trying to fetch new commits
>> remote: Counting objects: 1289, done.
> Da fehlt einiges..
> 
>> remote: Compressing objects: 100% (691/691), done.
>> remote: Total 1289 (delta 867), reused 921 (delta 589)
>> Receiving objects: 100% (1289/1289), 2.36 MiB | 0 bytes/s, done.
>> Resolving deltas: 100% (867/867), completed with 488 local objects.
>> From https://git.lede-project.org/source
>>    5c4b2eb..86bd886  lede-17.01 -> origin/lede-17.01
>>    d2c4041..9eacb9d  master     -> origin/master
>> You are not currently on a branch. Please specify which
>> branch you want to merge with. See git-pull(1) for details.
> 
> Bei mir:
> ------------ %< ---------------
> reddog@redi7:~/repos/freifunk/firmware$ ./buildscript prepare
> Working with bsp/board_ar71xx.bsp
> Working with community/franken.cfg
> 
> checking out https://git.lede-project.org/source.git to openwrt in version f2b885d82e6e7859f7cc32b557bbd80735e32b47
> We need to do a fresh checkout
> Klone nach 'openwrt'...
> remote: Counting objects: 377222, done.
> remote: Compressing objects: 100% (105446/105446), done.
> remote: Total 377222 (delta 257804), reused 374501 (delta 255156)
> Empfange Objekte: 100% (377222/377222), 126.70 MiB | 24.22 MiB/s, Fertig.
> Löse Unterschiede auf: 100% (257804/257804), Fertig.
> Prüfe Konnektivität... Fertig.
> Note: checking out 'f2b885d82e6e7859f7cc32b557bbd80735e32b47'.
> 
> You are in 'detached HEAD' state. You can look around, make experimental
> changes and commit them, and you can discard any commits you make in this
> state without impacting any branches by performing another checkout.
> 
> If you want to create a new branch to retain commits you create, you may
> do so (now or later) by using -b with the checkout command again. Example:
> 
>   git checkout -b new_branch_name
> 
> HEAD ist jetzt bei f2b885d... bcm53xx: set Netgear R8000 USB LEDs
> ------------ >% ---------------
> -> Alles gut.
> 
> 
>> ...
>> ---
>>
>> Das klingt irgendwie ungesund ("fatal: reference is not a tree:"...).
> Ja, tut es. :(
> 
>> Hab ich beim einspielen was verbummelt oder ist das normal oder...? Habs
>> mir grad nicht getraut das einfach mal auf gut Glück durchzubauen ;)
>>
>> Bei mir sieht der Abschnitt nun so aus:
>>
>> --
>> # This program is distributed in the hope that it will be useful,
>> # but WITHOUT ANY WARRANTY; without even the implied warranty of
>> # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>> # GNU General Public License for more details.
>> #
>>
>> builddir=./build
>>
>> OPENWRTREV="f2b885d82e6e7859f7cc32b557bbd80735e32b47" # LEDE 17.01
>> OPENWRTURL="https://git.lede-project.org/source.git"
>> PACKAGEREV="06198d9c8c1ba061a0a5d566545a5c0bbce2b0a4" # lede-17.01
>> PACKAGEURL="https://github.com/openwrt/packages.git"
>>
>> ## Feed definition [0]: name aka directory, [1]: url, [2]: revision,
>> [3..n]: patches
>>
>> #official openwrt packages
>> OPENWRT=(openwrt
>>          $PACKAGEURL
>>          $PACKAGEREV)
>> OPENWRT_PKGS="gpioctl-sysfs libugpio fastd haserl"
>> --
> ------------ %< ---------------
> # This program is distributed in the hope that it will be useful,
> # but WITHOUT ANY WARRANTY; without even the implied warranty of
> # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> # GNU General Public License for more details.
> #
> 
> builddir=./build
> 
> OPENWRTREV="f2b885d82e6e7859f7cc32b557bbd80735e32b47" # LEDE 17.01
> OPENWRTURL="https://git.lede-project.org/source.git"
> PACKAGEREV="06198d9c8c1ba061a0a5d566545a5c0bbce2b0a4" # lede-17.01
> PACKAGEURL="https://github.com/openwrt/packages.git"
> 
> ## Feed definition [0]: name aka directory, [1]: url, [2]: revision, [3..n]: patches
> 
> #official openwrt packages
> OPENWRT=(openwrt
>          $PACKAGEURL
>          $PACKAGEREV)
> OPENWRT_PKGS="gpioctl-sysfs libugpio fastd haserl"
> ------------ >% ---------------
> -> Sieht gut aus.
> 
> 
> Hast du vor dem Einspielen ein "./buildscript clean" gemacht?
> 
> Da die Source-Quellen geändert sind erkennt das buildscript dies
> vermutlich nicht automatisch.
> 
> Vielleicht hatte auch der git Server von lede grad Husten und du musst
> nur nochmal probieren? Ansonsten gibt es nur noch die Erklärung, dass
> irgendwas anderes falsch is, es aber zu früh is das zu erkennen.
> 
> Tim
> 
> 
>> mfg
>>
>> Christian
>>
>> On 06.02.2017 21:21, Tim Niemeyer wrote:
>>> Signed-off-by: Tim Niemeyer <tim@tn-x.org>
>>> ---
>>>
>>> Changes in v3:
>>> - changed git revision to lede branch
>>>
>>> Changes in v2:
>>> - update git revision
>>>
>>>  buildscript | 4 ++--
>>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/buildscript b/buildscript
>>> index 152c4c3..59ccb40 100755
>>> --- a/buildscript
>>> +++ b/buildscript
>>> @@ -13,8 +13,8 @@
>>>  
>>>  builddir=./build
>>>  
>>> -OPENWRTREV="1fea0d89f5b7867262213fc0ac459c4ab861e465"
>>> -OPENWRTURL="git://git.openwrt.org/15.05/openwrt.git"
>>> +OPENWRTREV="f2b885d82e6e7859f7cc32b557bbd80735e32b47" # LEDE 17.01
>>> +OPENWRTURL="https://git.lede-project.org/source.git"
>>>  PACKAGEREV="d3468397509bc98586712b601502e9ef84e061c6"
>>>  PACKAGEURL="https://github.com/openwrt/packages.git"
>>>  
>>>
>>
>> -- 
>> franken-dev mailing list
>> franken-dev@freifunk.net
>> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
>