From 8fdbbe10c1453aa66757547842874beb7280c21c Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Tue, 25 Apr 2023 15:52:51 -0400 Subject: [PATCH] chore: Drop use of anuvu/squashfs from workflow and doc. After removing the anuvu/squashfs import we no longer need to build or install libsquashfs1 from squashfs-tools-ng. Signed-off-by: Scott Moser --- .github/workflows/build.yaml | 2 -- build.yaml | 1 - doc/install.md | 14 +------------- go.mod | 1 - go.sum | 4 ---- 5 files changed, 1 insertion(+), 21 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e610b3c8..31725895 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -53,8 +53,6 @@ jobs: GO111MODULE=off go get github.com/opencontainers/umoci/cmd/umoci curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin sudo apt-get install -yy autoconf automake make autogen autoconf libtool binutils git squashfs-tools libcryptsetup-dev libdevmapper-dev cryptsetup-bin squashfuse - (cd /tmp && git clone https://github.com/AgentD/squashfs-tools-ng && cd squashfs-tools-ng && ./autogen.sh && ./configure --prefix=/usr && make -j2 && sudo make -j2 install && sudo ldconfig -v) - (cd /tmp && git clone https://github.com/anuvu/squashfs && cd squashfs && make && sudo cp squashtool/squashtool /usr/bin) echo "running kernel is: $(uname -a)" - name: Go-download run: | diff --git a/build.yaml b/build.yaml index e57d3dd4..cf05ba67 100644 --- a/build.yaml +++ b/build.yaml @@ -22,7 +22,6 @@ build-env: xz \ gettext-dev \ lvm2-dev util-linux-dev \ - squashfs-tools-ng-dev \ linux-headers # json-c doesn't have static binaries in alpine diff --git a/doc/install.md b/doc/install.md index e6206fed..e27f50a4 100644 --- a/doc/install.md +++ b/doc/install.md @@ -37,7 +37,7 @@ packages: #### **Ubuntu 22.04** sudo apt install lxc-dev libacl1-dev libgpgme-dev libcap-dev libseccomp-dev - sudo apt install libpam0g-dev libselinux-dev libssl-dev libzstd-dev libcryptsetup-dev libdevmapper-dev cryptsetup-bin pkg-config libsquashfs1 libsquashfs-dev + sudo apt install libpam0g-dev libselinux-dev libssl-dev libzstd-dev libcryptsetup-dev libdevmapper-dev cryptsetup-bin pkg-config **To run `make check` you will also need:** @@ -46,18 +46,6 @@ packages: **umoci** - https://github.com/opencontainers/umoci -**squashtool**, but with a slightly different config than what is mentioned in the install guide (see below) - https://github.com/anuvu/squashfs - -Contrary to what the documentation in squashfs implies, squashtool and -libsquash from squash-tools-ng need to be installed globally, as user specific -path overrides aren't propagated into `make check`'s test envs. - -Thus, when you reach the step **install into mylocal="$HOME/lib"** from the squashfs guide, use the config below. You can put them at the end of your .bashrc file so you don't need to run them every time. - - mylocal="/usr/local" - export LD_LIBRARY_PATH=$mylocal/lib${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} - export PKG_CONFIG_PATH=$mylocal/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH} - Since the path **/usr/local** is owned by root, when you reach the step to run **make install**, you need to run it as **sudo**. `make check` requires the **golangci-lint** binary to be present in $GOPATH/bin diff --git a/go.mod b/go.mod index 40ac0bde..87ec70f2 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,6 @@ go 1.20 require ( github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be - github.com/anuvu/squashfs v0.0.0-20220404153901-d496132b2781 github.com/apex/log v1.9.0 github.com/apparentlymart/go-shquot v0.0.1 github.com/cheggaaa/pb/v3 v3.1.2 diff --git a/go.sum b/go.sum index 437252c5..bdcfad2d 100644 --- a/go.sum +++ b/go.sum @@ -85,8 +85,6 @@ github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:C github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/anuvu/squashfs v0.0.0-20220404153901-d496132b2781 h1:GI4SoPum6MHsm6nwTG1fueiJQkMOZkQagMKZ4Z5pAaY= -github.com/anuvu/squashfs v0.0.0-20220404153901-d496132b2781/go.mod h1:t4fv4HFEgFR4DdlVcCBeQCvinbf4GJrR4G5xgx0w7qc= github.com/apex/log v1.9.0 h1:FHtw/xuaM8AgmvDDTI9fiwoAL25Sq2cxojnZICUU8l0= github.com/apex/log v1.9.0/go.mod h1:m82fZlWIuiWzWP04XCTXmnX0xRkYYbCdYn8jbJeLBEA= github.com/apex/logs v1.0.0/go.mod h1:XzxuLZ5myVHDy9SAmYpamKKRNApGj54PfYLcFrXqDwo= @@ -926,7 +924,6 @@ github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtX github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli v1.22.12 h1:igJgVw1JdKH+trcLWLeLwZjU9fEfPesQ+9/e4MQ44S8= github.com/urfave/cli v1.22.12/go.mod h1:sSBEIC79qR6OvcmsD4U3KABeOTxDqQtdDnaFuUN30b8= -github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ= github.com/urfave/cli/v2 v2.10.3/go.mod h1:f8iq5LtQ/bLxafbdBSLPPNsgaW0l/2fYYEHhAyPlwvo= github.com/urfave/cli/v2 v2.25.0 h1:ykdZKuQey2zq0yin/l7JOm9Mh+pg72ngYMeB0ABn6q8= github.com/urfave/cli/v2 v2.25.0/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc= @@ -1164,7 +1161,6 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=