Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 553670 - sys-kernel/gentoo-sources-4.1.1 is linux-4.1 and not linux-4.1.1
Summary: sys-kernel/gentoo-sources-4.1.1 is linux-4.1 and not linux-4.1.1
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] Core system (show other bugs)
Hardware: All Linux
: Normal major (vote)
Assignee: Gentoo Kernel Bug Wranglers and Kernel Maintainers
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-06-30 20:17 UTC by Thomas Deutschmann (RETIRED)
Modified: 2015-07-01 15:55 UTC (History)
6 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Thomas Deutschmann (RETIRED) gentoo-dev 2015-06-30 20:17:09 UTC
Hi,

I wanted to upgrade to gentoo-sources-4.1.1 which should be based on linux-4.1.1. 

I was wondering that genkernel wrote that I was building linux-4.1.0:

> * Linux Kernel 4.1.0-gentoo for x86_64...
> * .. with config file /etc/kernels/kernel-config-x86_64-4.1.0-gentoo

but eselect was fine

> # eselect kernel list
> Available kernel symlink targets:
>   [1]   linux-4.0.5-gentoo
>   [2]   linux-4.1.0-gentoo
>   [3]   linux-4.1.0-gentoo-r1
>   [4]   linux-4.1.1-gentoo *

Also the symlink:

# ls -l /usr/src/
total 36
lrwxrwxrwx  1 root root   18 Jun 30 22:00 linux -> linux-4.1.1-gentoo
drwxr-xr-x 20 root root 4096 Jun 21 16:58 linux-4.0.0-gentoo
drwxr-xr-x 20 root root 4096 Jun 21 16:58 linux-4.0.1-gentoo
drwxr-xr-x 20 root root 4096 Jun 21 16:58 linux-4.0.2-gentoo
drwxr-xr-x 20 root root 4096 Jun 21 16:57 linux-4.0.3-gentoo
drwxr-xr-x 20 root root 4096 Jun 21 16:57 linux-4.0.4-gentoo
drwxr-xr-x 25 root root 4096 Jun 30 22:00 linux-4.0.5-gentoo
drwxr-xr-x 25 root root 4096 Jun 22 17:28 linux-4.1.0-gentoo
drwxr-xr-x 25 root root 4096 Jun 28 15:03 linux-4.1.0-gentoo-r1
drwxr-xr-x 24 root root 4096 Jun 30 22:01 linux-4.1.1-gentoo


After that I checked emerge log and noticed that gentoo-sources-4.1.1 is based on linux-4.1:

> >>> Emerging (1 of 3) sys-kernel/gentoo-sources-4.1.1::gentoo
>  * Fetching files in the background. To view fetch progress, run
>  * `tail -f /var/log/emerge-fetch.log` in another terminal.
>  * linux-4.1.tar.xz SHA256 SHA512 WHIRLPOOL size ;-) ...                                                         [ ok ]
>  * genpatches-4.1-4.base.tar.xz SHA256 SHA512 WHIRLPOOL size ;-) ...                                             [ ok ]
>  * genpatches-4.1-4.extras.tar.xz SHA256 SHA512 WHIRLPOOL size ;-) ...                                           [ ok ]
>  * genpatches-4.1-4.experimental.tar.xz SHA256 SHA512 WHIRLPOOL size ;-) ...                                     [ ok ]
> >>> Preparing to unpack ...
> >>> Unpacking source...
> >>> Unpacking linux-4.1.tar.xz to /var/tmp/portage/sys-kernel/gentoo-sources-4.1.1/work
> >>> Unpacking genpatches-4.1-4.base.tar.xz to /var/tmp/portage/sys-kernel/gentoo-sources-4.1.1/work/patches
> >>> Unpacking genpatches-4.1-4.extras.tar.xz to /var/tmp/portage/sys-kernel/gentoo-sources-4.1.1/work/patches
> >>> Unpacking genpatches-4.1-4.experimental.tar.xz to /var/tmp/portage/sys-kernel/gentoo-sources-4.1.1/work/patches
>  * Excluding Patch #5000_enable-additional-cpu-optimizations-for-gcc.patch ...                                   [ ok ]
>  * Excluding Patch #5015_kdbus*.patch ...                                                                        [ ok ]
>  * Applying 1500_XATTR_USER_PREFIX.patch (-p1) ...                                                               [ ok ]
>  * Applying 1510_fs-enable-link-security-restrictions-by-default.patch (-p1) ...                                 [ ok ]
>  * Applying 2700_ThinkPad-30-brightness-control-fix.patch (-p1) ...                                              [ ok ]
>  * Applying 2900_dev-root-proc-mount-fix.patch (-p1) ...                                                         [ ok ]
>  * Applying 2905_2disk-resume-image-fix.patch (-p1) ...                                                          [ ok ]
>  * Applying 2910_lz4-compression-fix.patch (-p1) ...                                                             [ ok ]
>  * Applying 4200_fbcondecor-3.19.patch (-p1) ...                                                                 [ ok ]
>  * Applying 4567_distro-Gentoo-Kconfig.patch (-p1) ...                                                           [ ok ]
>  * Applying 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch (-p1) ...   


There's no 

>  * Applying 1000_linux-4.1.1.patch (-p1)                 [ ok ]

like you would expect.


So it looks like there was something wrong the package got bumped.

Please also verify the gentoo-sources ebuild which got bumped today!




Reproducible: Always
Comment 1 Thomas Deutschmann (RETIRED) gentoo-dev 2015-06-30 20:29:40 UTC
I see the same for gentoo-sources-4.0.7.ebuild, released today.

And for me it looks like gentoo-sources-4.0.6 was already affected by the same problem because the genkernel announcement mail was empty like today:

last 3 genkernel mails (I only checked for 4.x):
https://archives.gentoo.org/gentoo-kernel/message/2d733360eeaecb92d48119aecc38ecf3
https://archives.gentoo.org/gentoo-kernel/message/caef09633e29d14aec3262d03cfa503f
https://archives.gentoo.org/gentoo-kernel/message/aa84e0052aa2bd03d4319bb397048191

These mails are "empty". Normally these mails look like

https://archives.gentoo.org/gentoo-kernel/message/e86f70ffcfe6c4ad82bc1a3fd8054532


3.x ebuilds looks fine. At least the genkernel announcement mails are listing added linux patches like expected.
Comment 2 Derk W te Bokkel 2015-06-30 21:48:28 UTC
looks like the SUBLEVEL change in the Makefile got missed in the patchset
Comment 3 Thomas Deutschmann (RETIRED) gentoo-dev 2015-06-30 21:56:22 UTC
No, the linux patch itself is missing:

See gentoo-sources-4.0.7 for example:

tar --list -f /usr/portage/distfiles/genpatches-4.0-7.base.tar.xz
./0000_README
./1000_linux-4.0.1.patch
./1001_linux-4.0.2.patch
./1002_linux-4.0.3.patch
./1003_linux-4.0.4.patch
./1004_linux-4.0.5.patch
./1500_XATTR_USER_PREFIX.patch
./1510_fs-enable-link-security-restrictions-by-default.patch
./2600_select-REGMAP_IRQ-for-rt5033.patch
./2700_ThinkPad-30-brightness-control-fix.patch
./2900_dev-root-proc-mount-fix.patch
./2905_2disk-resume-image-fix.patch
./2910_lz4-compression-fix.patch


...there's no

./1005_linux-4.0.6.patch
./1005_linux-4.0.7.patch

Same with the genpatches package for 4.1.
Comment 4 G.Wolfe Woodbury 2015-07-01 00:58:34 UTC
I can confirm that this is a true bug.  There is a missing patchset and
   make modules_install
replaces linux-4.1.0-gentoo and does not create linux-4.1.1-gentoo in /lib/modules
Comment 5 Patrick Lauer gentoo-dev 2015-07-01 03:11:27 UTC
+  01 Jul 2015; Patrick Lauer <patrick@gentoo.org> package.mask:
+  Mask kernel versions that are not actually the version they claim to be
+  #553670

These are indeed not what they claim to be!

Masking until maintainers can fix it.
Comment 6 Sven B. 2015-07-01 07:30:57 UTC
Since the genpatches for 4.1.1 are applied and available, as a workaround - for now - one can simply add the kernel 4.1.1 patch (from https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.1.1.xz) as a user patch (https://wiki.gentoo.org/wiki//etc/portage/patches#Adding_user_patches) to /etc/portage/patches/sys-kernel/gentoo-sources-4.1.1/1000_linux-4.1.1.patch .
Comment 7 jorgicio 2015-07-01 14:48:02 UTC
That's weird. I have no problem with kernel 4.0.7, the patch here was correctly applied as I compared between the patches themselves and the kernel sources just when installed.
Comment 8 Thomas Deutschmann (RETIRED) gentoo-dev 2015-07-01 15:09:10 UTC
You are right regarding gentoo-sources-4.0.7: I judged on the empty announcement mail, http://dev.gentoo.org/~mpagano/genpatches/trunk/4.0/ which doesn't list the linux-4.0.7 patch and checked wrong genpatches-4.0-7.base.tar.xz file which is the patch set from gentoo-sources-4.0.5.

gentoo-sources-4.0.7 uses genpatches-4.0-9.base.tar.xz which looks fine (besides the invalid announcement mail, incomplete trunk content).

But gentoo-sources-4.1.1 is definitely wrong: It uses genpatches-4.1-4 (see line 8 in https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-4.1.1.ebuild?view=markup) which does *not* contain the linux-4.1.1 patch.
Comment 9 Mike Pagano gentoo-dev 2015-07-01 15:48:19 UTC
(In reply to Thomas D. from comment #3)
> No, the linux patch itself is missing:
> 
> See gentoo-sources-4.0.7 for example:
> 
> tar --list -f /usr/portage/distfiles/genpatches-4.0-7.base.tar.xz
> ./0000_README
> ./1000_linux-4.0.1.patch
> ./1001_linux-4.0.2.patch
> ./1002_linux-4.0.3.patch
> ./1003_linux-4.0.4.patch
> ./1004_linux-4.0.5.patch
> ./1500_XATTR_USER_PREFIX.patch
> ./1510_fs-enable-link-security-restrictions-by-default.patch
> ./2600_select-REGMAP_IRQ-for-rt5033.patch
> ./2700_ThinkPad-30-brightness-control-fix.patch
> ./2900_dev-root-proc-mount-fix.patch
> ./2905_2disk-resume-image-fix.patch
> ./2910_lz4-compression-fix.patch
> 
> 
> ...there's no
> 
> ./1005_linux-4.0.6.patch
> ./1005_linux-4.0.7.patch
> 
> Same with the genpatches package for 4.1.

I'm not sure why you see that but 4.0.7 works fine for me.

>>> Unpacking genpatches-4.0-9.base.tar.xz to /tmp/portage/sys-kernel/gentoo-sources-4.0.7/work/patches
debug: genpatches tarball:
>>> Unpacking genpatches-4.0-9.extras.tar.xz to /tmp/portage/sys-kernel/gentoo-sources-4.0.7/work/patches
debug: genpatches tarball:
 * Excluding Patch #5000_enable-additional-cpu-optimizations-for-gcc.patch ...                                                      [ ok ]
 * Excluding Patch #5015_kdbus*.patch ...                                                                                           [ ok ]
 * Applying 1000_linux-4.0.1.patch (-p1) ...                                                                                        [ ok ]
 * Applying 1001_linux-4.0.2.patch (-p1) ...                                                                                        [ ok ]
 * Applying 1002_linux-4.0.3.patch (-p1) ...                                                                                        [ ok ]
 * Applying 1003_linux-4.0.4.patch (-p1) ...                                                                                        [ ok ]
 * Applying 1004_linux-4.0.5.patch (-p1) ...                                                                                        [ ok ]
 * Applying 1005_linux-4.0.6.patch (-p1) ...                                                                                        [ ok ]
 * Applying 1006_linux-4.0.7.patch (-p1) ...                                                                                        [ ok ]
 * Applying 1500_XATTR_USER_PREFIX.patch (-p1) ...                                                                                  [ ok ]
 * Applying 1510_fs-enable-link-security-restrictions-by-default.patch (-p1) ...                                                    [ ok ]
 * Applying 2600_select-REGMAP_IRQ-for-rt5033.patch (-p1) ...                                                                       [ ok ]
 * Applying 2700_ThinkPad-30-brightness-control-fix.patch (-p1) ...                                                                 [ ok ]
 * Applying 2900_dev-root-proc-mount-fix.patch (-p1) ...                                                                            [ ok ]
 * Applying 2905_2disk-resume-image-fix.patch (-p1) ...                                                                             [ ok ]
 * Applying 2910_lz4-compression-fix.patch (-p1) ...                                                                                [ ok ]
 * Applying 4200_fbcondecor-3.19.patch (-p1) ...                                                                                    [ ok ]
 * Applying 4567_distro-Gentoo-Kconfig.patch (-p1) ... 

But 4.1 was definitely a miss. Thanks for reporting.
Comment 10 Mike Pagano gentoo-dev 2015-07-01 15:55:55 UTC
*gentoo-sources-4.1.1-r1 (01 Jul 2015)

  01 Jul 2015; Mike Pagano <mpagano@gentoo.org>
  +gentoo-sources-4.1.1-r1.ebuild:
  Correctly contains the 4.1.1 patchset.

>>> Unpacking genpatches-4.1-5.extras.tar.xz to /tmp/portage/sys-kernel/gentoo-sources-4.1.1-r1/work/patches
debug: genpatches tarball:
 * Excluding Patch #5000_enable-additional-cpu-optimizations-for-gcc.patch ...                                                      [ ok ]
 * Excluding Patch #5015_kdbus*.patch ... [ ok ]
 * Applying 1000_linux-4.1.1.patch (-p1) ... [ ok ]
 * Applying 1500_XATTR_USER_PREFIX.patch (-p1) ...[ ok ]
 * Applying 1510_fs-enable-link-security-restrictions-by-default.patch (-p1) ...      [ ok ]
 * Applying 2700_ThinkPad-30-brightness-control-fix.patch (-p1) ... [ ok ]
 * Applying 2900_dev-root-proc-mount-fix.patch (-p1) ... [ ok ]
 * Applying 2905_2disk-resume-image-fix.patch (-p1) ... [ ok ]
 * Applying 2910_lz4-compression-fix.patch (-p1) ... [ ok ]
 * Applying 4200_fbcondecor-3.19.patch (-p1) ... [ ok ]
 * Applying 4567_distro-Gentoo-Kconfig.patch (-p1) ... [ ok ]