Woof at Github

[Karl Godt]

woof-CE should be ready to build from now. There were some teething problems migrating the repository from fossil to git, I committed the fixes to the testing branch pending a sanity check then will merge with master. Karl, you might be interested in merging the changes into your repository.

Yeah, Mick , I should do .
But am a little unsure how to do this :

I would try with whatever git command to pull the main (master ?) repo into my local repo on the current partition , that likely would overwrite my files (?) and after that pull in my fork into my local repo on the current partition, that would overwrite the files overwritten by the merge of the main repo ..

Suggestions

I'm assuming you haven't created any branches or commited anything.

Code: Select all

 git diff #check if anything has been changed
 #if you did change something, save it.
git checkout -b local
git commit -a -m "My changes"
git checkout master
git checkout -b upstream #create and check out a new branch, named "upstream"
git pull git://github.com/... master #download and merge 

If all goes well, you should be able to merge "upstream" into "local".
Ask for details if that's not clear enough.

Ibidem, thank you very much !
For clarify : I think I clicked on the "fork" button in the firefox webbrowser,
could somehow create a github account, and did

Code: Select all

/usr/git/bin/git clone https://github.com/puppylinux-woof-CE/woof-CE
/usr/git/bin/git clone https://github.com/KarlGodt/woof-CE

puppylinux-woof-CE/woof-CE is located @ /root/WOOF.REPOS.D/WOOF.GIT

and

KarlGodt/woof-CE is located @ /root/WOOF.REPOS.D/KarlGodtWOOF.GIT

on the current partition

and I am only working in my own directory :
# pwd
/root/WOOF.REPOS.D/KarlGodtWOOF.GIT/woof-CE

Ibidem, I am committing to my Fork on github already like this last commit :

Code: Select all

git commit -am "pup_event_backend_modprobe AND pupBOOTfunctions :
> Cleaned up my code from commit e8efbe335ac67eb4db469ac867e3934ea3fa43c7."
[master 82c4417] pup_event_backend_modprobe AND pupBOOTfunctions : Cleaned up my code from commit e8efbe335ac67eb4db469ac867e3934ea3fa43c7.
 2 files changed, 2 insertions(+), 84 deletions(-)
[20:58 0 /bin/bash 18156 46 woof-CE ] 
[puppypc]# git push origin

Then comes a bunch of translated nonsense about warning: 'push.default'
but finally it uploads :

Code: Select all

Counting objects: 17, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (9/9), done.
Writing objects: 100% (9/9), 797 bytes | 0 bytes/s, done.
Total 9 (delta 8), reused 0 (delta 0)
To https://github.com/KarlGodt/woof-CE
   e8efbe3..82c4417  master -> master
[20:58 0 /bin/bash 18156 47 woof-CE ]

[Karl Godt]

Reading here : http://blog.mikepearce.net/2010/05/18/t ... it-rebase/
I did now a

Code: Select all

git branch -a
* master
  shutdown
  remotes/origin/HEAD -> origin/master
  remotes/origin/master

The shutdown branch was created by

Code: Select all

git branch shutdown

while I was playing with the branch command, but have not used that branch and

Code: Select all

ls -A .git/branches

is empty .

[Karl Godt]

Seems solved ..

Code: Select all

git remote add puppylinux-woof-CE https://github.com/puppylinux-woof-CE/woof-CE
git remote -v

origin https://github.com/KarlGodt/woof-CE (fetch)
origin https://github.com/KarlGodt/woof-CE (push)
puppylinux-woof-CE https://github.com/puppylinux-woof-CE/woof-CE (fetch)
puppylinux-woof-CE https://github.com/puppylinux-woof-CE/woof-CE (push)

Code: Select all

git fetch puppylinux-woof-CE

remote: Counting objects: 657, done.
remote: Compressing objects: 100% (207/207), done.
remote: Total 392 (delta 209), reused 301 (delta 119)
Empfange Objekte: 100% (392/392), 62.45 KiB | 0 bytes/s, done.
Löse Unterschiede auf: 100% (209/209), vervollständigt mit 115 lokalen Objekten.
Von https://github.com/puppylinux-woof-CE/woof-CE
* [neuer Branch] master -> puppylinux-woof-CE/master
* [neuer Branch] testing -> puppylinux-woof-CE/testing
Von https://github.com/puppylinux-woof-CE/woof-CE
* [neues Tag] 0.1 -> 0.1
* [neues Tag] woof-CE-0.1 -> woof-CE-0.1

Code: Select all

git branch -r

origin/HEAD -> origin/master
origin/master
puppylinux-woof-CE/master
puppylinux-woof-CE/testing

Code: Select all

git remote show origin

* Remote-Repository origin
URL zum Abholen: https://github.com/KarlGodt/woof-CE
URL zum Versenden: https://github.com/KarlGodt/woof-CE
Hauptbranch: master
Remote-Branch:
master gefolgt
Lokaler Branch konfiguriert für 'git pull':
master führt mit Remote-Branch master zusammen
Lokale Referenz konfiguriert für 'git push':
master versendet nach master (aktuell)

Code: Select all

LC_ALL=C git remote show puppylinux-woof-CE

* remote puppylinux-woof-CE
Fetch URL: https://github.com/puppylinux-woof-CE/woof-CE
Push URL: https://github.com/puppylinux-woof-CE/woof-CE
HEAD branch (remote HEAD is ambiguous, may be one of the following):
master
testing
Remote branches:
master tracked
testing tracked
Local ref configured for 'git push':
master pushes to master (local out of date)

...
Made a backup of my local repo
...

Code: Select all

git pull puppylinux-woof-CE master

Von https://github.com/puppylinux-woof-CE/woof-CE
* branch master -> FETCH_HEAD
Entferne woof-code/rootfs-skeleton/usr/sbin/xrandrshell-OLD
Entferne woof-code/rootfs-skeleton/usr/sbin/timezone-set-OLD
Entferne woof-code/rootfs-skeleton/usr/sbin/partviewOLD
Entferne woof-code/rootfs-skeleton/usr/sbin/mailto.sh
Entferne woof-code/rootfs-skeleton/usr/sbin/importfrompuppy1
Entferne woof-code/rootfs-skeleton/usr/sbin/gaimshell
Entferne woof-code/rootfs-skeleton/usr/sbin/gaim-autosetup.sh
Entferne woof-code/rootfs-skeleton/usr/sbin/countrywizard-OLD
Entferne woof-code/rootfs-skeleton/usr/sbin/chooselocale-OLD
Entferne woof-code/rootfs-skeleton/usr/sbin/burniso2cdTEST
Entferne woof-code/rootfs-skeleton/usr/local/video_upgrade/video_upgrade_wizard-OLD
Entferne woof-code/rootfs-skeleton/usr/local/bin/xdg-open-OLD
Entferne woof-code/rootfs-skeleton/sbin/gtklogfileviewer
Entferne woof-code/rootfs-skeleton/etc/protocols-OLD
Entferne woof-code/rootfs-skeleton/etc/ld.so.cache
Entferne woof-code/rootfs-skeleton/etc/inittabPREV1
Merge made by the 'recursive' strategy.
kernel-kit/DOTconfig | 936 ++++++---
kernel-kit/README | 9 +-
kernel-kit/build.conf | 24 +-
kernel-kit/build.sh | 107 +-
kernel-kit/configs_extra/DOTconfig-3.10.9-slacko | 5352 ++++++++++++++++++++++++++++++++++++++++++++++++
woof-code/boot/makeinitrdgz.sh | 0

+++ 800 more lines , most of them were
mode change 100644 => 120000 woof-code/rootfs-skeleton/usr/share/sounds/illegal_move.ogg
alike .

My files apparently not affected .

[
Rxvt*saveLines: 10000
HISTSIZE=100000
HISTFILESIZE=200000
]

[Ted Dog]

great would like to contribute my mulisession changes could someone with a creditcard open a git acct for me. why do rhey ask for it on free accts. If you need a different host I have about 5G of space avail on puppylinux.net unused

[01micko]

Ted Dog, you don't need a credit card, just open an account. ( i didn't need one)

[Ted Dog]

so that is good about how many meg download does it need to build a working local wolf. its almost time for my yearly equipment check// space heater compiling farm setup.

[Ibidem]

@Karl: I guess you figured it out yourself, but here's how I would have done it...

You diverged at commit 99b66d.

Code: Select all

git checkout 99b66d #will warn about "detached head"
git checkout -b upstream
git pull https://github.com/puppylinux-woof-CE/woof-CE
git checkout master
git merge upstream

@Ted Dog:
1: Github costs only if you want to have "private" repositories hosted there. The signup interface is somewhat confusing, I will say.

its almost time for my yearly equipment check// space heater compiling farm setup.

LOL.

[Karl Godt]

Ibidem, after reading some manpages, I tried this :

[puppypc]# git checkout −b puppylinux-woof-CE puppylinux-woof-CE/master

error: pathspec '−b' did not match any file(s) known to git.
error: pathspec 'puppylinux-woof-CE' did not match any file(s) known to git.
error: pathspec 'puppylinux-woof-CE/master' did not match any file(s) known to git.



[puppypc]# git --version
git version 1.8.5-rc1

[raffy]

The test build Slacko 5.6.0.5 boots and connects flawlessly in my AMD E-350 emachines laptop.

I got the ISO from
https://archive.org/download/Puppy_Linux_Slacko/slacko-5.6.0.5.iso

[Karl Godt]

commit 99b66de00ce8956ffa2d4c261d4474181e9724be
Author: mavrothal <mavrotal@yahoo.com>
Date: Wed Nov 13 15:58:06 2013 +0200

Revert "Replace EMPTYDIRMARKER with .gitignore"

This reverts commit d1adca562538de8b3fd38bdedc698c02b17a7e85.

git --version
git version 1.6.4.1

git checkout 99b66d
ignoring REUC extension
Note: moving to '99b66d' which isn't a local branch
If you want to create a new branch from this checkout, you may do so
(now or later) by using -b with the checkout command again. Example:
git checkout -b <new_branch_name>
HEAD is now at 99b66de... Revert "Replace EMPTYDIRMARKER with .gitignore"

This would be a "total" reset .. ?

git checkout -b upstream
Switched to a new branch 'upstream'

Finally -b option works -> seems my new git is buggy .. ?

git pull https://github.com/puppylinux-woof-CE/woof-CE
error: The requested URL returned error: 403 Forbidden while accessing https://github.com/puppylinux-woof-CE/woof-CE/info/refs

fatal: HTTP request failed

[mavrothal]

It is very exciting that people start building woof-CE-based puppies.
However, I think that if all of them are also discussed in this thread will be chaotic and counter productive.

I would suggest woof-CE pupplets to open their own thread and just announced here like this:
"New woof-CE <pupplet-name> in this thread: puppy_forum_urll"

I'll do my best to update the first post with these links to the various pupplet threads.

Lets keep this thread focused on woof and/or github matters

[Ted Dog]

please do not start spliting off threads it gets much harder to follow development efforts with stuff spread about under various categories. We do need a full forum for wolf like with multisessions. with a how to setup and work wolf with git sticky. Please let others post efforts under this thread until a better home can be arranged, otherwise efforts will just get lost.

[Karl Godt]

It is very exciting that people start building woof-CE-based puppies.
However, I think that if all of them are also discussed in this thread will be chaotic and counter productive.

I would suggest woof-CE pupplets to open their own thread and just announced here like this:
"New woof-CE <pupplet-name> in this thread: puppy_forum_urll"

I'll do my best to update the first post with these links to the various pupplet threads.

Lets keep this thread focused on woof and/or github matters

+1 !
I am actually using Mick's mailing list now for woof or github matters.
But responses like the ones from Ibidem are much appreciated .


@TedDog : Short announcements with a link to the thread would suffice . But of course, many would still respond to builds in threads with just a link to the main thread . But probably not so many any more .

[Ted Dog]

not for me it would not, this site gets very fragmented, your stuff is spreadout all over the place. like this thread could not find it. expected it to be under cutting edge or advanced but no, puppy projects! makes no sense to place it here!
I know we try to keep from thread topic spreading but with the native language issues we already have a topic naming and placement problem. So please keep it together for a month or two.

[wanderer]

hello everyone
i have posted this on the community edition thread
please consider submitting a candidate
or at least an opinion
thanks
wanderer


hi community edition puppy fans

now that the experts are working on a new woof
the real development for the community edition has moved there

i am asking anyone that is making new puppies
with the new woof system
to consider making a community edition candidate
and posting a link to it
on the community edition thread

this should speed development up substantially
and also give the community
a variety of puppy versions to choose from
with so much talent around
we should not limit ourselves
to just one community edition version

remember the community edition is a joint effort
of the whole puppy community

i will continue to work
on my community edition candidate
but since i am not an expert
it will take me a while
to get to something useful

post your thoughts
(and your community edition candidates)

thanks

wanderer

[Ibidem]

commit 99b66de00ce8956ffa2d4c261d4474181e9724be
Author: mavrothal <mavrotal@yahoo.com>
Date: Wed Nov 13 15:58:06 2013 +0200

Revert "Replace EMPTYDIRMARKER with .gitignore"

This reverts commit d1adca562538de8b3fd38bdedc698c02b17a7e85.

git --version
git version 1.6.4.1

git checkout 99b66d
ignoring REUC extension
Note: moving to '99b66d' which isn't a local branch
If you want to create a new branch from this checkout, you may do so
(now or later) by using -b with the checkout command again. Example:
git checkout -b <new_branch_name>
HEAD is now at 99b66de... Revert "Replace EMPTYDIRMARKER with .gitignore"

This would be a "total" reset .. ?

Yes and no...
Each commit is a repository state.
Each branch is a series of commits; the last commit in a branch is its tip/head.
git checkout switches between branches or commits; checking out a branch is the same as checking out its tip.
You can always switch back to a branch or commit the same way you switched from it: git checkout ...

In git syntax, a reset is something different: it means losing work that's in progress. And that is done with "git reset".

git checkout -b upstream
Switched to a new branch 'upstream'

Finally -b option works -> seems my new git is buggy .. ?

If you copy-pasted your previous post from terminal messages, you used a dash instead of a hyphen, which wouldn't work.

In any case, git checkout -r <remote>/<remote-branch> would have been appropriate there; ie

Code: Select all

git checkout -r puppylinux-woof-CE/master
git checkout -b upstream

"should work"--but we all know how that goes...
(I'm basing that on the fact that you added the remote "puppylinux-woof-CE" already.)

git pull https://github.com/puppylinux-woof-CE/woof-CE
error: The requested URL returned error: 403 Forbidden while accessing https://github.com/puppylinux-woof-CE/woof-CE/info/refs

fatal: HTTP request failed

Try using

Code: Select all

git pull -u puppylinux-woof-CE master

Or try repeating it (yes, that does sometimes solve the problem; network states vary).
Or try using git://github.com/puppylinux-woof-CE/woof-CE.git as the url.
Or try getting a newer git version (github isn't too great with git 1.6).

[Karl Godt]

Ibidem : Today I encountered such :

[puppypc]# git checkout quirky-testing
Gewechselt zu Branch 'quirky-testing'

[puppypc]# git branch
master
puppy
puppy-testing
puppy-tmp
quirky
* quirky-testing
quirky-tmp
shutdown
testing
urgs

[puppypc]# git log

[ .. ]

[puppypc]# git checkout 99b66de
Note: checking out '99b66de'.

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 99b66de... Revert "Replace EMPTYDIRMARKER with .gitignore"

[puppypc]# git branch
* (losgelöst von 99b66de)
master
puppy
puppy-testing
puppy-tmp
quirky
quirky-testing
quirky-tmp
shutdown
testing
urgs


I was able to get where I wanted to get finally, mostly by using the "urgs" directory as a buffer switching to it and git branch [-d|-D] quirky-testing deleting and recreating it several times .

My physical HEAD is still detached

[Ibidem]

Karl, check out a branch.

Code: Select all

git checkout master

Or whichever branch you want.

[zigbert]

Things are getting more exiting.....

I see the CE-3 build of Wanderer includes pSeries apps that are really old. I guess those is fetched from the Quirky repo, and I have no possibility to update those. I guess they also have to be updated in Woof as well. This rise the question?

Should the apps be included in Woof?
As Micko stated earlier in this thread, this might not be the best solution. Maybe we could include the small ones that does not rely on big dependencies. Ie. pClock, pTiming, pSchedule.
pprocess, pFilesearch, pFind has been replaced in several puplets, so these might best stay outside.
pMusic and pBurn are the big brothers that some think fattens their build too much. It must be said that pBurn does not rely on ffmpeg, - only to support Audio-CD/Video-disc.

Maybe a better solution would be to open a repo where app-makers can upload and then add a pull-request to Woof. Or to add our repos to woof.


Sigmund

[mavrothal]

Maybe a better solution would be to open a repo where app-makers can upload and then add a pull-request to Woof. Or to add our repos to woof.

Actually there is no reason for any of the pets/apps to be included in the woof. They could be downloaded and installed as any other pet.
I guess some are in woof for historical reasons.
What is really needed is a repo. Probably clone puppy-common somewhere else and add/modify as needed.