sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-22 11:48:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sysutils/hal: Adjust pkg-plist so it passes stage-qa and leftover checks

Browse source 
Hal was not passing poudriere testport or poudriere bulk -t runs due
to failing the stage-qa tests and later a leftover check with
/var/lib/PolicyKit/user-haldaemon.auths.  The reported error is actually
not wrong, but rather an inadequacy in the check-plist logic.  However,
hald is a dependency for a lot of ports and it keeps breaking bulk -t
runs, so I switched "@unexec rm -rf" to "@unexec rmdir" to that it would
build cleanly in poudriere (gnome@ had fair warning!).  If the check-plist
logic is improved in the future, this can be changed back to the better
"rm -rf" command then.

While here, stop trying to remove directories that PolicyKit installed
because this will always fail.  This clears up stage-qa warnings.

PR:		191223
Submitted by:	marino
Approved by:	maintainer timeout (2 months, 2 pings)
This commit is contained in:
John Marino 2014-08-13 19:10:46 +00:00
parent 4cbf04c397
commit 1a61a06bfc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=364801
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sysutils/hal/Makefile
View file

@ -4,7 +4,7 @@
PORTNAME= hal PORTNAME= hal
DISTVERSION= 0.5.14 DISTVERSION= 0.5.14
PORTREVISION= 26 PORTREVISION= 27
CATEGORIES= sysutils CATEGORIES= sysutils
MASTER_SITES= http://hal.freedesktop.org/releases/ MASTER_SITES= http://hal.freedesktop.org/releases/

8
sysutils/hal/pkg-plist
View file

@ -124,8 +124,6 @@ share/PolicyKit/policy/org.freedesktop.hal.wol.policy
@dirrm %%DATADIR%%/dist @dirrm %%DATADIR%%/dist
@dirrm %%DATADIR%% @dirrm %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrmtry share/PolicyKit/policy
@dirrmtry share/PolicyKit
@dirrm libexec/hal/scripts/freebsd @dirrm libexec/hal/scripts/freebsd
@dirrm libexec/hal/scripts @dirrm libexec/hal/scripts
@dirrm libexec/hal @dirrm libexec/hal
@ -135,10 +133,10 @@ share/PolicyKit/policy/org.freedesktop.hal.wol.policy
@dirrm etc/hal/fdi/information @dirrm etc/hal/fdi/information
@dirrm etc/hal/fdi @dirrm etc/hal/fdi
@dirrm etc/hal @dirrm etc/hal
@unexec rm -f /var/lib/PolicyKit/user-haldaemon.auths 2>/dev/null || true
@unexec rm -f /var/run/hald/hald.pid 2>/dev/null || true @unexec rm -f /var/run/hald/hald.pid 2>/dev/null || true
@unexec rm -rf /var/run/hald/hald-local 2>/dev/null || true @unexec rmdir /var/run/hald/hald-local 2>/dev/null || true
@unexec rm -rf /var/run/hald/hald-runner 2>/dev/null || true @unexec rmdir /var/run/hald/hald-runner 2>/dev/null || true
@unexec rmdir /var/run/hald 2>/dev/null || true @unexec rmdir /var/run/hald 2>/dev/null || true
@unexec rmdir /var/cache/hald 2>/dev/null || true @unexec rmdir /var/cache/hald 2>/dev/null || true
@unexec rmdir /var/lib/hal 2>/dev/null || true @unexec rmdir /var/lib/hal 2>/dev/null || true
@unexec rmdir /var/lib 2>/dev/null || true