LILiK
/
openwrt-packages-dist
5
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
23534 Commits
1 Branch
46 MiB
Tree: 8a4bb56478
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '8a4bb56478'
${ noResults }
openwrt-packages-dist/utils/podman/patches/020-vendor-containers-psgo-...

169 lines
7.7 KiB
Raw Normal View History

podman: fix build on MIPS Signed-off-by: Daniel Golle <daniel@makrotopia.org> Signed-off-by: Rosen Penev <rosenp@gmail.com>
4 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
 
  1. From 21f5154399fc33959a4f3c42e29cade6757015c9 Mon Sep 17 00:00:00 2001
  2. From: Valentin Rothberg <rothberg@redhat.com>
  3. Date: Tue, 5 Jan 2021 10:44:16 +0100
  4. Subject: [PATCH] vendor containers/psgo@v1.5.2
  5. 

  6. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
  7. ---

  8.  go.mod                                        |  2 +-
  9.  go.sum                                        |  4 ++--
  10.  .../internal/capabilities/capabilities.go     |  2 +-
  11.  .../containers/psgo/internal/dev/tty.go       |  5 ++--
  12.  .../containers/psgo/internal/proc/status.go   |  2 +-
  13.  .../psgo/internal/process/process.go          |  4 ++--
  14.  vendor/github.com/containers/psgo/psgo.go     | 24 +++++++++----------
  15.  vendor/modules.txt                            |  2 +-
  16.  8 files changed, 23 insertions(+), 22 deletions(-)
  17. 

  18. --- a/go.mod

  19. +++ b/go.mod

  20. @@ -14,7 +14,7 @@ require (

  21.  	github.com/containers/common v0.29.0
  22.  	github.com/containers/conmon v2.0.20+incompatible
  23.  	github.com/containers/image/v5 v5.9.0
  24. -	github.com/containers/psgo v1.5.1

  25. +	github.com/containers/psgo v1.5.2

  26.  	github.com/containers/storage v1.24.1
  27.  	github.com/coreos/go-systemd/v22 v22.1.0
  28.  	github.com/cri-o/ocicni v0.2.1-0.20201102180012-75c612fda1a2
  29. --- a/go.sum

  30. +++ b/go.sum

  31. @@ -109,8 +109,8 @@ github.com/containers/libtrust v0.0.0-20

  32.  github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY=
  33.  github.com/containers/ocicrypt v1.0.3 h1:vYgl+RZ9Q3DPMuTfxmN+qp0X2Bj52uuY2vnt6GzVe1c=
  34.  github.com/containers/ocicrypt v1.0.3/go.mod h1:CUBa+8MRNL/VkpxYIpaMtgn1WgXGyvPQj8jcy0EVG6g=
  35. -github.com/containers/psgo v1.5.1 h1:MQNb7FLbXqBdqz6u4lI2QWizVz4RSTzs1+Nk9XT1iVA=

  36. -github.com/containers/psgo v1.5.1/go.mod h1:2ubh0SsreMZjSXW1Hif58JrEcFudQyIy9EzPUWfawVU=

  37. +github.com/containers/psgo v1.5.2 h1:3aoozst/GIwsrr/5jnFy3FrJay98uujPCu9lTuSZ/Cw=

  38. +github.com/containers/psgo v1.5.2/go.mod h1:2ubh0SsreMZjSXW1Hif58JrEcFudQyIy9EzPUWfawVU=

  39.  github.com/containers/storage v1.23.6/go.mod h1:haFs0HRowKwyzvWEx9EgI3WsL8XCSnBDb5f8P5CAxJY=
  40.  github.com/containers/storage v1.23.7/go.mod h1:cUT2zHjtx+WlVri30obWmM2gpqpi8jfPsmIzP1TVpEI=
  41.  github.com/containers/storage v1.24.0 h1:Fo2LkF7tkMLmo38sTZ/G8wHjcn8JfUFPfyTxM4WwMfk=
  42. --- a/vendor/github.com/containers/psgo/internal/capabilities/capabilities.go

  43. +++ b/vendor/github.com/containers/psgo/internal/capabilities/capabilities.go

  44. @@ -13,7 +13,7 @@

  45.  // limitations under the License.
  46.  
  47.  // Package capabilities provides a mapping from common kernel bit masks to the
  48. -// alphanumerical represenation of kernel capabilities.  See capabilities(7)

  49. +// alphanumerical representation of kernel capabilities.  See capabilities(7)

  50.  // for additional information.
  51.  package capabilities
  52.  
  53. --- a/vendor/github.com/containers/psgo/internal/dev/tty.go

  54. +++ b/vendor/github.com/containers/psgo/internal/dev/tty.go

  55. @@ -113,8 +113,9 @@ func TTYs() (*[]TTY, error) {

  56.  		}
  57.  		s := fi.Sys().(*syscall.Stat_t)
  58.  		t := TTY{
  59. -			Minor: minDevNum(s.Rdev),

  60. -			Major: majDevNum(s.Rdev),

  61. +			// Rdev is type uint32 on mips arch so we have to cast to uint64

  62. +			Minor: minDevNum(uint64(s.Rdev)),

  63. +			Major: majDevNum(uint64(s.Rdev)),

  64.  			Path:  dev,
  65.  		}
  66.  		ttys = append(ttys, t)
  67. --- a/vendor/github.com/containers/psgo/internal/proc/status.go

  68. +++ b/vendor/github.com/containers/psgo/internal/proc/status.go

  69. @@ -24,7 +24,7 @@ import (

  70.  	"github.com/pkg/errors"
  71.  )
  72.  
  73. -// Status is a direct translation of a `/proc/[pid]/status`, wich provides much

  74. +// Status is a direct translation of a `/proc/[pid]/status`, which provides much

  75.  // of the information in /proc/[pid]/stat and /proc/[pid]/statm in a format
  76.  // that's easier for humans to parse.
  77.  type Status struct {
  78. --- a/vendor/github.com/containers/psgo/internal/process/process.go

  79. +++ b/vendor/github.com/containers/psgo/internal/process/process.go

  80. @@ -31,9 +31,9 @@ type Process struct {

  81.  	Pid string
  82.  	// Stat contains data from /proc/$pid/stat.
  83.  	Stat proc.Stat
  84. -	// Status containes data from /proc/$pid/status.

  85. +	// Status contains data from /proc/$pid/status.

  86.  	Status proc.Status
  87. -	// CmdLine containes data from /proc/$pid/cmdline.

  88. +	// CmdLine contains data from /proc/$pid/cmdline.

  89.  	CmdLine []string
  90.  	// Label containers data from /proc/$pid/attr/current.
  91.  	Label string
  92. --- a/vendor/github.com/containers/psgo/psgo.go

  93. +++ b/vendor/github.com/containers/psgo/psgo.go

  94. @@ -482,7 +482,7 @@ func JoinNamespaceAndProcessInfoByPidsWi

  95.  				// catch race conditions
  96.  				continue
  97.  			}
  98. -			return nil, errors.Wrapf(err, "error extracing PID namespace")

  99. +			return nil, errors.Wrapf(err, "error extracting PID namespace")

  100.  		}
  101.  		if _, exists := nsMap[ns]; !exists {
  102.  			nsMap[ns] = true
  103. @@ -759,7 +759,7 @@ func processVSZ(p *process.Process, ctx

  104.  }
  105.  
  106.  // parseCAP parses cap (a string bit mask) and returns the associated set of
  107. -// capabilities.  If all capabilties are set, "full" is returned.  If no

  108. +// capabilities.  If all capabilities are set, "full" is returned.  If no

  109.  // capability is enabled, "none" is returned.
  110.  func parseCAP(cap string) (string, error) {
  111.  	mask, err := strconv.ParseUint(cap, 16, 64)
  112. @@ -777,36 +777,36 @@ func parseCAP(cap string) (string, error

  113.  	return strings.Join(caps, ","), nil
  114.  }
  115.  
  116. -// processCAPAMB returns the set of ambient capabilties associated with

  117. -// process p.  If all capabilties are set, "full" is returned.  If no

  118. +// processCAPAMB returns the set of ambient capabilities associated with

  119. +// process p.  If all capabilities are set, "full" is returned.  If no

  120.  // capability is enabled, "none" is returned.
  121.  func processCAPAMB(p *process.Process, ctx *psContext) (string, error) {
  122.  	return parseCAP(p.Status.CapAmb)
  123.  }
  124.  
  125. -// processCAPINH returns the set of inheritable capabilties associated with

  126. -// process p.  If all capabilties are set, "full" is returned.  If no

  127. +// processCAPINH returns the set of inheritable capabilities associated with

  128. +// process p.  If all capabilities are set, "full" is returned.  If no

  129.  // capability is enabled, "none" is returned.
  130.  func processCAPINH(p *process.Process, ctx *psContext) (string, error) {
  131.  	return parseCAP(p.Status.CapInh)
  132.  }
  133.  
  134. -// processCAPPRM returns the set of permitted capabilties associated with

  135. -// process p.  If all capabilties are set, "full" is returned.  If no

  136. +// processCAPPRM returns the set of permitted capabilities associated with

  137. +// process p.  If all capabilities are set, "full" is returned.  If no

  138.  // capability is enabled, "none" is returned.
  139.  func processCAPPRM(p *process.Process, ctx *psContext) (string, error) {
  140.  	return parseCAP(p.Status.CapPrm)
  141.  }
  142.  
  143. -// processCAPEFF returns the set of effective capabilties associated with

  144. -// process p.  If all capabilties are set, "full" is returned.  If no

  145. +// processCAPEFF returns the set of effective capabilities associated with

  146. +// process p.  If all capabilities are set, "full" is returned.  If no

  147.  // capability is enabled, "none" is returned.
  148.  func processCAPEFF(p *process.Process, ctx *psContext) (string, error) {
  149.  	return parseCAP(p.Status.CapEff)
  150.  }
  151.  
  152. -// processCAPBND returns the set of bounding capabilties associated with

  153. -// process p.  If all capabilties are set, "full" is returned.  If no

  154. +// processCAPBND returns the set of bounding capabilities associated with

  155. +// process p.  If all capabilities are set, "full" is returned.  If no

  156.  // capability is enabled, "none" is returned.
  157.  func processCAPBND(p *process.Process, ctx *psContext) (string, error) {
  158.  	return parseCAP(p.Status.CapBnd)
  159. --- a/vendor/modules.txt

  160. +++ b/vendor/modules.txt

  161. @@ -160,7 +160,7 @@ github.com/containers/ocicrypt/keywrap/p

  162.  github.com/containers/ocicrypt/keywrap/pkcs7
  163.  github.com/containers/ocicrypt/spec
  164.  github.com/containers/ocicrypt/utils
  165. -# github.com/containers/psgo v1.5.1

  166. +# github.com/containers/psgo v1.5.2

  167.  github.com/containers/psgo
  168.  github.com/containers/psgo/internal/capabilities
  169.  github.com/containers/psgo/internal/cgroups