I'm looking at packaging x2go for Fedora and am running into a few issues which I'm hoping to get resolved.
nx-libs: partially addresses that.
- bin/Makefile doesn't support DESTDIR. The attached nx-libs-destdir.patch
The various nx*/configure.in files do not honor passed in compiler flags. The attached nx-libs-optflags.patch fixes that. Note also though that CFLAGS is used in some and CPPFLAGS in others.
Is there a preferred way to install into /usr rather than /usr/local? I ended up doing: sed -i -e 's,/usr/local,/usr,' nx-X11/config/cf/site.def
It would be very nice if you could support installing into /usr/lib64. I had to do the following:
sed -i -e 's,/lib/nx,/%{_lib}/nx,' nx-X11/config/cf/X11.tmpl sed -i -e 's,/usr/lib/,/usr/%{_lib}/,' bin/*
make install ... USRLIBDIR=/usr/lib64/nx SHLIBDIR=/usr/lib64/nx
# Make sure x2goagent is linked relative and on 64-bit rm -rf %{buildroot}%{_prefix}/lib/x2go mkdir -p %{buildroot}%{_libdir}/x2go/bin ln -sf ../../nx/bin/nxagent %{buildroot}%{_libdir}/x2go/bin/x2goagent
x2goserver:
- Does not honor passed in CFLAGS. The attached x2goserver-cflags.patch fixes.
- Again, very hard to use /usr/lib64...
x2goclient: prefix on Fedora, and in general that should be specified by -I...
- Required the attached x2goclient-include.patch to build. There is no qt4
General: thing? On rpm systems this fails when builds are done as non-root (and it's
- Why the use of install -o root -g root? Is this a debian build specific
redundant when done as root).
Thank you for your attention.
- Orion
-- Orion Poplawski Technical Manager 303-415-9701 x222 NWRA, Boulder Office FAX: 303-415-9702 3380 Mitchell Lane orion@nwra.com Boulder, CO 80301 http://www.nwra.com
On Wednesday 2012-12-12 00:11, Orion Poplawski wrote:
I'm looking at packaging x2go for Fedora and am running into a few issues which I'm hoping to get resolved.
Hm, I have them mostly complete for Fedora at https://build.opensuse.org/project/show?project=X11%3ARemoteDesktop
and problems like DESTDIR and unprivileged install, which naturally occur on openSUSE too, seemed resolved (at the time of the most recent working version).
General: thing? On rpm systems this fails when builds are done as non-root (and it's
- Why the use of install -o root -g root? Is this a debian build specific
redundant when done as root).
Hi Orion,
thanks for the patches, we will evaluate them ASAP.
On Mi 12 Dez 2012 00:11:02 CET Orion Poplawski wrote:
General:
- Why the use of install -o root -g root? Is this a debian build
specific thing? On rpm systems this fails when builds are done as
non-root (and it's redundant when done as root).
in Debian packaging most people use the ,,fakeroot'' command that
wraps around the packaging. With fakeroot the above command works
flawlessly.
Mike
--
DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148
GnuPG Key ID 0x25771B31 mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
On 12/12/2012 03:57 AM, Mike Gabriel wrote:
Hi Orion,
thanks for the patches, we will evaluate them ASAP.
On Mi 12 Dez 2012 00:11:02 CET Orion Poplawski wrote:
General: thing? On rpm systems this fails when builds are done as non-root (and it's
- Why the use of install -o root -g root? Is this a debian build specific
redundant when done as root).
in Debian packaging most people use the ,,fakeroot'' command that wraps around the packaging. With fakeroot the above command works flawlessly.
Mike
Okay, but is it strictly necessary for debian packaging to have that? I've never seen it in other upstream sources.
-- Orion Poplawski Technical Manager 303-415-9701 x222 NWRA, Boulder Office FAX: 303-415-9702 3380 Mitchell Lane orion@nwra.com Boulder, CO 80301 http://www.nwra.com
Hi Orion,
On Do 13 Dez 2012 00:14:08 CET Orion Poplawski wrote:
On 12/12/2012 03:57 AM, Mike Gabriel wrote:
Hi Orion,
thanks for the patches, we will evaluate them ASAP.
On Mi 12 Dez 2012 00:11:02 CET Orion Poplawski wrote:
General: thing? On rpm systems this fails when builds are done as non-root
- Why the use of install -o root -g root? Is this a debian build specific
(and it's redundant when done as root).
in Debian packaging most people use the ,,fakeroot'' command that
wraps around the packaging. With fakeroot the above command works flawlessly.Mike
Okay, but is it strictly necessary for debian packaging to have
that? I've never seen it in other upstream sources.
Not necessarily. Please provide a patch that keeps the current
functionality in case the Makefile is run as root and also makes
execution possible for non-root users.
Greets, Mike
--
DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148
GnuPG Key ID 0x25771B31 mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
On Thursday 2012-12-13 09:56, Mike Gabriel wrote:
Okay, but is it strictly necessary for debian packaging to have that? I've never seen it in other upstream sources.
Not necessarily. Please provide a patch that keeps the current functionality in case the Makefile is run as root and also makes execution possible for non-root users.
Umm, copying a file with either of the owner of the file will be the one who invoked the copy.
- install
- cp without the --preserve option
Therefore, if you run install as root, the file will be owned by root already.
Save for cases where root has to use like install -o postfix, install -o/-g is really useless.
Hi Orion,
On Mi 12 Dez 2012 00:11:02 CET Orion Poplawski wrote:
I'm looking at packaging x2go for Fedora and am running into a few
issues which I'm hoping to get resolved.nx-libs: though that CFLAGS is used in some and CPPFLAGS in others.
- bin/Makefile doesn't support DESTDIR. The attached
nx-libs-destdir.patch partially addresses that.- The various nx*/configure.in files do not honor passed in compiler
flags. The attached nx-libs-optflags.patch fixes that. Note also
Is there a preferred way to install into /usr rather than
/usr/local? I ended up doing: sed -i -e 's,/usr/local,/usr,' nx-X11/config/cf/site.defIt would be very nice if you could support installing into
/usr/lib64. I had to do the following:sed -i -e 's,/lib/nx,/%{_lib}/nx,' nx-X11/config/cf/X11.tmpl sed -i -e 's,/usr/lib/,/usr/%{_lib}/,' bin/*
make install ... USRLIBDIR=/usr/lib64/nx SHLIBDIR=/usr/lib64/nx
# Make sure x2goagent is linked relative and on 64-bit rm -rf %{buildroot}%{_prefix}/lib/x2go mkdir -p %{buildroot}%{_libdir}/x2go/bin ln -sf ../../nx/bin/nxagent %{buildroot}%{_libdir}/x2go/bin/x2goagent
Can you break this down to a patch against the current nx-libs.git on
http://git.x2go.org? If yes, then we will apply that patch (after
testing it).
Please note that Jan Engelhard already contributed a patch that
addresses flexibility with choosing custom install locations. This
patch is found in X2Go Server:
http://code.x2go.org/gitweb?p=x2goserver.git;a=commitdiff;h=75798658a1934df1...
http://code.x2go.org/gitweb?p=x2goserver.git;a=commitdiff;h=1fe04071bb1b318d...
Please base your work on that latest change of code. Also: if
possible, only send patches against our code in Git.
x2goserver:
- Does not honor passed in CFLAGS. The attached
x2goserver-cflags.patch fixes.- Again, very hard to use /usr/lib64...
I have forwarded the patch to X2Go BTS [1]. Please read [2] before
sending more patches. Please use X2Go BTS for reporting bugs, sending
patches.
[1] http://bugs.x2go.org/83 [2] http://bugs.x2go.org/Reporting.html
x2goclient:
- Required the attached x2goclient-include.patch to build. There is
no qt4 prefix on Fedora, and in general that should be specified by
-I...
Already in Vcs: http://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff;h=1412f5a6d4031ef1...
Greets, Mike
--
DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148
GnuPG Key ID 0x25771B31 mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
On 12/12/2012 04:17 AM, Mike Gabriel wrote:
Hi Orion,
On Mi 12 Dez 2012 00:11:02 CET Orion Poplawski wrote:
I'm looking at packaging x2go for Fedora and am running into a few issues which I'm hoping to get resolved.
nx-libs: partially addresses that.
- bin/Makefile doesn't support DESTDIR. The attached nx-libs-destdir.patch
The various nx*/configure.in files do not honor passed in compiler flags. The attached nx-libs-optflags.patch fixes that. Note also though that CFLAGS is used in some and CPPFLAGS in others.
Is there a preferred way to install into /usr rather than /usr/local? I ended up doing: sed -i -e 's,/usr/local,/usr,' nx-X11/config/cf/site.def
It would be very nice if you could support installing into /usr/lib64. I had to do the following:
sed -i -e 's,/lib/nx,/%{_lib}/nx,' nx-X11/config/cf/X11.tmpl sed -i -e 's,/usr/lib/,/usr/%{_lib}/,' bin/*
make install ... USRLIBDIR=/usr/lib64/nx SHLIBDIR=/usr/lib64/nx
# Make sure x2goagent is linked relative and on 64-bit rm -rf %{buildroot}%{_prefix}/lib/x2go mkdir -p %{buildroot}%{_libdir}/x2go/bin ln -sf ../../nx/bin/nxagent %{buildroot}%{_libdir}/x2go/bin/x2goagent
Can you break this down to a patch against the current nx-libs.git on http://git.x2go.org? If yes, then we will apply that patch (after testing it).
Please note that Jan Engelhard already contributed a patch that addresses flexibility with choosing custom install locations. This patch is found in X2Go Server: http://code.x2go.org/gitweb?p=x2goserver.git;a=commitdiff;h=75798658a1934df1...
http://code.x2go.org/gitweb?p=x2goserver.git;a=commitdiff;h=1fe04071bb1b318d...
Please base your work on that latest change of code. Also: if possible, only send patches against our code in Git.
Looking at current git it looks like bin/Makefile does not get created at all in the release tarball - removed by git commit:
commit d139e5d3da1b56457d7f076581de7e186fe2e6f2 Author: Reinhard Tartler <siretart@tauware.de> Date: Wed Dec 12 12:45:41 2012 +0100
drop debian/patches/001_add-main-makefile.full+lite.patch
Instead, place the makefile into debian/Makefile.nx-libs. This makes the
makefile easier to edit.Would be nice to still have these installed as part of the build process.
x2goserver:
- Does not honor passed in CFLAGS. The attached x2goserver-cflags.patch fixes.
- Again, very hard to use /usr/lib64...
I have forwarded the patch to X2Go BTS [1]. Please read [2] before sending more patches. Please use X2Go BTS for reporting bugs, sending patches.
[1] http://bugs.x2go.org/83 [2] http://bugs.x2go.org/Reporting.html
Thanks, will do.
x2goclient: prefix on Fedora, and in general that should be specified by -I...
- Required the attached x2goclient-include.patch to build. There is no qt4
Already in Vcs: http://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff;h=1412f5a6d4031ef1...
Ah, will start to check git.
Thank you very much for your responsiveness!
-- Orion Poplawski Technical Manager 303-415-9701 x222 NWRA, Boulder Office FAX: 303-415-9702 3380 Mitchell Lane orion@nwra.com Boulder, CO 80301 http://www.nwra.com
Hi Orion,
On Mi 12 Dez 2012 22:57:11 CET Orion Poplawski wrote:
Looking at current git it looks like bin/Makefile does not get
created at all in the release tarball - removed by git commit:commit d139e5d3da1b56457d7f076581de7e186fe2e6f2 Author: Reinhard Tartler <siretart@tauware.de> Date: Wed Dec 12 12:45:41 2012 +0100
drop debian/patches/001_add-main-makefile.full+lite.patch Instead, place the makefile into debian/Makefile.nx-libs. This makes the makefile easier to edit.Would be nice to still have these installed as part of the build process.
The above change goes together with a new tarball-roller script: http://code.x2go.org/gitweb?p=nx-libs.git;a=commitdiff;h=b09b686cf380a96717e...
So the tarballs will have still have a main Makefile.
Greets, Mike
--
DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148
GnuPG Key ID 0x25771B31 mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
On 12/13/2012 01:54 AM, Mike Gabriel wrote:
Hi Orion,
On Mi 12 Dez 2012 22:57:11 CET Orion Poplawski wrote:
Looking at current git it looks like bin/Makefile does not get created at all in the release tarball - removed by git commit:
commit d139e5d3da1b56457d7f076581de7e186fe2e6f2 Author: Reinhard Tartler <siretart@tauware.de> Date: Wed Dec 12 12:45:41 2012 +0100
drop debian/patches/001_add-main-makefile.full+lite.patch Instead, place the makefile into debian/Makefile.nx-libs. This makes the makefile easier to edit.Would be nice to still have these installed as part of the build process.
The above change goes together with a new tarball-roller script: http://code.x2go.org/gitweb?p=nx-libs.git;a=commitdiff;h=b09b686cf380a96717e...
So the tarballs will have still have a main Makefile.
Yes, but I'm not talking about the main Makefile, but the one in bin/ which the 001_add-main-makefile.full+lite.patch also created.
-- Orion Poplawski Technical Manager 303-415-9701 x222 NWRA, Boulder Office FAX: 303-415-9702 3380 Mitchell Lane orion@nwra.com Boulder, CO 80301 http://www.nwra.com
Hi Orion,
On Do 13 Dez 2012 16:55:29 CET Orion Poplawski wrote:
On 12/13/2012 01:54 AM, Mike Gabriel wrote:
Hi Orion,
On Mi 12 Dez 2012 22:57:11 CET Orion Poplawski wrote:
Looking at current git it looks like bin/Makefile does not get created at all in the release tarball - removed by git commit:
commit d139e5d3da1b56457d7f076581de7e186fe2e6f2 Author: Reinhard Tartler <siretart@tauware.de> Date: Wed Dec 12 12:45:41 2012 +0100
drop debian/patches/001_add-main-makefile.full+lite.patch
Instead, place the makefile into debian/Makefile.nx-libs. This makes the makefile easier to edit.
Would be nice to still have these installed as part of the build process.
The above change goes together with a new tarball-roller script: http://code.x2go.org/gitweb?p=nx-libs.git;a=commitdiff;h=b09b686cf380a96717e...
So the tarballs will have still have a main Makefile.
Yes, but I'm not talking about the main Makefile, but the one in
bin/ which the 001_add-main-makefile.full+lite.patch also created.
Now I am getting what you mean!!! We discuss that on IRC currently
(#x2go on freenode, you may want to join in...).
Mike
--
DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148
GnuPG Key ID 0x25771B31 mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
On 12/13/2012 08:59 AM, Mike Gabriel wrote:
Hi Orion,
On Do 13 Dez 2012 16:55:29 CET Orion Poplawski wrote:
On 12/13/2012 01:54 AM, Mike Gabriel wrote:
Hi Orion,
On Mi 12 Dez 2012 22:57:11 CET Orion Poplawski wrote:
Looking at current git it looks like bin/Makefile does not get created at all in the release tarball - removed by git commit:
commit d139e5d3da1b56457d7f076581de7e186fe2e6f2 Author: Reinhard Tartler <siretart@tauware.de> Date: Wed Dec 12 12:45:41 2012 +0100
drop debian/patches/001_add-main-makefile.full+lite.patch
Instead, place the makefile into debian/Makefile.nx-libs. This makes the makefile easier to edit.
Would be nice to still have these installed as part of the build process.
The above change goes together with a new tarball-roller script: http://code.x2go.org/gitweb?p=nx-libs.git;a=commitdiff;h=b09b686cf380a96717e...
So the tarballs will have still have a main Makefile.
Yes, but I'm not talking about the main Makefile, but the one in bin/ which the 001_add-main-makefile.full+lite.patch also created.
Now I am getting what you mean!!! We discuss that on IRC currently (#x2go on freenode, you may want to join in...).
Mike
My suggested fix attached
-- Orion Poplawski Technical Manager 303-415-9701 x222 NWRA, Boulder Office FAX: 303-415-9702 3380 Mitchell Lane orion@nwra.com Boulder, CO 80301 http://www.nwra.com
On Wed, Dec 12, 2012 at 10:57 PM, Orion Poplawski <orion@cora.nwra.com> wrote:
Looking at current git it looks like bin/Makefile does not get created at all in the release tarball - removed by git commit:
commit d139e5d3da1b56457d7f076581de7e186fe2e6f2 Author: Reinhard Tartler <siretart@tauware.de> Date: Wed Dec 12 12:45:41 2012 +0100
drop debian/patches/001_add-main-makefile.full+lite.patch Instead, place the makefile into debian/Makefile.nx-libs. This makes the makefile easier to edit.Would be nice to still have these installed as part of the build process.
It is. As Mike said, it is included in the top-level directory in the source tarballs, which should be the most convenient way to package x2go. Surprisingly, the tarballs are not directly created from git, but there is a generation step between that generates the two flavors of the tarball. For details, please have a look at the tarball generator script:
http://code.x2go.org/gitweb?p=nx-libs.git;a=blob;f=debian/roll-tarballs.sh
If you really want to build directly from git, you would have to redo the steps done in debian/rules or the generator script yourself. The most important steps is to apply the (right) patches with quilt.
-- regards, Reinhard
On 12/13/2012 03:11 AM, Reinhard Tartler wrote:
On Wed, Dec 12, 2012 at 10:57 PM, Orion Poplawski <orion@cora.nwra.com> wrote:
Looking at current git it looks like bin/Makefile does not get created at all in the release tarball - removed by git commit:
commit d139e5d3da1b56457d7f076581de7e186fe2e6f2 Author: Reinhard Tartler <siretart@tauware.de> Date: Wed Dec 12 12:45:41 2012 +0100
drop debian/patches/001_add-main-makefile.full+lite.patch Instead, place the makefile into debian/Makefile.nx-libs. This makes the makefile easier to edit.Would be nice to still have these installed as part of the build process.
It is. As Mike said, it is included in the top-level directory in the source tarballs, which should be the most convenient way to package x2go. Surprisingly, the tarballs are not directly created from git, but there is a generation step between that generates the two flavors of the tarball. For details, please have a look at the tarball generator script:
http://code.x2go.org/gitweb?p=nx-libs.git;a=blob;f=debian/roll-tarballs.sh
If you really want to build directly from git, you would have to redo the steps done in debian/rules or the generator script yourself. The most important steps is to apply the (right) patches with quilt.
Yes, I figured that out and I am generating the tarballs with the roll-tarballs.sh script. But 001_add-main-makefile.full+lite.patch also created bin/Makefile in addition to the main Makefile.
-- Orion Poplawski Technical Manager 303-415-9701 x222 NWRA, Boulder Office FAX: 303-415-9702 3380 Mitchell Lane orion@nwra.com Boulder, CO 80301 http://www.nwra.com
-
Jan Engelhardt -
Mike Gabriel -
Orion Poplawski -
Reinhard Tartler