Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Status message updates #113

Merged
merged 1 commit into from

2 participants

@lurch

Make it clearer that "modules" actually means "kernel modules", and display a message while extracting tarball (which can take a while).

@popcornmix
Collaborator

Needs rebase

@lurch

Hopefully done.

@popcornmix
Collaborator

Not right. 3 commits remain.

@lurch

*sigh* IIRC I did git checkout patch-5 and then git rebase master, manually fixed the merge, ran git add rpi-update and then git rebase --continue finished off with git push -f.
What did I do wrong, and how do I fix it?

@popcornmix
Collaborator

I don't know the best way, but I would:

# copy files somewhere safe
git checkout 5437dc0e03  ;# current top of upstream
# copy files back
git add / git commit
git push -f
@lurch lurch Status message updates
Make it clearer that "modules" actually means "kernel modules", and display a message while extracting tarball (which can take a while).
b514610
@lurch

Finally sorted, I think. I somehow had the "Remove embedded shebang" change in two separate commits on lurch/rpi-update which was causing all kinds of problems. After tearing my hair out (and creating / deleting multiple local repositories) I think I've finally managed to get 'git rebase' to fix it. Fingers crossed ;-)

@popcornmix popcornmix merged commit 3a2399c into from
@lurch lurch deleted the branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 1, 2013
  1. @lurch

    Status message updates

    lurch authored
    Make it clearer that "modules" actually means "kernel modules", and display a message while extracting tarball (which can take a while).
This page is out of date. Refresh to see the latest.
Showing with 3 additions and 2 deletions.
  1. +3 −2 rpi-update
View
5 rpi-update
@@ -59,14 +59,14 @@ EOF
function update_modules {
if [[ ${SKIP_KERNEL} -eq 0 ]]; then
- echo " *** Updating modules"
+ echo " *** Updating kernel modules"
cp -vR "${FW_REPOLOCAL}/modules/"* "${FW_MODPATH}/"
find "${FW_REPOLOCAL}/modules" -mindepth 1 -maxdepth 1 -type d | while read DIR; do
echo " *** depmod $(basename "${DIR}")"
depmod -b "${ROOT_PATH}" -a $(basename "${DIR}")
done
else
- echo " *** As requested, not updating modules"
+ echo " *** As requested, not updating kernel modules"
fi
}
@@ -159,6 +159,7 @@ function download_rev {
echo " *** Downloading specific firmware revision (this will take a few minutes)"
mkdir -p "${FW_REPOLOCAL}"
FW_TARBALL="${FW_REPOLOCAL}/${FW_REV}.tar.gz"
+ echo " *** Decompressing downloaded firmware archive"
wget "${REPO_URI}/tarball/${FW_REV}" -O "${FW_TARBALL}"
tar xzf "${FW_TARBALL}" -C "${FW_REPOLOCAL}" --strip-components=1
rm "${FW_TARBALL}"
Something went wrong with that request. Please try again.