Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a704d6d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-v4.14' of... 

Merge tag 'kbuild-fixes-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild fixes from Masahiro Yamada:
 "Here are some early Kbuild fixes.

  The in-kernel firmware was removed during the previous merge window.
  Since then, some bug reports of broken rpm building are flying in ML.
  We need to fix it now.

  Summary:

   - remove firmware install from rpm-pkg / deb-pkg

   - fix mismatch between release number and UTS_VERSION for rpm-pkg"

* tag 'kbuild-fixes-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kbuild: rpm-pkg: fix version number handling
  kbuild: deb-pkg: remove firmware package support
  kbuild: rpm-pkg: delete firmware_install to fix build error
parents 449cd5d2 25b080bd

scripts/mkversion

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
if [ ! -f .version ]

then

    echo 1

else

    expr 0`cat .version` + 1

fi

scripts/package/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -50,8 +50,6 @@ rpm-pkg rpm: FORCE 
	$(MAKE) clean

	$(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec

	$(call cmd,src_tar,$(KERNELPATH),kernel.spec)

	$(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version

	mv -f $(objtree)/.tmp_version $(objtree)/.version

	rpmbuild $(RPMOPTS) --target $(UTS_MACHINE) -ta $(KERNELPATH).tar.gz

	rm $(KERNELPATH).tar.gz kernel.spec
@@ -60,9 +58,6 @@ rpm-pkg rpm: FORCE 
binrpm-pkg: FORCE

	$(MAKE) KBUILD_SRC=

	$(CONFIG_SHELL) $(MKSPEC) prebuilt > $(objtree)/binkernel.spec

	$(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version

	mv -f $(objtree)/.tmp_version $(objtree)/.version



	rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \

		$(UTS_MACHINE) -bb $(objtree)/binkernel.spec

	rm binkernel.spec

scripts/package/builddeb

+1 −21
Original line number Diff line number Diff line
@@ -92,12 +92,10 @@ else 
fi

sourcename=$KDEB_SOURCENAME

tmpdir="$objtree/debian/tmp"

fwdir="$objtree/debian/fwtmp"

kernel_headers_dir="$objtree/debian/hdrtmp"

libc_headers_dir="$objtree/debian/headertmp"

dbg_dir="$objtree/debian/dbgtmp"

packagename=linux-image-$version

fwpackagename=linux-firmware-image-$version

kernel_headers_packagename=linux-headers-$version

libc_headers_packagename=linux-libc-dev

dbg_packagename=$packagename-dbg
@@ -126,10 +124,9 @@ esac 
BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"



# Setup the directory structure

rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files

rm -rf "$tmpdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files

mkdir -m 755 -p "$tmpdir/DEBIAN"

mkdir -p "$tmpdir/lib" "$tmpdir/boot"

mkdir -p "$fwdir/lib/firmware/$version/"

mkdir -p "$kernel_headers_dir/lib/modules/$version/"



# Build and install the kernel
@@ -306,7 +303,6 @@ else 
	cat <<EOF >> debian/control



Package: $packagename

Suggests: $fwpackagename

Architecture: any

Description: Linux kernel, version $version

 This package contains the Linux kernel, modules and corresponding other
@@ -345,22 +341,6 @@ Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch} 
 This is useful for people who need to build external modules

EOF



# Do we have firmware? Move it out of the way and build it into a package.

if [ -e "$tmpdir/lib/firmware" ]; then

	mv "$tmpdir/lib/firmware"/* "$fwdir/lib/firmware/$version/"

	rmdir "$tmpdir/lib/firmware"



	cat <<EOF >> debian/control



Package: $fwpackagename

Architecture: all

Description: Linux kernel firmware, version $version

 This package contains firmware from the Linux kernel, version $version.

EOF



	create_package "$fwpackagename" "$fwdir"

fi



cat <<EOF >> debian/control



Package: $libc_headers_packagename

scripts/package/mkspec

+4 −10
Original line number Diff line number Diff line
@@ -27,9 +27,7 @@ __KERNELRELEASE=`echo $KERNELRELEASE | sed -e "s/-/_/g"` 
echo "Name: kernel"

echo "Summary: The Linux Kernel"

echo "Version: $__KERNELRELEASE"

# we need to determine the NEXT version number so that uname and

# rpm -q will agree

echo "Release: `. $srctree/scripts/mkversion`"

echo "Release: $(cat .version 2>/dev/null || echo 1)"

echo "License: GPL"

echo "Group: System Environment/Kernel"

echo "Vendor: The Linux Community"
@@ -77,7 +75,7 @@ fi 
echo "%build"



if ! $PREBUILT; then

echo "make clean && make %{?_smp_mflags}"

echo "make clean && make %{?_smp_mflags} KBUILD_BUILD_VERSION=%{release}"

echo ""

fi
@@ -88,11 +86,8 @@ echo 'mkdir -p $RPM_BUILD_ROOT/boot/efi $RPM_BUILD_ROOT/lib/modules' 
echo "%else"

echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib/modules'

echo "%endif"

echo 'mkdir -p $RPM_BUILD_ROOT'"/lib/firmware/$KERNELRELEASE"



echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{?_smp_mflags} KBUILD_SRC= mod-fw= modules_install'

echo 'INSTALL_FW_PATH=$RPM_BUILD_ROOT'"/lib/firmware/$KERNELRELEASE"

echo 'make INSTALL_FW_PATH=$INSTALL_FW_PATH' firmware_install

echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{?_smp_mflags} KBUILD_SRC= modules_install'

echo "%ifarch ia64"

echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/efi/vmlinuz-$KERNELRELEASE"

echo 'ln -s '"efi/vmlinuz-$KERNELRELEASE" '$RPM_BUILD_ROOT'"/boot/"
@@ -119,7 +114,7 @@ if ! $PREBUILT; then 
echo 'rm -f $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE/build"

echo 'rm -f $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE/source"

echo "mkdir -p "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE"

echo "EXCLUDES=\"$RCS_TAR_IGNORE --exclude .tmp_versions --exclude=*vmlinux* --exclude=*.o --exclude=*.ko --exclude=*.cmd --exclude=Documentation --exclude=firmware --exclude .config.old --exclude .missing-syscalls.d\""

echo "EXCLUDES=\"$RCS_TAR_IGNORE --exclude .tmp_versions --exclude=*vmlinux* --exclude=*.o --exclude=*.ko --exclude=*.cmd --exclude=Documentation --exclude .config.old --exclude .missing-syscalls.d\""

echo "tar "'$EXCLUDES'" -cf- . | (cd "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE;tar xvf -)"

echo 'cd $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE"

echo "ln -sf /usr/src/kernels/$KERNELRELEASE build"
@@ -154,7 +149,6 @@ echo '%defattr (-, root, root)' 
echo "/lib/modules/$KERNELRELEASE"

echo "%exclude /lib/modules/$KERNELRELEASE/build"

echo "%exclude /lib/modules/$KERNELRELEASE/source"

echo "/lib/firmware/$KERNELRELEASE"

echo "/boot/*"

echo ""

echo "%files headers"