Projects
openEuler:Mainline
isula-build
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 215
View file
_service:tar_scm_kernel_repo:isula-build.spec
Changed
@@ -2,7 +2,7 @@ Name: isula-build Version: 0.9.6 -Release: 22 +Release: 23 Summary: A tool to build container images License: Mulan PSL V2 URL: https://gitee.com/openeuler/isula-build @@ -41,7 +41,10 @@ patch -p1 < patch/loong64-0001-add-loong64-support-for-etcd.patch patch -p1 < patch/loong64-0002-update-vendor-for-isula-build-to-support-loong64.patch %endif -%ifarch loongarch64 riscv64 +%ifarch sw_64 +patch -p1 < patch/1000-add-sw64-support.patch +%endif +%ifarch loongarch64 riscv64 sw_64 patch -p1 < patch/loong64-0003-delete-static-pie-for-loong64.patch %endif %{make_build} safe @@ -102,6 +105,12 @@ /usr/share/bash-completion/completions/isula-build %changelog +* Sun Apr 07 2024 daisicheng <daisicheng@huawei.com> - 0.9.6-23 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix sw_64 build error + * Mon Apr 1 2024 luofeng <luofeng13@huawei.com> - 0.9.6-22 - Type: bugfix - CVE:NA
View file
_service:recompress:tar_scm_kernel_repo:patch.tar.gz/1000-add-sw64-support.patch
Added
@@ -0,0 +1,3426 @@ +diff --git a/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go b/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go +index 135f74a..51e19ba 100644 +--- a/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go ++++ b/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go +@@ -640,6 +640,7 @@ const ( + ArchPPC64LE Arch = "SCMP_ARCH_PPC64LE" + ArchS390 Arch = "SCMP_ARCH_S390" + ArchS390X Arch = "SCMP_ARCH_S390X" ++ ArchSW64 Arch = "SCMP_ARCH_SW_64" + ArchPARISC Arch = "SCMP_ARCH_PARISC" + ArchPARISC64 Arch = "SCMP_ARCH_PARISC64" + ArchRISCV64 Arch = "SCMP_ARCH_RISCV64" +diff --git a/vendor/golang.org/x/sys/unix/asm_linux_sw64.s b/vendor/golang.org/x/sys/unix/asm_linux_sw64.s +new file mode 100644 +index 0000000..76ee193 +--- /dev/null ++++ b/vendor/golang.org/x/sys/unix/asm_linux_sw64.s +@@ -0,0 +1,57 @@ ++// Copyright 2015 The Go Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style ++// license that can be found in the LICENSE file. ++ ++// +build linux ++// +build sw64 ++// +build !gccgo ++ ++#include "textflag.h" ++ ++// ++// System calls for sw64, Linux ++// ++// Just jump to package syscall's implementation for all these functions. ++// The runtime may know about them. ++ ++#define SYSCALL SYS_CALL_B $131 ++ ++TEXT ·Syscall(SB),NOSPLIT|NOFRAME,$0-56 ++ JMP syscall·Syscall(SB) ++ ++TEXT ·Syscall6(SB),NOSPLIT|NOFRAME,$0-80 ++ JMP syscall·Syscall6(SB) ++ ++TEXT ·SyscallNoError(SB),NOSPLIT,$0-48 ++ CALL runtime·entersyscall(SB) ++ LDL R16, a1+8(FP) ++ LDL R17, a2+16(FP) ++ LDL R18, a3+24(FP) ++ LDI R19, ZERO ++ LDI R20, ZERO ++ LDI R21, ZERO ++ LDL R0, trap+0(FP) // syscall entry ++ SYSCALL ++ STL R0, r1+32(FP) ++ STL R20, r2+40(FP) ++ CALL runtime·exitsyscall(SB) ++ RET ++ ++TEXT ·RawSyscall(SB),NOSPLIT|NOFRAME,$0-56 ++ JMP syscall·RawSyscall(SB) ++ ++TEXT ·RawSyscall6(SB),NOSPLIT|NOFRAME,$0-80 ++ JMP syscall·RawSyscall6(SB) ++ ++TEXT ·RawSyscallNoError(SB),NOSPLIT|NOFRAME,$0-48 ++ LDL R16, a1+8(FP) ++ LDL R17, a2+16(FP) ++ LDL R18, a3+24(FP) ++ LDI R19, ZERO ++ LDI R20, ZERO ++ LDI R21, ZERO ++ LDL R0, trap+0(FP) // syscall entry ++ SYSCALL ++ STL R0, r1+32(FP) ++ STL R20, r2+40(FP) ++ RET +diff --git a/vendor/golang.org/x/sys/unix/endian_little.go b/vendor/golang.org/x/sys/unix/endian_little.go +index 4362f47..7365e34 100644 +--- a/vendor/golang.org/x/sys/unix/endian_little.go ++++ b/vendor/golang.org/x/sys/unix/endian_little.go +@@ -2,8 +2,8 @@ + // Use of this source code is governed by a BSD-style + // license that can be found in the LICENSE file. + // +-//go:build 386 || amd64 || amd64p32 || alpha || arm || arm64 || mipsle || mips64le || mips64p32le || nios2 || ppc64le || riscv || riscv64 || sh +-// +build 386 amd64 amd64p32 alpha arm arm64 mipsle mips64le mips64p32le nios2 ppc64le riscv riscv64 sh ++//go:build 386 || amd64 || amd64p32 || alpha || arm || arm64 || mipsle || mips64le || mips64p32le || nios2 || ppc64le || riscv || riscv64 || sh || sw64 ++// +build 386 amd64 amd64p32 alpha arm arm64 mipsle mips64le mips64p32le nios2 ppc64le riscv riscv64 sh sw64 + + package unix + +diff --git a/vendor/golang.org/x/sys/unix/mkerrors_sw64.sh b/vendor/golang.org/x/sys/unix/mkerrors_sw64.sh +new file mode 100755 +index 0000000..08920e6 +--- /dev/null ++++ b/vendor/golang.org/x/sys/unix/mkerrors_sw64.sh +@@ -0,0 +1,661 @@ ++#!/usr/bin/env bash ++# Copyright 2009 The Go Authors. All rights reserved. ++# Use of this source code is governed by a BSD-style ++# license that can be found in the LICENSE file. ++ ++# Generate Go code listing errors and other #defined constant ++# values (ENAMETOOLONG etc.), by asking the preprocessor ++# about the definitions. ++ ++unset LANG ++export LC_ALL=C ++export LC_CTYPE=C ++ ++if test -z "$GOARCH" -o -z "$GOOS"; then ++ echo 1>&2 "GOARCH or GOOS not defined in environment" ++ exit 1 ++fi ++ ++# Check that we are using the new build system if we should ++#if [[ "$GOOS" = "linux" ]] && [[ "$GOLANG_SYS_BUILD" != "docker" ]]; then ++# echo 1>&2 "In the Docker based build system, mkerrors should not be called directly." ++# echo 1>&2 "See README.md" ++# exit 1 ++#fi ++ ++if [[ "$GOOS" = "aix" ]]; then ++ CC=${CC:-gcc} ++else ++ CC=${CC:-cc} ++fi ++ ++if [[ "$GOOS" = "solaris" ]]; then ++ # Assumes GNU versions of utilities in PATH. ++ export PATH=/usr/gnu/bin:$PATH ++fi ++ ++uname=$(uname) ++ ++includes_AIX=' ++#include <net/if.h> ++#include <net/netopt.h> ++#include <netinet/ip_mroute.h> ++#include <sys/protosw.h> ++#include <sys/stropts.h> ++#include <sys/mman.h> ++#include <sys/poll.h> ++#include <sys/termio.h> ++#include <termios.h> ++#include <fcntl.h> ++ ++#define AF_LOCAL AF_UNIX ++' ++ ++includes_Darwin=' ++#define _DARWIN_C_SOURCE ++#define KERNEL ++#define _DARWIN_USE_64_BIT_INODE ++#include <stdint.h> ++#include <sys/attr.h> ++#include <sys/types.h> ++#include <sys/event.h> ++#include <sys/ptrace.h> ++#include <sys/socket.h> ++#include <sys/sockio.h> ++#include <sys/sysctl.h> ++#include <sys/mman.h> ++#include <sys/mount.h> ++#include <sys/utsname.h> ++#include <sys/wait.h> ++#include <sys/xattr.h> ++#include <net/bpf.h> ++#include <net/if.h> ++#include <net/if_types.h> ++#include <net/route.h> ++#include <netinet/in.h> ++#include <netinet/ip.h> ++#include <termios.h> ++' ++ ++includes_DragonFly=' ++#include <sys/types.h> ++#include <sys/event.h> ++#include <sys/socket.h> ++#include <sys/sockio.h> ++#include <sys/stat.h> ++#include <sys/sysctl.h> ++#include <sys/mman.h> ++#include <sys/mount.h> ++#include <sys/wait.h> ++#include <sys/ioctl.h> ++#include <net/bpf.h> ++#include <net/if.h> ++#include <net/if_types.h> ++#include <net/route.h> ++#include <netinet/in.h> ++#include <termios.h> ++#include <netinet/ip.h> ++#include <net/ip_mroute/ip_mroute.h> ++' ++ ++includes_FreeBSD=' ++#include <sys/capsicum.h> ++#include <sys/param.h>
View file
_service:tar_scm_kernel_repo:VERSION-vendor
Changed
@@ -1 +1 @@ -0.9.6-22 +0.9.6-23
View file
_service:tar_scm_kernel_repo:git-commit
Changed
@@ -1 +1 @@ -905f1e209d1dffd819a521635acb0eaf270bcd69 +58d90d176bffe3c836fed71cabcdbf707590266a
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.