Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
syncthing: update from 1.22.2 to 1.23.2
- fixed noupgrade install

`mee-build()`:
First `go run build.go` builds all binaries incl. `syncthing` as `[purego]`, ending up
in `$S/bin/...`
Second `go run build.go -no-upgrade build `syncthing` only builds
`syncthing` as `[noupgrade]` leaving it in `$S`.
So we end up in two different syncthing binaries. `mee_install()` used to
fix that, but 941adb2 silently dropped the fix.
  • Loading branch information
wwwutz committed Mar 9, 2023
1 parent 2a0b1c5 commit 7a2a3bd
Showing 1 changed file with 10 additions and 26 deletions.
36 changes: 10 additions & 26 deletions syncthing.be0
Expand Up @@ -3,7 +3,9 @@
# BEE_VERSION syncthing-1.23.2-1

## The source URL(s) array
SRCURL[0]="https://github.com/syncthing/syncthing/releases/download/v${PKGVERSION}/syncthing-source-v${PKGVERSION}.tar.gz syncthing-v${PKGVERSION}.tar.gz"

#SRCURL[0]="https://github.com/syncthing/syncthing/releases/download/v${PKGVERSION}/syncthing-source-v${PKGVERSION}.tar.gz syncthing-v${PKGVERSION}.tar.gz"

SRCURL[0]="https://beehive.molgen.mpg.de/f07a093bce5eb809de65e51ace6115fc/syncthing-v1.23.2.tar.gz"

## Add URLs/paths to patch files
Expand All @@ -28,33 +30,23 @@ SRCURL[0]="https://beehive.molgen.mpg.de/f07a093bce5eb809de65e51ace6115fc/syncth
#}

mee_build() {

export GOCACHE="${B}/.cache/go-build"
# export GOPATH=${F}
export GOCACHE="${B}/cache/go-build"
export GOENV="${B}/.config/go/env"
export GOMODCACHE="${B}/pkg/mod"

# we build in source dir but we don't 8-)
cd ${S}
# go clean -r -x build.go # NEVER EVER run this as root
go run -v build.go
go run -v build.go -no-upgrade build syncthing
cd ${S}
go run -x -a -v build.go
go run -x -a -v build.go -no-upgrade build syncthing
}

## mee_install() should install into "${D}"
## default: 'make install DESTDIR="${D}"'

mee_install() {
mkdir -p ${D}/usr/bin

# not packaged:
# stcrahcreceiver
# strelaypoolsrv
# strelaysrv
# uraggregate
# ursrv
# stupgrades

for b in stcompdirs stdisco stdiscosrv stevents stfileinfo stfinddevice stfindignored stgenfiles stsigtool stvanity stwatchfile syncthing; do
cp ${S}/syncthing ${D}/usr/bin
for b in stevents stcompdirs stvanity stfindignored stfileinfo stwatchfile stsigtool stdisco stdiscosrv stfinddevice stgenfiles stwatchfile; do
cp ${S}/bin/$b ${D}/usr/bin
done

Expand All @@ -67,11 +59,3 @@ mee_install() {
mkdir -p ${D}/usr/share/man/man7
cp ${S}/man/syncthing-*.7 ${D}/usr/share/man/man7
}

mee_install_post() {
echo "./contentdiff.pl /usr/share/bee/${PKGFULLNAME}-[0-9]*/CONTENT ${D}/"
echo "( cd ${D}; find . -ls )"
exit
}


0 comments on commit 7a2a3bd

Please sign in to comment.