New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refresh: Alpine base image #71

Merged
merged 47 commits into from Nov 3, 2016

Conversation

Projects
None yet
3 participants
@mor1
Member

mor1 commented Oct 19, 2016

Per discussion with @avsm, this PR attempts to refresh this repo by deleting everything and then replaying commits from mor1/arm-image-builder.

While the refresh is not complete (manual interventions are still required), it is largely scripted and should work to build Cubieboard2/Cubietruck images containing Xen with an Alpine 3.4.0 dom0 and then Alpine and Debian domUs.

For the record the process followed was approximately:

git clone git@github.com:mor1/xen-arm-builder.git
cd xen-arm-builder/
git co -b alpine-base-image
git reset --hard 2296f3d
git rm -r *
git commit -m "nuke everything"
git remote add mor1-arm-image-builder ~/research/projects/ucn/src/arm-image-builder
git fetch mor1-arm-image-builder
git merge --allow-unrelated-histories mor1-arm-image-builder/master
git push origin alpine-base-image

If there's a better way, say so and I'll recreate this PR :)

@talex5

This comment has been minimized.

Show comment
Hide comment
@talex5

talex5 Oct 19, 2016

Contributor

If I'm understanding what you want to do correctly, you could use

git merge -s ours origin/master

where the current branch is the one you want to keep and origin/master is the branch whose history you want to keep but whose files you don't want in the merged version.

Contributor

talex5 commented Oct 19, 2016

If I'm understanding what you want to do correctly, you could use

git merge -s ours origin/master

where the current branch is the one you want to keep and origin/master is the branch whose history you want to keep but whose files you don't want in the merged version.

@avsm

This comment has been minimized.

Show comment
Hide comment
@avsm

avsm Oct 20, 2016

Member

I have tagged v1.0 with the old image changeset, so that we have it on record.

Member

avsm commented Oct 20, 2016

I have tagged v1.0 with the old image changeset, so that we have it on record.

@mor1

This comment has been minimized.

Show comment
Hide comment
@mor1

mor1 Oct 22, 2016

Member

@talex5 That doesn't seem to work for the same reason that I had to --allow-unrelated-histories in the approach I took (which would end up at the same place as your suggestion wouldn't it?).

I redid this PR by rebuilding the branch, with a few bug fix commits; the new merge seems to have worked as no conflicts showing above:

git clone git@github.com:mor1/xen-arm-builder.git
git remote add -f mor1-arm-image-builder ~/research/projects/ucn/src/arm-image-builder
cd xen-arm-builder
git remote add -f arm-image-builder ~/research/projects/ucn/src/arm-image-builder
git rm -fr .
git commit -m "nuke everything"
git merge --allow-unrelated-histories arm-image-builder/master
git co alpine-base-image
git merge master
git push
Member

mor1 commented Oct 22, 2016

@talex5 That doesn't seem to work for the same reason that I had to --allow-unrelated-histories in the approach I took (which would end up at the same place as your suggestion wouldn't it?).

I redid this PR by rebuilding the branch, with a few bug fix commits; the new merge seems to have worked as no conflicts showing above:

git clone git@github.com:mor1/xen-arm-builder.git
git remote add -f mor1-arm-image-builder ~/research/projects/ucn/src/arm-image-builder
cd xen-arm-builder
git remote add -f arm-image-builder ~/research/projects/ucn/src/arm-image-builder
git rm -fr .
git commit -m "nuke everything"
git merge --allow-unrelated-histories arm-image-builder/master
git co alpine-base-image
git merge master
git push
@avsm

This comment has been minimized.

Show comment
Hide comment
@avsm

avsm Oct 25, 2016

Member
+ cd linux
+ git checkout -f v4.4.14
error: pathspec 'v4.4.14' did not match any file(s) known to git.
Member

avsm commented Oct 25, 2016

+ cd linux
+ git checkout -f v4.4.14
error: pathspec 'v4.4.14' did not match any file(s) known to git.
@mor1

This comment has been minimized.

Show comment
Hide comment
@mor1

mor1 Oct 27, 2016

Member

@avsm based on the + cd linux above the error, that was fixed when I fixed the path to match the clone of the stable repo, cd linux-stable rather than cd linux.

(mor1/arm-image-builder@c20f6e2)

Member

mor1 commented Oct 27, 2016

@avsm based on the + cd linux above the error, that was fixed when I fixed the path to match the clone of the stable repo, cd linux-stable rather than cd linux.

(mor1/arm-image-builder@c20f6e2)

@mor1 mor1 merged commit f8f54ca into mirage:master Nov 3, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment