x2go-dev

x2go-dev@lists.x2go.org

1 participants
5403 discussions

Bug#840: missing chars in x2gousbmount
by Florian Wicke - Hetzner Online AG 09 Apr '15

09 Apr '15

Package: x2gothinclient Version: 1.5.0.0-0 two chars are missing in the file /usr/lib/x2go/tce/x2gousbmount in line 66. It states: 'int F "$name\n";' and should be: 'print F "$name\n"; -- Kind regards Florian Wicke Hetzner Online AG Industriestr. 25 91710 Gunzenhausen / Germany Tel: +49 9831 505-187 Fax: +49 9831 505-387 florian.wicke(a)hetzner.de www.hetzner.com Register Court: Registergericht Ansbach, HRB 3204 Management Board: Dipl. Ing. (FH) Martin Hetzner Chairwoman of the Supervisory Board: Diana Rothhan

1 0

Re: [X2Go-Dev] [X2Go-Commits] [buildscripts] 01/01: Initial (untested) code for Raspbian support
by Mihai Moldovan 09 Apr '15

09 Apr '15

On 04.04.2015 05:20 PM, git-admin(a)x2go.org wrote: > This is an automated email from the git hooks/post-receive script. > > x2go pushed a commit to branch feature/raspbian > in repository buildscripts. > > commit e13114a13588afca0a3acdfba9b28191274609c8 > Author: Mike DePaulo <mikedep333(a)gmail.com> > Date: Sat Apr 4 11:19:23 2015 -0400 > > Initial (untested) code for Raspbian support > --- > bin/build-deb-package | 86 +++++++++++++++++++++++++++++++++++------------ > home/.dupload.conf.x2go | 16 +++++++++ > 2 files changed, 80 insertions(+), 22 deletions(-) > > diff --git a/bin/build-deb-package b/bin/build-deb-package > index 30e0609..88d731d 100755 > --- a/bin/build-deb-package > +++ b/bin/build-deb-package > @@ -22,11 +22,33 @@ export PATH="${HOME}/bin:${PATH}" > [...] > +if [[ -e "/etc/dpkg/origins/raspbian" ]]; then > + DEB_DISTS_SUPPORTED="raspbian" > + DEB_ARCHS_SUPPORTED="armhf" > + DEB_ARCHS_SUPPORTED_COMMA="armhf" Better use: typeset -a DEB_ARCHS_SUPPORTED DEB_ARCHS_SUPPORTED+=("armhf") (no need for DEB_ARCHS_SUPPORTED_COMMA, it won't work anyway.) > + DEB_PRIMARY_ARCH="armhf" > +else > + DEB_DISTS_SUPPORTED="debian ubuntu" > + DEB_ARCHS_SUPPORTED="amd64 i386" > + DEB_ARCHS_SUPPORTED_COMMA="amd64,i386" Same here: typeset -a DEB_ARCHS_SUPPORTED DEB_ARCHS_SUPPORTED+=("amd64" "i386") > + DEB_PRIMARY_ARCH="amd64" > +fi > + > [...] > @@ -43,7 +65,11 @@ test -f "${HOME}/.buildscripts/${PREFIX}.conf" && . "${HOME}/.buildscripts/${PRE > > : ${NO_DELAY:="no"} > : ${FORCE_BUILD:="no"} > -: ${DEB_BUILD_FOR:="debian:${DEBIAN_DISTROS} ubuntu:${UBUNTU_DISTROS}"} > +if [[ $DEB_DISTS_SUPPORTED=="debian ubuntu" ]]; then This will always return true. Better: if [ "${DEB_DISTS_SUPPORTED}" = "debian ubuntu" ]; then And even better: leave : ${DEB_BUILD_FOR:="debian:${DEBIAN_DISTROS} ubuntu:${UBUNTU_DISTROS}"} in place, override via if [ "${DEB_DISTS_SUPPORTED}" = "raspbian" ]; then > + : ${DEB_BUILD_FOR:="debian:${DEBIAN_DISTROS} ubuntu:${UBUNTU_DISTROS}"} remove > +elif [[ $DEB_DISTS_SUPPORTED=="raspbian" ]]; then remove > + : ${DEB_BUILD_FOR:="raspbian:${RASPBIAN_DISTROS}"} DEB_BUILD_FOR="raspbian:${RASPBIAN_DISTROS}" > +fi > [...] > @@ -144,10 +170,16 @@ prepare_workspace() { > > # by default we build for all current debian versions > if [ "x${ARGV2_CODENAME}" != "x" ]; then > - if grep -qs "${ARGV2_CODENAME}" <<< "${DEBIAN_DISTROS}"; then > - DEB_BUILD_FOR="debian:${ARGV2_CODENAME}" > - elif grep -qs "${ARGV2_CODENAME}" <<< "${UBUNTU_DISTROS}"; then > - DEB_BUILD_FOR="ubuntu:${ARGV2_CODENAME}" > + if [[ "$DEB_DISTS_SUPPORTED"=="raspbian" ]]; then if [ "${DEB_DISTS_SUPPORTED}" = "raspbian" ]; then > + if grep -qs "${ARGV2_CODENAME}" <<< "${RASPBIAN_DISTROS}"; then > + DEB_BUILD_FOR="raspbian:${ARGV2_CODENAME}" > + fi > + elif [[ "$DEB_DISTS_SUPPORTED"=="debian ubuntu" ]]; then else > + if grep -qs "${ARGV2_CODENAME}" <<< "${DEBIAN_DISTROS}"; then > + DEB_BUILD_FOR="debian:${ARGV2_CODENAME}" > + elif grep -qs "${ARGV2_CODENAME}" <<< "${UBUNTU_DISTROS}"; then > + DEB_BUILD_FOR="ubuntu:${ARGV2_CODENAME}" > + fi > fi > fi > return 0 > @@ -176,7 +208,7 @@ clear_pkgdist() { > test -z "${CODENAMES}" || grep "${CODENAMES}" <<< "${line}" || break > > if [ "x${EXTRA_ARCHS_ONLY}" = "x" ]; then > - for l_ARCH in amd64 i386; do > + for l_ARCH in ${DEB_ARCHS_SUPPORTED}; do Remember the DEB_ARCHS_SUPPORTED change from above? Now we need: for l_ARCH in "${DEB_ARCHS_SUPPORTED[@]}"; do > [ "x${SKIP_ARCH}" != "x${l_ARCH}" ] && { > mkdir -p -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}" > rm -f -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/dupload.conf" > @@ -271,7 +303,7 @@ build_packages() { > else > dch --distribution "${VERSION}" --force-distribution -l "~git${DATE}.${GITREV}+${l_CODENAME}.${COMPONENT}." "Development-Snapshot!!! Auto-built ${l_DIST} ${l_CODENAME} package for ${REPOS_SERVER} repository (Git commit: ${GIT_OBJECT_ID})." > fi > - mkdir -p -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/"{amd64,i386} > + mkdir -p -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/"{${DEB_ARCHS_SUPPORTED_COMMA}} That won't work. typeset tmp_arch="" for tmp_arch in "${DEB_ARCHS_SUPPORTED[@]}"; do mkdir -p -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${tmp_arch}" done > OTHERMIRROR="" > if [ "x${COMPONENT}" = "x${COMPONENT_NIGHTLY}" ]; then > grep -qs "${PROJECT}" <<< "${PACKAGE_WITHOUT_OTHERMIRROR}" || OTHERMIRROR="deb http://${REPOS_SERVER}/${l_DIST} ${l_CODENAME} ${COMPONENT_MAIN} ${COMPONENT}" > @@ -287,12 +319,17 @@ build_packages() { > > [ "x${USE_SUDO}" != "xyes" ] && { > [ "x${EXTRA_ARCHS_ONLY}" = "x" ] && { > - [ "x${SKIP_ARCH}" != "xamd64" ] && grep -Eqs 'Architecture.*(all|any|amd64)' "debian/control" && { > - DIST="${l_DIST}" CODENAME="${l_CODENAME}" ARCH="amd64" nice ${PDEBUILD} --auto-debsign --debsign-k "${GPG_KEY}" --buildresult "${PKGDIST}/${l_DIST}/${l_CODENAME}/amd64" -- --allow-untrusted ${SA_OPTION} 0<&- > - } > - [ "x${SKIP_ARCH}" != "xi386" ] && grep -Eqs 'Architecture.*(any|i386)' "debian/control" && { > - DIST="${l_DIST}" CODENAME="${l_CODENAME}" ARCH="i386" nice ${PDEBUILD} --auto-debsign --debsign-k "${GPG_KEY}" --buildresult "${PKGDIST}/${l_DIST}/${l_CODENAME}/i386" -- --binary-arch --allow-untrusted ${SA_OPTION} 0<&- > - } > + for arch in ${DEB_ARCHS_SUPPORTED}; do for arch in "${DEB_ARCHS_SUPPORTED[@]}"; do > + if [[ "$arch" == "$DEB_PRIMARY_ARCH" ]]; then > + [ "x${SKIP_ARCH}" != "x${arch}" ] && grep -Eqs "Architecture.*(all|any|${arch})" "debian/control" && { > + DIST="${l_DIST}" CODENAME="${l_CODENAME}" ARCH="${arch}" nice ${PDEBUILD} --auto-debsign --debsign-k "${GPG_KEY}" --buildresult "${PKGDIST}/${l_DIST}/${l_CODENAME}/${arch}" -- --allow-untrusted ${SA_OPTION} 0<&- > + } > + else > + [ "x${SKIP_ARCH}" != "x${arch}" ] && grep -Eqs "Architecture.*(any|${arch})" "debian/control" && { > + DIST="${l_DIST}" CODENAME="${l_CODENAME}" ARCH="${arch}" nice ${PDEBUILD} --auto-debsign --debsign-k "${GPG_KEY}" --buildresult "${PKGDIST}/${l_DIST}/${l_CODENAME}/${arch}" -- --binary-arch --allow-untrusted ${SA_OPTION} 0<&- > + } > + fi > + done > } > for extra_arch in ${EXTRA_ARCHS}; do > mkdir -p -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${extra_arch}" > @@ -303,12 +340,17 @@ build_packages() { > } > [ "x${USE_SUDO}" = "xyes" ] && { > [ "x${EXTRA_ARCHS_ONLY}" = "x" ] && { > - [ "x${SKIP_ARCH}" != "xamd64" ] && grep -Eqs 'Architecture.*(all|any|amd64)' "debian/control" && { > - nice sudo GNUPGHOME="${GNUPGHOME}" DIST="${l_DIST}" CODENAME="${l_CODENAME}" ARCH="amd64" OTHERMIRROR="${OTHERMIRROR}" ${PDEBUILD} --auto-debsign --debsign-k "${GPG_KEY}" --buildresult "${PKGDIST}/${l_DIST}/${l_CODENAME}/amd64" -- --allow-untrusted ${SA_OPTION} 0<&- > - } > - [ "x${SKIP_ARCH}" != "xi386" ] && grep -Eqs 'Architecture.*(any|i386)' "debian/control" && { > - nice sudo GNUPGHOME="${GNUPGHOME}" DIST="${l_DIST}" CODENAME="${l_CODENAME}" ARCH="i386" OTHERMIRROR="${OTHERMIRROR}" ${PDEBUILD} --auto-debsign --debsign-k "${GPG_KEY}" --buildresult "${PKGDIST}/${l_DIST}/${l_CODENAME}/i386" -- --binary-arch --allow-untrusted ${SA_OPTION} 0<&- > - } > + for arch in ${DEB_ARCHS_SUPPORTED}; do See change above. > + if [[ "$arch" == "$DEB_PRIMARY_ARCH" ]]; then > + [ "x${SKIP_ARCH}" != "x${arch}" ] && grep -Eqs "Architecture.*(all|any|${arch})" "debian/control" && { > + nice sudo GNUPGHOME="${GNUPGHOME}" DIST="${l_DIST}" CODENAME="${l_CODENAME}" ARCH="${arch}" OTHERMIRROR="${OTHERMIRROR}" ${PDEBUILD} --auto-debsign --debsign-k "${GPG_KEY}" --buildresult "${PKGDIST}/${l_DIST}/${l_CODENAME}/${arch}" -- --allow-untrusted ${SA_OPTION} 0<&- > + } > + else > + [ "x${SKIP_ARCH}" != "x${arch}" ] && grep -Eqs "Architecture.*(any|${arch})" "debian/control" && { > + nice sudo GNUPGHOME="${GNUPGHOME}" DIST="${l_DIST}" CODENAME="${l_CODENAME}" ARCH="${arch}" OTHERMIRROR="${OTHERMIRROR}" ${PDEBUILD} --auto-debsign --debsign-k "${GPG_KEY}" --buildresult "${PKGDIST}/${l_DIST}/${l_CODENAME}/${arch}" -- --binary-arch --allow-untrusted ${SA_OPTION} 0<&- > + } > + fi > + done > } > for extra_arch in ${EXTRA_ARCHS}; do > mkdir -p -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${extra_arch}" > @@ -345,7 +387,7 @@ upload_packages() { > test -z "${CODENAMES}" || grep "${CODENAMES}" <<< "${line}" || break > > if [ "x${EXTRA_ARCHS_ONLY}" = "x" ]; then > - for l_ARCH in amd64 i386; do > + for l_ARCH in ${DEB_ARCHS_SUPPORTED}; do See change above. > [ "x${SKIP_ARCH}" != "x${l_ARCH}" ] && { > cd "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}" > test -f "./dupload.conf" || ln -s -- "${HOME}/.dupload.conf.${PREFIX}" "./dupload.conf" Mihai

2 1

Use perl -T (taint) with x2goserver scripts
by Orion Poplawski 08 Apr '15

08 Apr '15

I'm thinking that x2go's server scripts should use perl's "-T" taint mode to prevent searching user's paths and otherwise improve security. Thoughts? -- Orion Poplawski Technical Manager 303-415-9701 x222 NWRA/CoRA Division FAX: 303-415-9702 3380 Mitchell Lane orion(a)cora.nwra.com Boulder, CO 80301 http://www.cora.nwra.com

3 3

Bug#836: defaults.py X2GOBROKER_SESSIONPROFILE_DEFAULTS height/width/fullscreen values prevents client from setting initial geometry on startup
by Jason Alavaliant 07 Apr '15

07 Apr '15

Package: python-x2gobroker Version: 0.0.3.0 In the same vein as the dpi issue noted in bug #834 the presence of default values for height, width and fullscreen in the /usr/lib/python2.7/dist-packages/x2gobroker/defaults.py file under theX2GOBROKER_SESSIONPROFILE_DEFAULTS section prevent the x2goclient --geometry option being used to set what default geometry size (or if to use fullscreen) to be set by the client even if the admin of the x2gobroker setup hasn't defined those values in the x2gobroker-sessionprofiles.conf file. I'd suggest updating the /usr/lib/python2.7/dist-packages/x2gobroker/defaults.py file to remove the lines "u'height': 600," "u'fullscreen': False," "u'width': 800," from the X2GOBROKER_SESSIONPROFILE_DEFAULTS section. In my testing with those default value gone; * If a height/width/fullscreen values are set in x2gobroker-sessionprofiles.conf (which is the default provided in the sample config file), then those values are used by the session overriding whatever the client has set as it's geometry option. * If the values aren't set in x2gobroker-sessionprofiles.conf and a --geometry command line argument ISN'T provided to the client then the x2goclient defaults of height=600, width=800, fullscreen=False are used resulting in the same behaviour as if the defaults previously defined in defaults.py were still present. * If the values aren't set in x2gobroker-sessionprofiles.conf and a --geometry command line argument IS provided to the client it is then used and the user running the x2goclient can pick their own initial geometry to start with. So in default cases having that default value removed shouldn't change behavior and it would allow people to configure their starting geometry if the x2gobroker admin has permitted it by not providing overriding values in the x2gobroker-sessionprofiles.conf file. Thanks Jason

2 2

Bug#650: X2Go Windows Client - vcxsrv.exe Window Titlebar gone
by Arie Vayner 06 Apr '15

06 Apr '15

I was running into the same bug as well. Tried downgrading, and seems like 4.0.2.1 is not affected while 4.0.3.0 and later are affected. Tnx Arie

1 0

Raspberry Pi Builds and How to Handle Authentication/Signing
by Michael DePaulo 05 Apr '15

05 Apr '15

Hi guys, 1st of all, I recall that someone else offered to setup a Raspberry Pi for X2Go Jenkins builds, but I forget who it was. I also cannot find anything about it in my IRC logs or emails. Anyway, I started (but did not finish) adapting buildscripts.git for Raspberry Pi builds with Raspbian: http://code.x2go.org/gitweb?p=buildscripts.git;a=shortlog;h=refs/heads/feat… (For one thing, I need to replace the logic that always calls qemubuilder with logic to use regular (chroot) pbuilder.) For those of you who are unfamiliar, the challenge with Raspbian is that while Debian's "armhf" binaries are ARMv7 hard-float, Raspbian's "armhf" binaries are ARMv6 hard-float. This is a necessary complication to maximize performance out of the Raspberry Pi 1. Even on the Raspberry Pi 2, which does support ARMv7 hard-float, Raspbian users are currently still using these binaries. I figured I would setup my Raspberry Pi 2 at my apartment as a Jenkins slave. However, it appears that I would need to upload the packages to code.x2go.org with dupload, which would in turn call scp in batch mode. That means setting up SSH public key authentication. We would also have to figure out package signing. So before I continue, I want to know: 1. Should I continue setting this up, or should we try to use qemubuilder on japsand with a Raspberry Pi version of QEMU? 2. If I continue setting this up, how should we setup the SSH and GPG keys? -Mike#2

4 4

Re: [X2Go-Dev] [X2Go-Commits] [buildscripts] 01/01: Use more consistent local variable names.
by Mihai Moldovan 04 Apr '15

04 Apr '15

On 04.04.2015 05:26 PM, git-admin(a)x2go.org wrote: > This is an automated email from the git hooks/post-receive script. > > x2go pushed a commit to branch feature/raspbian > in repository buildscripts. > > commit c8066d2fc06e5b4347ba5f787ce3ca29f02532ab > Author: Mike DePaulo <mikedep333(a)gmail.com> > Date: Sat Apr 4 11:26:16 2015 -0400 > > Use more consistent local variable names. > --- > bin/build-deb-package | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/bin/build-deb-package b/bin/build-deb-package > index 88d731d..2632644 100755 > --- a/bin/build-deb-package > +++ b/bin/build-deb-package > @@ -320,13 +320,13 @@ build_packages() { > [ "x${USE_SUDO}" != "xyes" ] && { > [ "x${EXTRA_ARCHS_ONLY}" = "x" ] && { > for arch in ${DEB_ARCHS_SUPPORTED}; do > - if [[ "$arch" == "$DEB_PRIMARY_ARCH" ]]; then > - [ "x${SKIP_ARCH}" != "x${arch}" ] && grep -Eqs "Architecture.*(all|any|${arch})" "debian/control" && { > - DIST="${l_DIST}" CODENAME="${l_CODENAME}" ARCH="${arch}" nice ${PDEBUILD} --auto-debsign --debsign-k "${GPG_KEY}" --buildresult "${PKGDIST}/${l_DIST}/${l_CODENAME}/${arch}" -- --allow-untrusted ${SA_OPTION} 0<&- > + if [[ "$l_ARCH" == "$DEB_PRIMARY_ARCH" ]]; then > + [ "x${SKIP_ARCH}" != "x${l_ARCH}" ] && grep -Eqs "Architecture.*(all|any|${l_ARCH})" "debian/control" && { > + DIST="${l_DIST}" CODENAME="${l_CODENAME}" ARCH="${l_ARCH}" nice ${PDEBUILD} --auto-debsign --debsign-k "${GPG_KEY}" --buildresult "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}" -- --allow-untrusted ${SA_OPTION} 0<&- Note that if you change the loop variable in the loop body, you'll also need to change it in the loop header (for l_ARCH in ${DEB_ARCHS_SUPPORTED}; do) > [...] > for arch in ${DEB_ARCHS_SUPPORTED}; do Same here. > - if [[ "$arch" == "$DEB_PRIMARY_ARCH" ]]; then > - [ "x${SKIP_ARCH}" != "x${arch}" ] && grep -Eqs "Architecture.*(all|any|${arch})" "debian/control" && { > - nice sudo GNUPGHOME="${GNUPGHOME}" DIST="${l_DIST}" CODENAME="${l_CODENAME}" ARCH="${arch}" OTHERMIRROR="${OTHERMIRROR}" ${PDEBUILD} --auto-debsign --debsign-k "${GPG_KEY}" --buildresult "${PKGDIST}/${l_DIST}/${l_CODENAME}/${arch}" -- --allow-untrusted ${SA_OPTION} 0<&- > + if [[ "$l_ARCH" == "$DEB_PRIMARY_ARCH" ]]; then > + [ "x${SKIP_ARCH}" != "x${l_ARCH}" ] && grep -Eqs "Architecture.*(all|any|${l_ARCH})" "debian/control" && { > + nice sudo GNUPGHOME="${GNUPGHOME}" DIST="${l_DIST}" CODENAME="${l_CODENAME}" ARCH="${l_ARCH}" OTHERMIRROR="${OTHERMIRROR}" ${PDEBUILD} --auto-debsign --debsign-k "${GPG_KEY}" --buildresult "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}" -- --allow-untrusted ${SA_OPTION} 0<&- >[...] Mihai

1 0

Bug#837: X2goclient goes full screen automatically when it is maximed in the secondary monitor
by Nikolaos Kefalas 04 Apr '15

04 Apr '15

Package: <x2goclient > Version: <4.0.3.2> OS <Windows 8.1 x64> Two monitor setup, windows taskbar only in the first monitor. Xinerama not enabled X2goclient goes full screen automatically when it is maximed in the secondary monitor in two monitor setup. Afterwards there is no way to switch back to window mode. The VCXSrv.0.log reports Welcome to the VcXsrv X Server Vendor: The VcXsrv Project Release: 1.15.2.4 Contact: marha(a)users.sourceforge.net DefineSelf - powerpc has 3 usable IPv4 interfaces... addresses 192.168.127.1 192.168.226.1 192.168.2.10 DefineSelf - powerpc has IPv6 addresses... fe80::7d54:4aa4:2f3c:189d fe80::d92d:510f:6007:be5b fe80::8c2:299f:3f57:fdf5 2001:0:5ef5:79fd:8c2:299f:3f57:fdf5 LoadPreferences: C:\Users\xxxxx\AppData\Roaming/.XWinrc not found LoadPreferences: Loading C:\Program Files (x86)\x2goclient\vcxsrv\system.XWinrc Warning: Locale not supported by X, falling back to 'C' locale. (II) AIGLX: enabled GLX_SGI_make_current_read (II) AIGLX: enabled GLX_MESA_copy_sub_buffer (II) AIGLX: enabled GLX_SGI_swap_control and GLX_MESA_swap_control (II) AIGLX: enabled GLX_SGIX_pbuffer (II) AIGLX: enabled GLX_ARB_multisample and GLX_SGIS_multisample (II) 354 pixel formats reported by wglGetPixelFormatAttribivARB (II) AIGLX: Set GLX version to 1.4 (II) GLX: Initialized Win32 native WGL GL provider for screen 0 winBlockHandler - pthread_mutex_unlock() winClipboardProc - winClipboardFlushWindowsMessageQueue trapped WM_QUIT message, exiting main loop.

1 0

test X2Go Session Broker in the nightly builds
by Mike Gabriel 04 Apr '15

04 Apr '15

Hi Jason, I have done a lot of work recently on the X2Go Session Broker pushing it towards the 0.0.3.0 release. Do you see any chance of testing your use case with that new version? Any sort of feedback will be highly welcome. Thanks, Mike -- DAS-NETZWERKTEAM mike gabriel, herweg 7, 24357 fleckeby fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x…

2 1

Buildscripts reworked
by Mihai Moldovan 03 Apr '15

03 Apr '15

Hi, I initially intended to write this eMail as a follow-up to another thread on the mailing list: [X2Go-Dev] FYI: I updated the Fedora Rawhide mock files onjenkins However, this turns out to be a bad idea as the changes to the buildscripts were quite massive and not just fixing one issue. Thus, I'll be utilizing this to give you all a summary of what changed. Deb + RPM shared changes: o New cleanup mechanism. Temporary directories are now always deleted, no matter whether the build was successful or not. o Added a lot of quotes and put variables in ${CURLY_BRACES}. o Functions are, whenever possible, not ran in subshells. This means that global variables can be modified and will actually have an effect in the main process. o Lots of small improvements, for instance by not using echo "${var}" | grep "searchstr", but grep "searchstr" <<< "${var}" or grep "searchstr" "file" instead of cat "file" | grep "searchstr" RPM changes: o New mock config file creation mechanism for merging a base mock config with a .repo file. o New option "RPM_MOCK_CONFIG_DIR". Default: /etc/mock. Not overridden in x2go.conf. Specifies the location of mock .cfg and additional .repo files. o New option "RPM_EXTRA_REPO_MOCK_CONFIG_BASE". Default: empty string. Overridden in x2go.conf to "x2go". Sets the prefix for .repo files in the ${RPM_MOCK_CONFIG_DIR} directory. (hell, I should probably change this to a better, shorter name, but I have no idea to what exactly...) o New option "RPM_WANT_EXTRA_REPOS". Default: 0. Overridden in x2go.conf to 1. If this is enabled, additional repositories provided in ${RPM_MOCK_CONFIG_DIR} are taken into account and merged with the base mock config file. Otherwise, the default config files in /etc/mock will be used by running mock with the option -r ${DISTRIBUTION}-${VERSION}-${ARCH}, e.g. -r fedora-22-x86_64. o Additional repository files in ${RPM_MOCK_CONFIG_DIR} have to follow this naming convention: ${RPM_EXTRA_REPO_MOCK_CONFIG_BASE}-${DISTRIBUTION}.repo and should contain: - a section called ${RPM_EXTRA_REPO_MOCK_CONFIG_BASE}- -extras-${DISTRIBUTION}. Example for X2Go and EPEL: [x2go-extras-epel] - a section called ${RPM_EXTRA_REPO_MOCK_CONFIG_BASE}- -release-${DISTRIBUTION} Example for X2Go and Fedora: [x2go-release-fedora] - a section called ${RPM_EXTRA_REPO_MOCK_CONFIG_BASE}- -nightly-${DISTRIBUTION} Example for X2Go and EPEL: [x2go-nightly-epel] Each of these section should contain at least the following keys (but they are currently not enforced to be present): - name - baseurl - enabled - gpgkey - gpgcheck For all packages, the extras section will be copied to the generated temporary mock config file. If the package to be built is NOT included in the list provided by the already existent ${PACKAGE_WITHOUT_OTHERMIRROR} variable, the release or nightly section will also be copied to the generated temporary mock config file. For all copied sections, the "enabled" key will be forcefully set to 1 and "gpgcheck" to 0. I may change the latter behavior at a convenient time with prior testing. /etc/mock changes: o Copied /etc/mock to /etc/mock-2015-04-03 as a backup. o Copied original .cfg files to .cfg.orig. o Fetched new .cfg files from mock's upstream git archive for version 1.2.7. o For Fedora 20 to 22, the upstream config files define "releasever" and use it as a variable in the yum.conf section. This does not work with mock 1.1.33. Thus I copied the original upstream files with an .upstream suffix and used sed to hardcode the release version in the "normal" mock config files. If this was all too verbose, (anyone) please tell me. Mihai

1 1

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

x2go-dev