Skip to contentSkip to conversation

gosu: Upgrade to 1.16 release

PATCH New Khem Raj 1 participant 2 messages Jun 16, 2023

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 gosu: Upgrade to 1.16 release

ChangeLog is here

https://github.com/tianon/gosu/releases/tag/1.15
https://github.com/tianon/gosu/releases/tag/1.16

---
 .../recipes-support/gosu/{gosu_1.14.bb => gosu_1.16.bb}    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-support/gosu/{gosu_1.14.bb => gosu_1.16.bb} (85%)
meta-oe/recipes-support/gosu/gosu_1.16.bb renamed from meta-oe/recipes-support/gosu/gosu_1.14.bb +5 -2
similarity index 85%
rename from meta-oe/recipes-support/gosu/gosu_1.14.bb
rename to meta-oe/recipes-support/gosu/gosu_1.16.bb
index 624adf3099..b209de16a4 100644
@@ -8,10 +8,13 @@ GO_IMPORT = "github.com/tianon/gosu"
 SRC_URI = "git://${GO_IMPORT}.git;branch=master;protocol=https \
            git://github.com/opencontainers/runc;name=runc;destsuffix=${S}/src/github.com/opencontainers/runc;branch=main;protocol=https \
 "
-SRCREV = "9f7cd138a1ebc0684d43ef6046bf723978e8741f"
-SRCREV_runc = "d7f7b22a85a2387557bdcda125710c2506f8d5c5"
+SRCREV = "0e7347714352cd7f2e5edc9d2cf838d9934e6036"
+#v1.1.0
+SRCREV_runc = "067aaf8548d78269dcb2c13b856775e27c410f9c"
 inherit go
 
+CGO_ENABLED = "1"
+
 do_compile:prepend() {
     # New Go versions has Go modules support enabled by default
     export GO111MODULE=off
Signature · 1 line
2.41.0
author
#1 lore raw

PATCH 2/2 syzkaller: Upgrade to latest tip of trunk

Enable cgo with this version

---
 ...s-targets.go-allow-users-to-override-hardc.patch | 13 ++++---------
 meta-oe/recipes-test/syzkaller/syzkaller_git.bb     |  4 ++--
 2 files changed, 6 insertions(+), 11 deletions(-)
meta-oe/recipes-test/syzkaller/syzkaller/0001-sys-targets-targets.go-allow-users-to-override-hardc.patch +4 -9
index d647b8d4a0..61f4351651 100644
@@ -18,11 +18,9 @@ Signed-off-by: Ovidiu Panait <[email protected]>
  sys/targets/targets.go | 19 +++++++++++--------
  1 file changed, 11 insertions(+), 8 deletions(-)
 
-diff --git a/sys/targets/targets.go b/sys/targets/targets.go
-index f3be708f3..19a8bb681 100644
 --- a/sys/targets/targets.go
 +++ b/sys/targets/targets.go
-@@ -258,7 +258,6 @@ var List = map[string]map[string]*Target{
+@@ -262,7 +262,6 @@ var List = map[string]map[string]*Target
  			PtrSize:          4,
  			PageSize:         4 << 10,
  			LittleEndian:     true,
@@ -30,7 +28,7 @@ index f3be708f3..19a8bb681 100644
  			Triple:           "arm-linux-gnueabi",
  			KernelArch:       "arm",
  			KernelHeaderArch: "arm",
-@@ -670,12 +669,16 @@ func initTarget(target *Target, OS, arch string) {
+@@ -700,12 +699,16 @@ func initTarget(target *Target, OS, arch
  	for i := range target.CFlags {
  		target.replaceSourceDir(&target.CFlags[i], sourceDir)
  	}
@@ -53,15 +51,12 @@ index f3be708f3..19a8bb681 100644
  	}
  	if target.CCompiler == "" {
  		target.setCompiler(useClang)
-@@ -803,7 +806,7 @@ func (target *Target) lazyInit() {
+@@ -839,7 +842,7 @@ func (target *Target) lazyInit() {
  	// On CI we want to fail loudly if cross-compilation breaks.
  	// Also fail if SOURCEDIR_GOOS is set b/c in that case user probably assumes it will work.
- 	if (target.OS != runtime.GOOS || !runningOnCI) && os.Getenv("SOURCEDIR_"+strings.ToUpper(target.OS)) == "" {
+ 	if (target.OS != runtime.GOOS || !runningOnCI) && getSourceDir(target) == "" {
 -		if _, err := exec.LookPath(target.CCompiler); err != nil {
 +		if _, err := exec.LookPath(strings.Fields(target.CCompiler)[0]); err != nil {
  			target.BrokenCompiler = fmt.Sprintf("%v is missing (%v)", target.CCompiler, err)
  			return
  		}
--- 
-2.25.1
-
meta-oe/recipes-test/syzkaller/syzkaller_git.bb +2 -2
index f7c751f806..abb7611e5e 100644
@@ -9,7 +9,7 @@ GO_IMPORT = "github.com/google/syzkaller"
 SRC_URI = "git://${GO_IMPORT};protocol=https;destsuffix=${BPN}-${PV}/src/${GO_IMPORT};branch=master \
            file://0001-sys-targets-targets.go-allow-users-to-override-hardc.patch;patchdir=src/${GO_IMPORT} \
            "
-SRCREV = "67cb024cd1a3c95e311263a5c95e957f9abfd8ca"
+SRCREV = "6d01f20890edf11b99bb54573025b11c1acd2d52"
 
 COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64).*-linux"
 
@@ -23,7 +23,7 @@ export TARGETOS = '${GOOS}'
 export TARGETARCH = '${GOARCH}'
 export TARGETVMARCH = '${GOARCH}'
 
-CGO_ENABLED = "0"
+CGO_ENABLED = "1"
 
 DEPENDS:class-native += "qemu-system-native"
 
Signature · 1 line
2.41.0