John, Michal, a couple of things.
First, I found that 'make link' doesn't work very well following your
recent putbacks. There were already some issues but now they are
worse, and running 'make link' creates turds in the workspace.
I'm leaving for vacation so I am very short on time. But I needed
this to work for other testing of other stuff. Attached is a patch
which I think fixes the issue. Do you think you could finish it and get
it reviewed and fixed?
Please look it over carefully, as I might not have gotten all of
the directory changes correct. This does work for me, however.
You should also change the permissions on some of the files in the src
base to add the +x bit. That way when we symlink to them with
'make link' they are executable. Like:
/usr/lib/updatemanagernotifer
Second, Could this please be renamed to update-manager-notifier???
Third, once I started the updatemanagernotifier by hand, it ate a lot of
CPU. I used -debug and all it printed was:
Called do_next_check
Called do_next_check
Called do_next_check
Called do_next_check
Called do_next_check
Called do_next_check
Called do_next_check
Called do_next_check
Called do_next_check
Called do_next_check
It seems to make from 25,000 syscalls/second to 200,000 syscalls/sec
and is the top process on my system. This looks like a broken call
to poll:
# truss -c -p `pgrep update`
^C
syscall seconds calls errors
ioctl .201 27169
pollsys .192 27275
-------- ------ ----
sys totals: .393 54444 0
usr time: .541
elapsed: 3.940
Please fix.
-dp
--
Daniel Price - Solaris Kernel Engineering - [EMAIL PROTECTED] - blogs.sun.com/dp
diff -r d6ab4f57f07d src/gui/Makefile
--- a/src/gui/Makefile Wed Oct 08 08:28:06 2008 -0600
+++ b/src/gui/Makefile Thu Oct 09 16:06:10 2008 -0700
@@ -139,18 +139,17 @@
#This will not link l10n files
link:
- mkdir -p /usr/share/lib/package-manager/data
+ mkdir -p /usr/share/package-manager/data
ln -sf $(PWD)/../packagemanager.py /usr/bin/packagemanager
ln -sf $(PWD)/data/packagemanager.glade
/usr/share/package-manager/packagemanager.glade
ln -sf $(PWD)/data/opensolaris.org
/usr/share/package-manager/data/opensolaris.org
ln -sf $(PWD)/data/opensolaris.org.sections
/usr/share/package-manager/data/opensolaris.org.sections
ln -sf $(PWD)/data/packagemanager.desktop
/usr/share/applications/packagemanager.desktop
ln -sf $(PWD)/data/icons /usr/share/icons/package-manager
- ln -sf $(PWD)/modules /usr/lib/python2.4/vendor-packages/pkg/gui
link-clean:
- rm -rf /usr/share/lib/package-manager
- rm -rf /usr/lib/python2.4/vendor-packages/pkg/gui
+ rm -rf /usr/share/icons/package-manager
+ rm -rf /usr/share/package-manager
rm -f /usr/share/applications/packagemanager.desktop
rm -f /usr/bin/packagemanager
diff -r d6ab4f57f07d src/um/Makefile
--- a/src/um/Makefile Wed Oct 08 08:28:06 2008 -0600
+++ b/src/um/Makefile Thu Oct 09 16:06:10 2008 -0700
@@ -138,6 +138,8 @@
#This will not link l10n files
link:
+ mkdir -p /usr/share/update-manager
+ mkdir -p /usr/lib/update-manager
ln -sf $(PWD)/../updatemanagernotifier.py /usr/lib/updatemanagernotifier
ln -sf $(PWD)/data/updatemanager.glade
/usr/share/update-manager/updatemanager.glade
ln -sf $(PWD)/update-refresh.sh
/usr/lib/update-manager/update-refresh.sh
@@ -149,10 +151,11 @@
link-clean:
rm -rf /usr/share/update-manager
+ rm -rf /usr/share/icons/update-manager
rm -f /etc/xdg/autostart/updatemanagernotifier.desktop
rm -f /etc/gconf/schemas/updatemanager-preferences.schemas
rm -f /usr/lib/updatemanagernotifier
- rm -f /usr/lib/-manager/update-refresh.sh
+ rm -f /usr/lib/update-manager/update-refresh.sh
rm -f /lib/svc/method/pkg-update
rm -f /usr/share/applications/updatemanager.desktop
diff -r d6ab4f57f07d src/web/Makefile
--- a/src/web/Makefile Wed Oct 08 08:28:06 2008 -0600
+++ b/src/web/Makefile Thu Oct 09 16:06:10 2008 -0700
@@ -21,6 +21,7 @@
# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
+SHARE=/usr/share/lib/pkg
ROOTSHARE = $(ROOT)/$(SHARE)
all := TARGET = all
@@ -31,7 +32,7 @@
PWD:sh = pwd
link:
- mkdir -p /usr/share/lib/pkg
+ mkdir -p $(ROOTSHARE)
ln -sf $(PWD)/pkg-block-icon.png $(ROOTSHARE)/pkg-block-icon.png
ln -sf $(PWD)/pkg-block-logo.png $(ROOTSHARE)/pkg-block-logo.png
ln -sf $(PWD)/robots.txt $(ROOTSHARE)/robots.txt
@@ -39,4 +40,4 @@
ln -sf $(PWD)/feed-icon-32x32.png $(ROOTSHARE)/feed-icon-32x32.png
link-clean:
- rm -rf /usr/share/lib/pkg
+ rm -rf $(ROOTSHARE)
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
