modular: Changes to 'master'
Gaetan Nadon
gnadon at kemper.freedesktop.org
Mon Oct 28 21:48:21 CET 2013
build.sh | 410 +++++++++++++++++++++++++++++++++++++++++++++++----------------
1 file changed, 310 insertions(+), 100 deletions(-)
New commits:
commit c69f391975417d6792d8f003b39e6f937fde61c7
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sat Oct 19 11:28:32 2013 -0400
build.sh: provide a file header comment
Only comment lines have beed added or changed
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
commit 4c8331adfde5589bde45803f4d582999ef6cb18e
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Wed Oct 16 21:50:17 2013 -0400
build.sh: extract tarballs in a consistent location
The tarballs are extracted in the same location where they are found. So libXi
code will be extracted in the toplevel directory if this is where the tarball
is found. Then lib/libX11 code will be extracted under lib subdir if, for
example, the tarball is placed in the lib subdir.
This patch promotes a consistent build structure based on what we see when
working in git. The source code for modules having components (e.g. app,
driver) is extracted under the module directory. For modules with no
components (e.g. xserver), the tar file is extracted under the toplevel
directory. This is done regardless of where the tarball is found, either
in the toplevel directory, or under the module directory.
Sample build directory hierarchy:
app/luit-1.1.1
driver/xf86-input-void-1.4.0
font/font-util-1.3.0
lib/libXi-1.7
mesa/libdrm-2.4.47
mesa/Mesa-9.2.1
pixman-0.30.2
xcb/libxcb-1.9
xcb/xcb-proto-1.8
xkeyboard-config-2.5
xorg-server-1.14.99.2
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
commit 3ce63214f77d62bc29383945f454f23ac87ded9e
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Tue Oct 15 22:18:43 2013 -0400
build.sh: tarballs not found under their respective module directory
Currently, the module name is changed to add a subdir. For example "xcb" is
changed to "xcb/proto". The tarball cannot be found under xcb as expected.
This is done for pixman, xcb and mesa only, not for app, driver, lib, or any
other module which is inconsistent.
Moving the tarball under xcb/proto works, but yields a build structure
that is unpractical: xcb/proto/xcb-proto-1.8. The source code is now
under two subdirs rather than the usual one.
The package archive already contains the component directory, suffixed
with a version number.
By not changing the module name, we have xcb/xcb-proto-1.8. The same
pattern holds true for mesa and pixman. Changing the module name has
other adverse effects in subsequent functionality.
Note that for pixman, this module is under the "pixman" directory
and is not a component of the "lib" module. The module directory
structure is given by git and not by the location of the tarballs
on the web.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
commit 95f42f960e1567fd5799d376d245c52f36379b99
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Mon Oct 14 16:58:46 2013 -0400
build.sh: complete error path when extracting from tars
The return code was not checked and the script aborts if the tar command
fails rather processing the errors in the usual manner.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
commit 8600040bf361865850a1877a0c947441f34b8acf
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Mon Oct 14 15:51:25 2013 -0400
build.sh: recover SRCDIR when tar command fails
The SRCDIR is changed before running the tar command. If it fails,
the calling function attempts to cd to the directory the tar command
was not successful in creating.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
commit ccdf461fb255d494be75797545588fd332754436
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Mon Oct 14 08:50:24 2013 -0400
build.sh: add support for the xz archive file format
There is one non-xorg project (libevdev) upon which xorg depends
that is using this format. Most likely others will follow.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
commit bb5104484591a68036b50aa014456e044e214e2a
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sat Oct 12 14:32:23 2013 -0400
build.sh: no longer require a trailing slash for module name
A few modules have a single level directory such as pixman, xserver,
and so on. Currently the script requires specifying such modules in
the module list file or with the -o option with a trailing slash. So one needs
to learn and remember using pixman/ or xserver/.
The patch will correct the situation such that both input are accepted.
The generated list (-L option) will write the module names without the
trailing slash.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
commit 5abcf3c9a9ce78842d88b9ede65fce0c55f2a43c
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Mon Oct 14 15:04:00 2013 -0400
build.sh: add tar building support for libevdev
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
More information about the xorg-commit
mailing list