-
Notifications
You must be signed in to change notification settings - Fork 5.1k
RPM package: Add vendor info #21759
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
RPM package: Add vendor info #21759
Conversation
|
Hi @divysinghvi. Thanks for your PR. I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
|
Can one of the admins verify this patch? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
would you plz add before/after the PR ? you can generate the rpm package using the "make" target for it and compare
|
actually @medyagh i tried reproducing it on my own system but i was not able to do it like can you give commands for building rpm package on mac arm64 , that's why i was waiting for nirs to verify and i will add the output to the pr description once it is sure this fixes that |
| Summary: Machine driver for KVM | ||
| License: ASL 2.0 | ||
| Group: Development/Tools | ||
| Vendor: The Kubernetes Authors |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change conflicts with #21625. Please remove it since this file will be removed soon.
| Summary: Run Kubernetes locally | ||
| License: ASL 2.0 | ||
| Group: Development/Tools | ||
| Vendor: The Kubernetes Authors |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks fine.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Deleting this file breaks the build and is not correct. Remove your changes from this file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
my bad will fix it
Are you sure this is the correct output after this change? |
|
@nirs actually was editing it to put the right output but i was not able to run it on my system can you verify the result please |
OK, if you cannot test it write it clearly in the PR message and do not add fake Before and After. |
|
understood thanks for the help , will first fix the wrong commit by me |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good now, but there is really no reason to have 3 commits for one line change. Would you like to squash all commits?
|
@divysinghvi The last commit is wrong now, since the file was already removed in master. |
|
Tested by rebasing on master and removing the unnecessary commits: diff --git a/installers/linux/rpm/minikube_rpm_template/minikube.spec b/installers/linux/rpm/minikube_rpm_template/minikube.spec
index 7ba38f95f..33b485c3a 100644
--- a/installers/linux/rpm/minikube_rpm_template/minikube.spec
+++ b/installers/linux/rpm/minikube_rpm_template/minikube.spec
@@ -6,6 +6,7 @@ Release: --REVISION--
Summary: Run Kubernetes locally
License: ASL 2.0
Group: Development/Tools
+Vendor: The Kubernetes Authors
URL: https://github.com/kubernetes/minikube
# Needed for older versions of RPM$ make out/minikube-1.37.0.rpm
GOOS="linux" GOARCH="amd64" \
go build -tags "libvirt_dlopen" -ldflags="-X k8s.io/minikube/pkg/version.version=v1.37.0 -X k8s.io/minikube/pkg/version.isoVersion=v1.37.0-1760609724-21757 -X k8s.io/minikube/pkg/version.gitCommitID="e9eccd8b9b21b41d11760f7ef54fc8175381b175" -X k8s.io/minikube/pkg/version.storageProvisionerVersion=v5" -a -o out/minikube-linux-amd64 k8s.io/minikube/cmd/minikube
cp out/minikube-linux-amd64 out/minikube-linux-x86_64
cp -r installers/linux/rpm/minikube_rpm_template/* /tmp/tmp.gjTTcBdWbX.minikube_1.37.0-x86_64-rpm/
sed -E -i 's/--VERSION--/'1.37.0'/g' /tmp/tmp.gjTTcBdWbX.minikube_1.37.0-x86_64-rpm/minikube.spec
sed -E -i 's/--REVISION--/'0'/g' /tmp/tmp.gjTTcBdWbX.minikube_1.37.0-x86_64-rpm/minikube.spec
sed -E -i 's|--OUT--|'/home/nsoffer/minikube/out'|g' /tmp/tmp.gjTTcBdWbX.minikube_1.37.0-x86_64-rpm/minikube.spec
rpmbuild -bb -D "_rpmdir /home/nsoffer/minikube/out" --target x86_64 \
/tmp/tmp.gjTTcBdWbX.minikube_1.37.0-x86_64-rpm/minikube.spec
Building target platforms: x86_64
Building for target x86_64
warning: %source_date_epoch_from_changelog is set, but %changelog has no entries to take a date from
Executing(%mkbuilddir): /bin/sh -e /var/tmp/rpm-tmp.kYODCT
Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.kbc5Sh
+ umask 022
+ cd /home/nsoffer/rpmbuild/BUILD/minikube-1.37.0-build
+ mkdir -p minikube-1.37.0
+ cd minikube-1.37.0
+ cp /home/nsoffer/minikube/out/minikube-linux-x86_64 minikube
+ RPM_EC=0
++ jobs -p
+ exit 0
Executing(%install): /bin/sh -e /var/tmp/rpm-tmp.3cO0uM
+ umask 022
+ cd /home/nsoffer/rpmbuild/BUILD/minikube-1.37.0-build
+ '[' /home/nsoffer/rpmbuild/BUILD/minikube-1.37.0-build/BUILDROOT '!=' / ']'
+ rm -rf /home/nsoffer/rpmbuild/BUILD/minikube-1.37.0-build/BUILDROOT
++ dirname /home/nsoffer/rpmbuild/BUILD/minikube-1.37.0-build/BUILDROOT
+ mkdir -p /home/nsoffer/rpmbuild/BUILD/minikube-1.37.0-build
+ mkdir /home/nsoffer/rpmbuild/BUILD/minikube-1.37.0-build/BUILDROOT
+ CFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer '
+ export CFLAGS
+ CXXFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer '
+ export CXXFLAGS
+ FFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -I/usr/lib64/gfortran/modules '
+ export FFLAGS
+ FCFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -I/usr/lib64/gfortran/modules '
+ export FCFLAGS
+ VALAFLAGS=-g
+ export VALAFLAGS
+ RUSTFLAGS='-Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Cstrip=none -Cforce-frame-pointers=yes -Clink-arg=-specs=/usr/lib/rpm/redhat/redhat-package-notes --cap-lints=warn'
+ export RUSTFLAGS
+ LDFLAGS='-Wl,-z,relro -Wl,--as-needed -Wl,-z,pack-relative-relocs -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -Wl,--build-id=sha1 -specs=/usr/lib/rpm/redhat/redhat-package-notes '
+ export LDFLAGS
+ LT_SYS_LIBRARY_PATH=/usr/lib64:
+ export LT_SYS_LIBRARY_PATH
+ CC=gcc
+ export CC
+ CXX=g++
+ export CXX
+ cd minikube-1.37.0
+ mkdir -p /home/nsoffer/rpmbuild/BUILD/minikube-1.37.0-build/BUILDROOT/usr/bin
+ install -m 755 minikube /home/nsoffer/rpmbuild/BUILD/minikube-1.37.0-build/BUILDROOT/usr/bin/minikube
+ /usr/lib/rpm/check-buildroot
+ /usr/lib/rpm/redhat/brp-ldconfig
+ /usr/lib/rpm/brp-compress
+ /usr/lib/rpm/brp-strip /bin/true
+ /usr/lib/rpm/brp-strip-comment-note /bin/true /usr/bin/objdump
+ /usr/lib/rpm/redhat/brp-strip-lto /bin/true
+ /usr/lib/rpm/brp-strip-static-archive /bin/true
+ /usr/lib/rpm/check-rpaths
+ /usr/lib/rpm/redhat/brp-mangle-shebangs
+ /usr/lib/rpm/brp-remove-la-files
+ env /usr/lib/rpm/redhat/brp-python-bytecompile '' 1 0 -j10
+ /usr/lib/rpm/redhat/brp-python-hardlink
+ /usr/bin/add-determinism --brp -j10 /home/nsoffer/rpmbuild/BUILD/minikube-1.37.0-build/BUILDROOT
Handler jar skipped: jar handler requires $SOURCE_DATE_EPOCH to be set
Handler gzip skipped: gzip handler requires $SOURCE_DATE_EPOCH to be set
Handler zip skipped: zip handler requires $SOURCE_DATE_EPOCH to be set
Scanned 3 directories and 1 files,
processed 0 inodes,
0 modified (0 replaced + 0 rewritten),
0 unsupported format, 0 errors
Processing files: minikube-1.37.0-0.x86_64
Provides: minikube = 1.37.0-0 minikube(x86-64) = 1.37.0-0
Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1
Requires: libc.so.6()(64bit) libc.so.6(GLIBC_2.14)(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.3.2)(64bit) libc.so.6(GLIBC_2.32)(64bit) libc.so.6(GLIBC_2.34)(64bit) libresolv.so.2()(64bit) rtld(GNU_HASH)
Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/nsoffer/rpmbuild/BUILD/minikube-1.37.0-build/BUILDROOT
Wrote: /home/nsoffer/minikube/out/x86_64/minikube-1.37.0-0.x86_64.rpm
Executing(rmbuild): /bin/sh -e /var/tmp/rpm-tmp.oq72oX
+ umask 022
+ cd /home/nsoffer/rpmbuild/BUILD/minikube-1.37.0-build
+ test -d /home/nsoffer/rpmbuild/BUILD/minikube-1.37.0-build
+ /usr/bin/chmod -Rf a+rX,u+w,g-w,o-w /home/nsoffer/rpmbuild/BUILD/minikube-1.37.0-build
+ rm -rf /home/nsoffer/rpmbuild/BUILD/minikube-1.37.0-build
+ RPM_EC=0
++ jobs -p
+ exit 0
RPM build warnings:
%source_date_epoch_from_changelog is set, but %changelog has no entries to take a date from
rm -rf /tmp/tmp.gjTTcBdWbX.minikube_1.37.0-x86_64-rpm
cp out/minikube-1.37.0-0.x86_64.rpm out/minikube-1.37.0.rpm
$ sudo dnf reinstall out/minikube-1.37.0.rpm
Updating and loading repositories:
Repositories loaded.
Package Arch Version Repository Size
Reinstalling:
minikube x86_64 1.37.0-0 @commandline 132.4 MiB
replacing minikube x86_64 1.37.0-0 @commandline 133.4 MiB
Transaction Summary:
Reinstalling: 1 package
Replacing: 1 package
Total size of inbound packages is 40 MiB. Need to download 0 B.
After this operation, 1 MiB will be freed (install 132 MiB, remove 133 MiB).
Is this ok [y/N]: y
Running transaction
[1/4] Verify package files 100% | 4.0 B/s | 1.0 B | 00m00s
[2/4] Prepare transaction 100% | 12.0 B/s | 2.0 B | 00m00s
[3/4] Reinstalling minikube-0:1.37.0-0.x86_64 100% | 254.1 MiB/s | 132.4 MiB | 00m01s
[4/4] Removing minikube-0:1.37.0-0.x86_64 100% | 12.0 B/s | 4.0 B | 00m00s
Warning: skipped OpenPGP checks for 1 package from repository: @commandline
Complete!
$ dnf info minikube
Updating and loading repositories:
Kubernetes 100% | 4.3 KiB/s | 1.8 KiB | 00m00s
Fedora 42 - x86_64 100% | 4.9 KiB/s | 8.3 KiB | 00m02s
Fedora 42 openh264 (From Cisco) - x86_64 100% | 634.0 B/s | 986.0 B | 00m02s
Fedora 42 - x86_64 - Updates 100% | 8.9 KiB/s | 5.4 KiB | 00m01s
Repositories loaded.
Installed packages
Name : minikube
Epoch : 0
Version : 1.37.0
Release : 0
Architecture : x86_64
Installed size : 132.4 MiB
Source : minikube-1.37.0-0.src.rpm
From repository : @commandline
Summary : Run Kubernetes locally
URL : https://github.com/kubernetes/minikube
License : ASL 2.0
Description : Minikube is a tool that makes it easy to run Kubernetes locally.
: Minikube runs a single-node Kubernetes cluster inside a VM on your
: laptop for users looking to try out Kubernetes or develop with it
: day-to-day.
Vendor : The Kubernetes Authors |
|
@nirs thanks fir confirming that this fill fix it, i didn't knew the file got deleted from the master |
Maybe it was deleted after you update the PR. But if you rebase your PR on master instead of pushing a commit fixing a previous commit, and fix the original commit, you will either discover that the file was deleted, or create a commit that will apply cleanly regardless of the existence of this file. |
|
Thanks nirs sorry for delayed response, forgot about the pr i have updated the branch now i don't think there will be any issue |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: divysinghvi, medyagh, nirs The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Fixes rpm: Missing vendor value
//I was not able to verify the fix if any admin can try and verify if this resolves the missing vendor issue
fixes issue #21588
Before