Skip to content

Commit

Permalink
Merge pull request #2456 from jpmcb/hotdog-go-1.19-update
Browse files Browse the repository at this point in the history
  • Loading branch information
jpmcb authored Sep 29, 2022
2 parents 4214df8 + f6d3deb commit 15fc86a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
4 changes: 2 additions & 2 deletions packages/hotdog/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ build = "build.rs"
path = "pkg.rs"

[[package.metadata.build-package.external-files]]
url = "https://github.com/bottlerocket-os/hotdog/archive/b85b75576adbbd7e133b54d71ebc11a28acf40db/hotdog-b85b755.tar.gz"
sha512 = "9b2d5cb0e25d774d11dd6eb577e07af85f36fcd6e816b9df88d7ca1da273695f15ce6831026d28e68355512a07d0ac673b5ce9771d969f1c5ca4f14bc631deb8"
url = "https://github.com/bottlerocket-os/hotdog/archive/v1.0.4/hotdog-1.0.4.tar.gz"
sha512 = "fa6ae90ca7306e2d77cf7320cde773e08f3616e29cc44b6eda9a70d1270b30f9190707c40890146d023a417c13028ccf601a313ed8eb255ddc13072128ad7250"
bundle-modules = [ "go" ]

[build-dependencies]
Expand Down
13 changes: 5 additions & 8 deletions packages/hotdog/hotdog.spec
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,23 @@
%global gorepo hotdog
%global goimport %{goproject}/%{gorepo}

%global gitrev b85b75576adbbd7e133b54d71ebc11a28acf40db
%global shortrev %(c=%{gitrev}; echo ${c:0:7})

Name: %{_cross_os}hotdog
Version: 1.0.1
Version: 1.0.4
Release: 1%{?dist}
Summary: Tool with OCI hooks to run the Log4j Hot Patch in containers
License: Apache-2.0
URL: https://github.com/bottlerocket-os/hotdog
Source0: %{gorepo}-%{shortrev}.tar.gz
Source1: bundled-%{gorepo}-%{shortrev}.tar.gz
Source0: %{gorepo}-%{version}.tar.gz
Source1: bundled-%{gorepo}-%{version}.tar.gz
BuildRequires: %{_cross_os}glibc-devel
Requires: %{_cross_os}log4j2-hotpatch

%description
%{summary}.

%prep
%setup -n %{gorepo}-%{gitrev}
%setup -T -D -n %{gorepo}-%{gitrev} -b 1
%setup -n %{gorepo}-%{version}
%setup -T -D -n %{gorepo}-%{version} -b 1

%build
%set_cross_go_flags
Expand Down

0 comments on commit 15fc86a

Please sign in to comment.