- 06 11月, 2018 1 次提交
-
-
由 Masahiro Yamada 提交于
Zhenzhong Duan reported that running 'make O=/build/kernel binrpm-pkg' failed with the following errors: Running 'make O=/build/kernel binrpm-pkg' failed with below two errors. Makefile:600: include/config/auto.conf: No such file or directory + cp make -C /mnt/root/kernel O=/build/kernel image_name make -f /mnt/root/kernel/Makefile ... cp: invalid option -- 'C' Try 'cp --help' for more information. Prior to commit 80463f1b ("kbuild: add --include-dir flag only for out-of-tree build"), both srctree and objtree were added to --include-dir redundantly, and the wrong code 'make image_name' was working by relying on that. Now, the potential issue that had previously been hidden just showed up. 'make image_name' recurses to the generated $(objtree)/Makefile and ends up with running in srctree, which is incorrect. It should be invoked with '-f $srctree/Makefile' (or KBUILD_SRC=) to be executed in objtree. Fixes: 80463f1b ("kbuild: add --include-dir flag only for out-of-tree build") Reported-by: NZhenzhong Duan <zhenzhong.duan@oracle.com> Signed-off-by: NMasahiro Yamada <yamada.masahiro@socionext.com>
-
- 13 4月, 2018 1 次提交
-
-
由 Javier Martinez Canillas 提交于
The new-kernel-pkg script is only present when grubby is installed, but it may not always be the case. So if the script isn't present, attempt to use the kernel-install script as a fallback instead. Signed-off-by: NJavier Martinez Canillas <javierm@redhat.com> Signed-off-by: NMasahiro Yamada <yamada.masahiro@socionext.com>
-
- 28 3月, 2018 1 次提交
-
-
由 Jason Gunthorpe 提交于
There is a change in how command line parsing is done in this version. Excludes and includes are now ordered with the file list. Since the spec file puts the file list before the exclude list it means newer tar ignores the excludes and packs all the build output into the kernel-devel RPM resulting in a huge package. Simple argument re-ordering fixes the problem. Signed-off-by: NJason Gunthorpe <jgg@mellanox.com> Signed-off-by: NMasahiro Yamada <yamada.masahiro@socionext.com>
-
- 14 11月, 2017 3 次提交
-
-
由 Masahiro Yamada 提交于
$RPM_BUILD_ROOT must be escaped to prevent shell from expanding it when generating the spec file. %{build_root} is more readable than \$RPM_BUILD_ROOT. Signed-off-by: NMasahiro Yamada <yamada.masahiro@socionext.com>
-
由 Masahiro Yamada 提交于
When CONFIG_MODULES is disabled, make rpm-pkg / binrpm-pkg fails with the following message: The present kernel configuration has modules disabled. Type 'make config' and enable loadable module support. Then build a kernel with module support enabled. Do not install modules in the case. Also, omit the devel package. Signed-off-by: NMasahiro Yamada <yamada.masahiro@socionext.com>
-
由 Masahiro Yamada 提交于
The repeat of echo is unreadable. The here-document is a well-known device for such scripts. One difficulty is we have a bunch of PREBUILT conditionals that would split the here-document. My idea is to add "$S" annotatation to lines only for the source package spec file, then post-process it by sed. I hope it will make our life easier than repeat of "cat <<EOF ..." I confirmed this commit still produced the same (bin)kernel.spec as before. Signed-off-by: NMasahiro Yamada <yamada.masahiro@socionext.com>
-
- 09 10月, 2017 3 次提交
-
-
由 Masahiro Yamada 提交于
Clean up the mkspec without changing the behavior. - grep CONFIG_DRM=y more simply - move "EXCLUDE" out of the "%install" section because it can be computed when the spec file is generated - remove "BuildRoot:" field, which is now redundant - do not mkdir $RPM_BUILD_ROOT/lib/modules explicitly because it is automatically created by "make modules_install" - exclude "%package devel" from source package spec file because it does not make sense where "%files devel" is already excluded - exclude "%build" from source package spec file - remove unneeded "make clean" because we had already cleaned before making tar file - merge two %ifarch ia64 conditionals - replace KBUILD_IMAGE with direct use of $(make image_name) - remove trailing empty line from the spec file Signed-off-by: NMasahiro Yamada <yamada.masahiro@socionext.com>
-
由 Masahiro Yamada 提交于
This conditional was added by commit fc370ecf ("kbuild: add vmlinux to kernel rpm"). Its git-log mentioned vmlinux.bz2 was necessary for debugging, but did not explain why ppc64 was an exception. I see no problem to copy vmlinux.bz2 all the time. Signed-off-by: NMasahiro Yamada <yamada.masahiro@socionext.com>
-
由 Masahiro Yamada 提交于
This conditional was added by commit 1a0f3d42 ("kbuild: fix make rpm for powerpc"). Its git-log explains the default kernel image is zImage, but obviously the current arch/powerpc/Makefile does not set KBUILD_IMAGE, so the image file is actually vmlinux. Moreover, since commit 09549aa1 ("deb-pkg: Remove the KBUILD_IMAGE workaround"), all architectures are supposed to set the full path to the image in KBUILD_IMAGE. I see no good reason to differentiate ppc64 from others. Rip off the conditional. Signed-off-by: NMasahiro Yamada <yamada.masahiro@socionext.com>
-
- 20 9月, 2017 2 次提交
-
-
由 Masahiro Yamada 提交于
The "Release:" field of the spec file is determined based on the .version file. However, the .version file is not copied to the source tar file. So, when we build the kernel from the source package, the UTS_VERSION always indicates #1. This does not match with "rpm -q". The kernel UTS_VERSION and "rpm -q" do not agree for binrpm-pkg, either. Please note the kernel has already been built before the spec file is created. Currently, mkspec invokes mkversion. This script returns an incremented version. So, the "Release:" field of the spec file is greater than the version in the kernel by one. For the source package build (where .version file is missing), we can give KBUILD_BUILD_VERSION=%{release} to the build command. For the binary package build, we can simply read out the .version file because it contains the version number that was used for building the kernel image. We can remove scripts/mkversion because scripts/package/Makefile need not touch the .version file. Signed-off-by: NMasahiro Yamada <yamada.masahiro@socionext.com>
-
由 Masahiro Yamada 提交于
Commit 5620a0d1 ("firmware: delete in-kernel firmware") deleted in-kernel firmware support, including "make firmware_install". Since then, "make rpm-pkg" / "make binrpm-pkg" fails to build with the error: make[2]: *** No rule to make target `firmware_install'. Stop. Commit df85b2d7 ("firmware: Restore support for built-in firmware") restored the build infrastructure for CONFIG_EXTRA_FIRMWARE, but this is out of the scope of "make firmware_install". So, the right thing to do is to kill the use of "make firmware_install". Fixes: 5620a0d1 ("firmware: delete in-kernel firmware") Signed-off-by: NMasahiro Yamada <yamada.masahiro@socionext.com> Acked-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
-
- 11 12月, 2016 1 次提交
-
-
由 Anton Tikhomirov 提交于
Brace expansion might not work properly if _buildshell RPM macro points to a shell other than bash. Particularly, with _bulidshell defined to /bin/dash it leads to broken build and source symlinks. Signed-off-by: NAnton Tikhomirov <anton.tikhomirov@cdnetworks.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
- 20 4月, 2016 1 次提交
-
-
由 Jiri Kosina 提交于
When uninstalling kernel RPM, we're unconditionally calling "new-kernel-pkg --remove". This is useless on systems which are based on 'update-bootloader' script instead. Support update-bootloader removal method as well in case the script is present; contrary to new-kernel-pkg, this needs to be done in %postun, otherwise update-bootloader will refuse to remove entry for kernel for which the binary still exists. Signed-off-by: NJiri Kosina <jkosina@suse.cz> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
- 05 3月, 2016 1 次提交
-
-
由 Paolo Abeni 提交于
This patch add a rpm preuninstall scriptlet to cleanup the boot loader configuration on kernel package uninstall. The initrd for the to-be-removed kernel is deleted, too. Signed-off-by: NPaolo Abeni <pabeni@redhat.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
- 26 2月, 2016 1 次提交
-
-
由 Jiri Kosina 提交于
mkspec is copying built kernel to temporrary location /boot/vmlinuz-$KERNELRELEASE-rpm and runs installkernel on it. This however directly leads to grub2 menuentry for this suffixed binary being generated as well during the run of installkernel script. Later in the process the temporary -rpm suffixed files are removed, and therefore we end up with spurious (and non-functional) grub2 menu entries for each installed kernel RPM. Fix that by using a different temporary name (prefixed by '.'), so that the binary is not recognized as an actual kernel binary and no menuentry is created for it. Signed-off-by: NJiri Kosina <jkosina@suse.cz> Fixes: 3c9c7a14 ("rpm-pkg: add %post section to create initramfs and grub hooks") Signed-off-by: NMichal Marek <mmarek@suse.com>
-
- 26 8月, 2015 1 次提交
-
-
由 Mike Marciniszyn 提交于
This causes conflicts when using multiple kernels built with this mechanism. Reviewed-by: NDennis Dalessandro <dennis.dalessandro@intel.com> Signed-off-by: NMike Marciniszyn <mike.marciniszyn@intel.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
- 27 4月, 2015 1 次提交
-
-
由 Borislav Petkov 提交于
No need for the intermediary vmlinux.orig - bzip2 can keep the original files used for compression with --keep. Signed-off-by: NBorislav Petkov <bp@suse.de> Signed-off-by: NMichal Marek <mmarek@suse.cz>
-
- 08 12月, 2014 1 次提交
-
-
由 Jérôme Glisse 提交于
When doing make binrpm-pkg we only want to build the binary and header package as the documentation of binrpm-pkg target claims. Hence this patch avoid building the source and devel package. This makes binrpm-pkg target lot faster and way more usefull. Signed-off-by: NJérôme Glisse <jglisse@redhat.com> Cc: Michal Marek <mmarek@suse.cz> [mmarek: used subject line from v3] Signed-off-by: NMichal Marek <mmarek@suse.cz>
-
- 23 7月, 2013 3 次提交
-
-
由 Mike Marciniszyn 提交于
Change the spec file to generate a kernel-devel module allowing for compilation of external kernel modules. This patch requires a new minimum RPM level of 4.0.3. Signed-off-by: NMike Marciniszyn <mike.marciniszyn@intel.com> Signed-off-by: NMichal Marek <mmarek@suse.cz>
-
由 Mike Marciniszyn 提交于
Prior to this patch, firmware files were being installed in /lib/firmware with a potential conflict with already installed kernels. firmware files are now installed in /lib/firmware/<release> and packaged with the rest of the modules. Signed-off-by: NMike Marciniszyn <mike.marciniszyn@intel.com> Signed-off-by: NMichal Marek <mmarek@suse.cz>
-
由 Mike Marciniszyn 提交于
/sbin/installkernel is used to insure grub hooks are inserted and the initramfs is created on the target system. The invokation installkernel will work with any kernel as long as: - /sbin/installkernel exists - the kernel and sysem map files are readable Signed-off-by: NMike Marciniszyn <mike.marciniszyn@intel.com> Signed-off-by: NMichal Marek <mmarek@suse.cz>
-
- 24 6月, 2013 1 次提交
-
-
由 Mike Marciniszyn 提交于
The following issue can be reproduced with Linus' tree on an x86_64 server. >+ cp /home/user/rpmbuild-test/BUILDROOT/kernel-3.9.2.x86_64/boot/vmlinuz-3.9.2 >cp: missing destination file operand after >/home/user/rpmbuild-test/BUILDROOT/kernel-3.9.2-1.x86_64/boot/vmlinuz-3.9.2' >Try `cp --help' for more information. >error: Bad exit status from /var/tmp/rpm-tmp.R4o0iI (%install) Here are the commands to reproduce: make defconfig make rpm-pkg Use the resulting src rpm to build as follows: mkdir ~/rpmbuild-test cd ~/rpmbuild-test rpmbuild --rebuild --define "_topdir `pwd`" -vv ~/rpmbuild/SRPMS/kernel-3.10.0_rc1+-1.src.rpm The issue is because the %install script uses $KBUILD_IMAGE and it hasn't been set since it is only available in the kbuild system and not in the %install script. This patch adds a Makefile target to emit the image_name that can be used and modifies the mkspec to use the dynamic name in %install. Signed-off-by: NMike Marciniszyn <mike.marciniszyn@intel.com> Signed-off-by: NMichal Marek <mmarek@suse.cz>
-
- 22 2月, 2013 1 次提交
-
-
由 David R. Bild 提交于
'make rpm-pkg' and 'make binrpm-pkg' fail when the kernel source is read-only. Specifically, when the RPM spec generated by scripts/package/mkspec is run, KBUILD_SRC happens to be set to the source location and thus the invocation of 'make headers_install' fails when an internal call to 'filechk' tries to write a file into the source tree. The fix is to clear KBUILD_SRC for the 'make headers_install' invocation in the spec file, as is already done for the 'make modules_install' invocation. Signed-off-by: NDavid R. Bild <drbild@umich.edu> Signed-off-by: NMichal Marek <mmarek@suse.cz>
-
- 25 5月, 2011 1 次提交
-
-
由 Arun Sharma 提交于
To compile binaries which depend on new kernel interfaces, we need a kernel-headers RPM Signed-off-by: NArun Sharma <asharma@fb.com> Signed-off-by: NMichal Marek <mmarek@suse.cz>
-
- 05 5月, 2011 1 次提交
-
-
由 Arun Sharma 提交于
Removing the '-' results in hard to read filenames such as: kernel-2.6.35.2000042g76e4caf-28.x86_64.rpm kernel-2.6.35.2_000042_g76e4caf-28.x86_64.rpm is easier to read. Signed-off-by: NArun Sharma <asharma@fb.com> Signed-off-by: NMichal Marek <mmarek@suse.cz>
-
- 14 10月, 2010 1 次提交
-
-
由 Nishanth Aravamudan 提交于
Same fix as in 13797b77 is needed for the "new" line invoking _smp_mflags for modules_install. Without the fix, `make binrpm-pkg` fails with: + make '%{_smp_mflags}' KBUILD_SRC= modules_install make[2]: warning: jobserver unavailable: using -j1. Add `+' to parent make rule. make[2]: *** No rule to make target `%{_smp_mflags}'. Stop. error: Bad exit status from /var/tmp/rpm-tmp.8S9B9e (%install) Signed-off-by: NNishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: NMichal Marek <mmarek@suse.cz>
-
- 29 3月, 2010 1 次提交
-
-
由 Gilles Espinasse 提交于
Signed-off-by: NGilles Espinasse <g.esp@free.fr> Signed-off-by: NJiri Kosina <jkosina@suse.cz>
-
- 02 2月, 2010 1 次提交
-
-
由 John Saalwaechter 提交于
The mkspec script hardcodes "/var/tmp" into the generated rpm spec file's BuildRoot. The user, however, may have a custom setting for %_tmppath, which should be used in BuildRoot. This patch changes mkspec's BuildRoot output to appropriately use %_tmppath. Signed-off-by: NJohn Saalwaechter <saalwaechter@gmail.com> Signed-off-by: NMichal Marek <mmarek@suse.cz>
-
- 12 10月, 2009 1 次提交
-
-
由 Frans Pop 提交于
The binrpm-pkg target (binary RPM only) fails when called with KBUILD_OUTPUT set. This patch makes it work. For the rpm-pkg target (source + binary RPM), building with KBUILD_OUTPUT set is not possible and also not needed as the actual build is done in a temporary directory anyway, so check that KBUILD_OUTPUT is not set in that case to avoid later errors. Signed-off-by: NFrans Pop <elendil@planet.nl> Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
-
- 07 3月, 2009 1 次提交
-
-
由 Josh Hunt 提交于
The contents of the %clean section in mkspec is currently commented out leaving RPM_BUILD_ROOT and its contents on the build machine. This patch removes it once the rpm build process is complete. Signed-off-by: NJosh Hunt <josh@scalex86.org> Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
-
- 15 2月, 2009 1 次提交
-
-
由 Josh Hunt 提交于
We are building an automated system to test kernels weekly and need to provide an rpm to our QA dept. We would like to use the ability to create kernel rpms already in the kernel's Makefile, but need the vmlinux file included in the rpm for later debugging. This patch adds a compressed vmlinux to the kernel rpm when doing a make rpm-pkg or binrpm-pkg and upon install places the vmlinux file in /boot. Signed-off-by: NJosh Hunt <josh@scalex86.org> Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
-
- 30 10月, 2008 2 次提交
-
-
由 Jeremy Kerr 提交于
Currently, if we do a 'make rpm-pkg' without the _smp_mflags rpm macro defined, the build fails with: [snip] Executing(%build): /bin/bash -e /var/tmp/rpm-tmp.67959 + umask 022 + cd /home/jk/devel/kernel-snapshot/rpm/BUILD + cd kernel-2.6.26 + make clean + make '%{_smp_mflags}' make[3]: *** No rule to make target `%{_smp_mflags}'. Stop. error: Bad exit status from /var/tmp/rpm-tmp.67959 (%build) This change uses the 'null if not set' reference to the _smp_mflags macro instead. Signed-off-by: NJeremy Kerr <jk@ozlabs.org> Signed-off-by: NAndrew Morton <akpm@linux-foundation.org> Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
-
由 Evgeniy Manachkin 提交于
This is patch to fix incorrect mkspec script to make rpm correctly at 2.6.27 vanilla kernel. This is regression in 2.6.27. 2.6.26 make rpm work good. In 2.6.27 'make rpm' say error from rpmbuild "Many unpacked files (*.fw)." Signed-off-by: NEvgeniy Manachkin <sfstudio@mail.ru> Acked-by: NAlan Cox <alan@redhat.com> Signed-off-by: NSam Ravnborg <sam@ravnborg.org> Cc: Stable <stable@kernel.org>
-
- 25 9月, 2006 1 次提交
-
-
由 Rolf Eike Beer 提交于
"mkdir -p" does not only mean not to complain if the directory already exists, but also to create the parent directories if needed. This patch removes "lib" from the list of directories to create as we will also create "lib/modules". Signed-off-by: NRolf Eike Beer <eike-kernel@sf-tec.de> Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
-
- 09 6月, 2006 1 次提交
-
-
由 Mike Wolf 提交于
The default target for most powerpc platforms is zImage. The zImage however is in arch/powerpc/boot and the mkspec script was set up to get the kernel from the top level of the kernel tree. This patch copies vmlinux to arch/powerpc/boot and then copies the kernel to the tmp directory so the rpm can be made. Signed-off-by: NMike Wolf <mjw@us.ibm.com> Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
-
- 14 7月, 2005 1 次提交
-
-
由 Greg Edwards 提交于
On ia64, only the EFI (fat) partition is available to boot from. The rpm needs to install the kernel under /boot/efi to be useable on ia64. Signed-off-by: NGreg Edwards <edwardsg@sgi.com> Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
-
- 17 4月, 2005 1 次提交
-
-
由 Linus Torvalds 提交于
Initial git repository build. I'm not bothering with the full history, even though we have it. We can create a separate "historical" git archive of that later if we want to, and in the meantime it's about 3.2GB when imported into git - space that would just make the early git days unnecessarily complicated, when we don't have a lot of good infrastructure for it. Let it rip!
-