Bug 187786 - [exp-run] [PATCH] linux-c6- ports and amends to Mk/ infrastructure
Summary: [exp-run] [PATCH] linux-c6- ports and amends to Mk/ infrastructure
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Ports Framework (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Johannes Jost Meixner
URL:
Keywords:
: 192404 (view as bug list)
Depends on:
Blocks:
 
Reported: 2014-03-20 10:30 UTC by Johannes Meixner
Modified: 2014-12-15 22:13 UTC (History)
7 users (show)

See Also:
antoine: exp-run?


Attachments
linux-ports.diff (642.49 KB, patch)
2014-03-20 10:30 UTC, Johannes Meixner
no flags Details | Diff
centos-r360334.patch (578.33 KB, patch)
2014-07-03 01:56 UTC, dennylin93
no flags Details | Diff
Amend Mk/ to make centos 6.5 stuff default. (2.39 KB, patch)
2014-09-22 11:26 UTC, Johannes Jost Meixner
no flags Details | Diff
Remove last remnant of f10 as default. (2.62 KB, patch)
2014-09-22 11:29 UTC, Johannes Jost Meixner
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Johannes Meixner 2014-03-20 10:30:00 UTC
The git diff attached introduces linux-c6 ports, necessary changes to make CentOS
6.5 the default linux_base, amends to linux-f10- ports, linux-base-[f10|c6] and
hopefully all ports concerned by this merge.

Should it for some reason not be picked up by GNATS, the compressed diff.xz can be 
found at http://xmj.me/freebsd/linux-ports.diff.xz

Likewise there's a http://xmj.me/freebsd/linux-ports.txz that contains the
directory structure (but without category Makefiles; thus breaking INDEX).

Best regards,
Johannes Meixner

How-To-Repeat: * git clone https://github.com/freebsd/freebsd-ports.git
* apply attached git diff

alternatively
* svn checkout recent portstree
* tar xvJf linux-ports.txz and copy into portstree
Comment 1 Mathieu Arnold freebsd_committer freebsd_triage 2014-03-20 11:52:28 UTC
Responsible Changed
From-To: freebsd-ports-bugs->portmgr

exp-run.
Comment 2 Bryan Drewery freebsd_committer freebsd_triage 2014-03-20 13:01:54 UTC
Responsible Changed
From-To: portmgr->bdrewery

take for exp-run
Comment 3 Bryan Drewery freebsd_committer freebsd_triage 2014-04-04 11:18:54 UTC
Results using http://xmj.me/freebsd/exprun.patch with sysctl
compat.linux.osrelease=2.6.18

Logs at
http://package18.nyi.freebsd.org/bulk/91amd64-default-pr_187786/2014-03-30_15h46m41s/

New failures:

> + {"origin"=>"accessibility/linux-f10-atk", "phase"=>"fetch", "errortype"=>"fetch"}
> + {"origin"=>"archivers/linux-f10-ucl", "phase"=>"fetch", "errortype"=>"fetch"}
> + {"origin"=>"audio/linux-f10-alsa-plugins-oss", "phase"=>"run-depends", "errortype"=>"cluster"}
> + {"origin"=>"audio/linux-f10-esound", "phase"=>"run-depends", "errortype"=>"cluster"}
> + {"origin"=>"audio/linux-f10-libvorbis", "phase"=>"run-depends", "errortype"=>"cluster"}
> + {"origin"=>"audio/linux-f10-nas-libs", "phase"=>"fetch", "errortype"=>"fetch"}
> + {"origin"=>"audio/linux-f10-openal", "phase"=>"run-depends", "errortype"=>"cluster"}
> + {"origin"=>"audio/linux-f10-openal-soft", "phase"=>"run-depends", "errortype"=>"cluster"}
> + {"origin"=>"audio/linux-f10-sdl_mixer", "phase"=>"fetch", "errortype"=>"fetch"}
> + {"origin"=>"devel/libvirt-glib", "phase"=>"fetch/runaway", "errortype"=>"runaway_process"}
> + {"origin"=>"devel/linux-f10-allegro", "phase"=>"run-depends", "errortype"=>"cluster"}
> + {"origin"=>"devel/linux-f10-dbus-glib", "phase"=>"run-depends", "errortype"=>"cluster"}
> + {"origin"=>"devel/linux-f10-nspr", "phase"=>"fetch", "errortype"=>"fetch"}
> + {"origin"=>"devel/linux-f10-sdl12", "phase"=>"run-depends", "errortype"=>"cluster"}
> + {"origin"=>"dns/linux-f10-libasyncns", "phase"=>"fetch", "errortype"=>"fetch"}
> + {"origin"=>"editors/komodo-edit", "phase"=>"run-depends", "errortype"=>"cluster"}
> + {"origin"=>"editors/texmaker", "phase"=>"fetch", "errortype"=>"fetch"}
> + {"origin"=>"ftp/linux-f10-curl", "phase"=>"run-depends", "errortype"=>"cluster"}
> + {"origin"=>"games/linux-americasarmy", "phase"=>"stage", "errortype"=>"cluster"}
> + {"origin"=>"games/linux-enemyterritory", "phase"=>"extract", "errortype"=>"cluster"}
> + {"origin"=>"games/linux-etqw-demo-server", "phase"=>"extract", "errortype"=>"cluster"}
> + {"origin"=>"games/linux-etqw-server", "phase"=>"extract", "errortype"=>"cluster"}
> + {"origin"=>"games/linux-nerogame", "phase"=>"package", "errortype"=>"install_error"}
> + {"origin"=>"games/nethack32", "phase"=>"build", "errortype"=>"process_failed"}
> - {"origin"=>"graphics/dcraw-m", "phase"=>"fetch", "errortype"=>"fetch"}
> + {"origin"=>"graphics/linux-f10-cairo", "phase"=>"run-depends", "errortype"=>"cluster"}
> + {"origin"=>"graphics/linux-f10-dri", "phase"=>"fetch", "errortype"=>"fetch"}
> + {"origin"=>"graphics/linux-f10-libGLU", "phase"=>"fetch", "errortype"=>"fetch"}
> + {"origin"=>"graphics/linux-f10-libmng", "phase"=>"run-depends", "errortype"=>"cluster"}
> + {"origin"=>"graphics/linux-f10-sdl_image", "phase"=>"run-depends", "errortype"=>"cluster"}
> + {"origin"=>"graphics/linux-f10-tiff", "phase"=>"run-depends", "errortype"=>"cluster"}
> + {"origin"=>"graphics/linux-sdl_ttf", "phase"=>"fetch", "errortype"=>"fetch"}
> + {"origin"=>"lang/linux-c6-tcl85", "phase"=>"fetch", "errortype"=>"distinfo_update"}
> + {"origin"=>"lang/linux-f10-libg2c", "phase"=>"fetch", "errortype"=>"fetch"}
> + {"origin"=>"lang/linux-f10-tcl85", "phase"=>"stage", "errortype"=>"cluster"}
> + {"origin"=>"lang/swi-pl", "phase"=>"fetch", "errortype"=>"fetch"}
> - {"origin"=>"lang/tolua", "phase"=>"fetch", "errortype"=>"fetch"}
> + {"origin"=>"math/metis-edf", "phase"=>"fetch", "errortype"=>"fetch"}
> + {"origin"=>"multimedia/linux-xmovie", "phase"=>"fetch", "errortype"=>"distinfo_update"}
> + {"origin"=>"multimedia/smtube", "phase"=>"fetch", "errortype"=>"fetch"}
> + {"origin"=>"print/linux-f10-cups-libs", "phase"=>"run-depends", "errortype"=>"cluster"}
> + {"origin"=>"security/linux-f10-gnutls", "phase"=>"fetch", "errortype"=>"fetch"}
> + {"origin"=>"security/linux-f10-libssh2", "phase"=>"run-depends", "errortype"=>"cluster"}
> + {"origin"=>"security/linux-f10-nss", "phase"=>"run-depends", "errortype"=>"cluster"}
> + {"origin"=>"security/linux-f10-openssl", "phase"=>"fetch", "errortype"=>"fetch"}
> + {"origin"=>"sysutils/linux-f10-procps", "phase"=>"fetch", "errortype"=>"fetch"}
> + {"origin"=>"textproc/linux-f10-scim-libs", "phase"=>"run-depends", "errortype"=>"cluster"}
> + {"origin"=>"www/phalcon", "phase"=>"fetch", "errortype"=>"fetch"}
> + {"origin"=>"www/piwik", "phase"=>"fetch", "errortype"=>"fetch"}
> + {"origin"=>"x11-fonts/linux-f10-fontconfig", "phase"=>"run-depends", "errortype"=>"cluster"}
> + {"origin"=>"x11-themes/linux-f10-qtcurve-gtk2", "phase"=>"fetch", "errortype"=>"fetch"}
> + {"origin"=>"x11-toolkits/linux-c6-tk85", "phase"=>"package", "errortype"=>"manpage"}
> + {"origin"=>"x11-toolkits/linux-f10-gtk2", "phase"=>"fetch", "errortype"=>"fetch"}
> + {"origin"=>"x11-toolkits/linux-f10-openmotif", "phase"=>"run-depends", "errortype"=>"cluster"}
> + {"origin"=>"x11-toolkits/linux-f10-pango", "phase"=>"run-depends", "errortype"=>"cluster"}
> + {"origin"=>"x11-toolkits/linux-f10-tk85", "phase"=>"run-depends", "errortype"=>"cluster"}
> + {"origin"=>"x11/linux-f10-xorg-libs", "phase"=>"fetch", "errortype"=>"fetch"}
Comment 4 Bryan Drewery freebsd_committer freebsd_triage 2014-04-19 01:50:35 UTC
Responsible Changed
From-To: bdrewery->xmj

exp-run done, back to xmj to fix findings
Comment 5 dennylin93 2014-07-03 01:56:19 UTC
Created attachment 144363 [details]
centos-r360334.patch

Hi, would it be possible to do another run using this updated patch? Thanks!
Comment 6 Johannes Jost Meixner freebsd_committer freebsd_triage 2014-09-18 15:28:27 UTC
Updated patch in https://reviews.freebsd.org/D793
Comment 7 Sean Bruno freebsd_committer freebsd_triage 2014-09-18 15:34:03 UTC
*** Bug 192404 has been marked as a duplicate of this bug. ***
Comment 8 Johannes Jost Meixner freebsd_committer freebsd_triage 2014-09-22 11:26:18 UTC
Created attachment 147553 [details]
Amend Mk/ to make centos 6.5 stuff default.

Attached diff makes CentOS 6.5 default -- this is the last step needed to deprecate -f10 userland.


NOTE: Do not kill -f10 bases or -userland any time soon -- it is required by some vendors.
Comment 9 Johannes Jost Meixner freebsd_committer freebsd_triage 2014-09-22 11:29:10 UTC
Created attachment 147554 [details]
Remove last remnant of f10 as default.

Remove last remnant of fedora 10 as default...

-LINUX_BASE_PORT=       ${LINUXBASE}/etc/fedora-release:${PORTSDIR}/emulators/linux_base-f10
Comment 10 Antoine Brodin freebsd_committer freebsd_triage 2014-09-22 14:04:17 UTC
What is the plan for src/sys ?

If compat.linux.osrelease is not switched to 2.6.18,  the c6 ports won't be build on the build cluster and users won't be able to build or use them out of the box.
Comment 11 Sean Bruno freebsd_committer freebsd_triage 2014-09-22 17:21:00 UTC
(In reply to Antoine Brodin from comment #10)
> What is the plan for src/sys ?
> 
> If compat.linux.osrelease is not switched to 2.6.18,  the c6 ports won't be
> build on the build cluster and users won't be able to build or use them out
> of the box.

Proposed patch:

Index: linux_mib.c
===================================================================
--- linux_mib.c	(revision 271981)
+++ linux_mib.c	(working copy)
@@ -129,9 +129,9 @@
 
 static struct linux_prison lprison0 = {
 	.pr_osname =		"Linux",
-	.pr_osrelease =		"2.6.16",
+	.pr_osrelease =		"2.6.18",
 	.pr_oss_version =	0x030600,
-	.pr_osrel =		2006016
+	.pr_osrel =		2006018
 };
Comment 12 commit-hook freebsd_committer freebsd_triage 2014-09-22 17:27:03 UTC
A commit references this bug:

Author: sbruno
Date: Mon Sep 22 17:26:07 UTC 2014
New revision: 271982
URL: http://svnweb.freebsd.org/changeset/base/271982

Log:
  Bump minimum linux compat version to support Centos6 ports updates for linux.

  Update linux compat minimum revision to match linux-c6 now in ports.  This
  is a candidate for 10.1 R as it matches the current state of supported
  linux compat packages in the ports tree.

  PR:		187786
  Reviewed by:	xmj
  MFC after:	2 days
  Relnotes:	yes

Changes:
  head/sys/compat/linux/linux_mib.c
Comment 13 commit-hook freebsd_committer freebsd_triage 2014-09-22 19:08:13 UTC
A commit references this bug:

Author: sbruno
Date: Mon Sep 22 19:07:28 UTC 2014
New revision: 271990
URL: http://svnweb.freebsd.org/changeset/base/271990

Log:
  UPDATING:  linux-c6 support notes, and how to fall back to linux-f10.

  PR:		187786
  MFC after:	2 days
  Relnotes:	yes

Changes:
  head/UPDATING
Comment 14 Johannes Jost Meixner freebsd_committer freebsd_triage 2014-10-21 09:51:55 UTC
Patch attached is up-to-date and sets CentOS 6.5 as default, provided compat.linux.osrelease=2.6.18 (this will have to be solved by announcement, as it is already present in ports/emulators/linux_base-c6/pkg-message/)
Comment 16 Johannes Jost Meixner freebsd_committer freebsd_triage 2014-10-27 13:58:10 UTC
Fixed in commits 371565, 371572, 371571, 371569 and 371573
Comment 17 Antoine Brodin freebsd_committer freebsd_triage 2014-10-27 14:23:38 UTC
Take for exp-run
Comment 18 Antoine Brodin freebsd_committer freebsd_triage 2014-10-31 11:07:09 UTC
Exp-run results:

http://package18.nyi.freebsd.org/build.html?mastername=101amd64-default-PR187786&build=2014-10-30_15h39m16s

No new failures,  but the following ports are now ignored:

+ {"origin"=>"games/dsnake", "pkgname"=>"dsnake-3.0.0_3", "reason"=>"bsd.linux-apps.mk test failed: The component allegro is not defined for LINUX_DIST_SUFFIX=-c6 (the corresponding variable allegro_c6_FILE is not defined). This usually means that the current port should be used with non default linux base and/or infrastructure port(s)"}
+ {"origin"=>"games/linux-coldwar-demo", "pkgname"=>"linux-coldwar-demo-1.1", "reason"=>"bsd.linux-apps.mk test failed: The component openal is not defined for LINUX_DIST_SUFFIX=-c6 (the corresponding variable openal_c6_FILE is not defined). This usually means that the current port should be used with non default linux base and/or infrastructure port(s)"}
+ {"origin"=>"net-im/skype", "pkgname"=>"skype-2.1.0.81_1,1", "reason"=>"bsd.linux-apps.mk test failed: The component libsigcpp20 is not defined for LINUX_DIST_SUFFIX=-c6 (the corresponding variable libsigcpp20_c6_FILE is not defined). This usually means that the current port should be used with non default linux base and/or infrastructure port(s)"}
+ {"origin"=>"net-im/skype-devel", "pkgname"=>"skype-devel-2.2.0.35_1", "reason"=>"bsd.linux-apps.mk test failed: The component libsigcpp20 is not defined for LINUX_DIST_SUFFIX=-c6 (the corresponding variable libsigcpp20_c6_FILE is not defined). This usually means that the current port should be used with non default linux base and/or infrastructure port(s)"}
+ {"origin"=>"www/linux-opera", "pkgname"=>"linux-opera-12.16", "reason"=>"bsd.linux-apps.mk test failed: The component gdkpixbuf is not defined for LINUX_DIST_SUFFIX=-c6 (the corresponding variable gdkpixbuf_c6_FILE is not defined). This usually means that the current port should be used with non default linux base and/or infrastructure port(s)"}
Comment 19 Johannes Jost Meixner freebsd_committer freebsd_triage 2014-12-15 22:13:04 UTC
Committed to mainline portstree