Bug 184477 - [patch] [bsd.stage.mk] bsd.stage.mk can create a BSD local hierarchy in LINUXBASE
Summary: [patch] [bsd.stage.mk] bsd.stage.mk can create a BSD local hierarchy in LINUX...
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Port Management Team
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-12-03 18:40 UTC by Antoine Brodin
Modified: 2013-12-04 17:55 UTC (History)
0 users

See Also:

Attachments
stage.diff (749 bytes, patch)
2013-12-03 18:40 UTC, Antoine Brodin 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Antoine Brodin freebsd_committer freebsd_triage 2013-12-03 18:40:00 UTC 
When USE_LINUX=yes and PREFIX!=LINUXBASE, bsd.stage.mk creates a BSD local hierarchy in LINUXBASE
This looks inapropriate and create lots of stage orphaned directories.
I don't know what those lines are supposed to fix but the fix is not good.

Fix: With patch below, no orphans (and no problem) building games/dsnake emulators/rtc and www/linux-f10-flashplugin11

How-To-Repeat: poudriere bulk -t games/dsnake emulators/rtc www/linux-f10-flashplugin11

and watch the failures:

=======================<phase: deinstall      >============================
====>> Checking for orphaned files and directories in stage directory (missing from plist)
====>> Files or directories orphaned:
/compat/linux/etc/devd
/compat/linux/etc/man.d
/compat/linux/etc/rc.d
...
Comment 1 Antoine Brodin freebsd_committer freebsd_triage 2013-12-03 18:42:04 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->portmgr

Over to maintainer
Comment 2 baptiste.daroussin 2013-12-04 07:31:36 UTC 
Approved
Bapt
Comment 3 dfilter service freebsd_committer freebsd_triage 2013-12-04 17:48:33 UTC 
Author: antoine
Date: Wed Dec  4 17:48:26 2013
New Revision: 335625
URL: http://svnweb.freebsd.org/changeset/ports/335625

Log:
  Do not create a BSD local hierarchy under ${STAGEDIR}${LINUXBASE} when
  USE_LINUX=yes and PREFIX!=LINUXBASE.
  This is not needed and creates a bunch of stage orphaned directories.
  
  PR:		ports/184477
  Approved by:	portmgr (bapt)
  Tested by:	poudriere bulk -t games/dsnake emulators/rtc www/linux-f10-flashplugin11 (no error, no orphans)

Modified:
  head/Mk/bsd.stage.mk

Modified: head/Mk/bsd.stage.mk
==============================================================================
--- head/Mk/bsd.stage.mk	Wed Dec  4 16:24:20 2013	(r335624)
+++ head/Mk/bsd.stage.mk	Wed Dec  4 17:48:26 2013	(r335625)
@@ -28,10 +28,6 @@ stage-dir:
 	@${MKDIR} ${STAGEDIR}${PREFIX}
 .if !defined(NO_MTREE)
 	@${MTREE_CMD} ${MTREE_ARGS} ${STAGEDIR}${PREFIX} > /dev/null
-.if defined(USE_LINUX) && ${PREFIX} != ${LINUXBASE}
-	@${MKDIR} ${STAGEDIR}${LINUXBASE}
-	@${MTREE_CMD} ${MTREE_ARGS} ${STAGEDIR}${LINUXBASE} > /dev/null
-.endif
 .endif
 .endif
 
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 4 Antoine Brodin freebsd_committer freebsd_triage 2013-12-04 17:55:40 UTC 
State Changed
From-To: open->closed

Patch committed