aboutsummaryrefslogtreecommitdiffstats
path: root/tools/libfsimage
Commit message (Collapse)AuthorAgeFilesLines
* tools: Cull more ia64 and ppc codeAndrew Cooper2013-08-201-46/+0
| | | | | Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Acked-by: Ian Campbell <Ian.Campbell@citrix.com>
* tools/libfsimage: Fix clean and distclean make targetsDaniel Kiper2013-05-132-3/+3
| | | | | | | | | | | | | | | | If there is a single colon for a given target and the target is redefined in another place (e.g. in included file) then make executes only new target and displays following warning: Makefile:35: warning: overriding commands for target `clean' tools/libfsimage/common/../../../tools/libfsimage/Rules.mk:25: warning: ignoring old commands for target `clean' To cope with that issue define all required targets as double-colon rules. Additionally, remove some redundant stuff. Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com> Acked-by: Ian Campbell <ian.campbell@citrix.com>
* libfsimage: add ext4 support for CentOS 5.xRoger Pau Monne2012-09-143-3/+9
| | | | | | | | | | | | | | | CentOS 5.x forked e2fs ext4 support into a different package called e4fs, and so headers and library names changed from ext2fs to ext4fs. Check if ext4fs/ext2fs.h and -lext4fs work, and use that instead of ext2fs to build libfsimage. This patch assumes that if the ext4fs library is present it should always be used instead of ext2fs. This patch includes a rework of the ext2fs check, a new ext4fs check and a minor modification in libfsimage to use the correct library. Signed-off-by: Roger Pau Monne <roger.pau@citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> Committed-by: Ian Campbell <ian.campbell@citrix.com>
* tools: honour --libdir when it is passed to ./configureMatt Wilson2012-07-053-31/+7
| | | | | | | | | | | | | | | | | | | | | | | | Currently shared libraries are automatically installed into /usr/lib or /usr/lib64, depending on the supplied --prefix value and $(XEN_TARGET_ARCH). Some systems, like recent Debian and Ubuntu releases, do not use /usr/lib64, but instead /usr/lib/x86_64-linux-gnu. With this change, packagers can supply the desired location for shared libraries on the ./configure command line. Packagers need to note that the default behaviour on 64-bit Linux systems will be to install shared libraries in /usr/lib, not /usr/lib64, unless a --libdir value is provided to ./configure. Additionally, the libfsimage plugins are now loaded explicitly from $LIBDIR/fs, removing platform-based decision trees in code. Signed-off-by: Matt Wilson <msw@amazon.com> Acked-by: Ian Jackson <Ian.Jackson@eu.citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> [ ijc -- resolve rejects in configure by rerunning autogen.sh. Dropped changes to remove m4/default_lib.m4 and update m4/pkg.m4 since they cause LIBDIR=/lib instead of /usr/lib. Reran ./autogen.sh after that too ] Committed-by: Ian Campbell <ian.campbell@citrix.com>
* tools: Revert c/s 25150:b490ef93bad7 tools/libfsimage: include Rules.mk firstGeorge Dunlap2012-04-138-8/+16
| | | | | | | | | | | | | tools/libfsimage/Rules.mk relies on having certain variables set already; if they're not set, the definitions dont' work right. The result was a bunch of empty files and pygrub failing with an uninformative error message. It's likely that this didn't cause anyone problems becasue changing the Makefiles didn't cause a re-build; building from a fresh repo results in completely empty filesystem plugin binaries. Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools: Use PTHREAD_CFLAGS, _LDFLAGS, _LIBSIan Jackson2012-04-111-1/+4
| | | | | | | | | | | Replace all literal occurrences of -lpthread and -pthread in Makefiles by references to PTHREAD_CFLAGS, PTHREAD_LDFLAGS and PTHREAD_LIBS. These are the new variables set by configure, and currently expand to -pthread on the compilation and link lines as is required. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> Committed-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
* tools/libfsimage: include Rules.mk firstOlaf Hering2012-03-148-16/+8
| | | | | | | | | Move the inclusion of Rules.mk up so that things like CFLAGS get initialized properly. Currently only zfs appends CFLAGS. If CFLAGS get reset by Rules.mk the private settings are lost and compilation of zfs support fails. Signed-off-by: Olaf Hering <olaf@aepfle.de> Committed-by: Ian Jackson <ian.jackson.citrix.com>
* build: add autoconf to replace custom checks in tools/checkIan Jackson2012-02-222-22/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added autotools magic to replace custom check scripts. The previous checks have been ported to autoconf, and some additional ones have been added (plus the suggestions from running autoscan). Two files are created as a result from executing configure script, config/Tools.mk and config.h. conf/Tools.mk is included by tools/Rules.mk, and contains most of the options previously defined in .config, that can now be set passing parameters or defining environment variables when executing configure script. config.h is only used by libxl/xl to detect yajl_version.h. [ tools/config.sub and config.guess copied from autotools-dev 20100122.1 from Debian squeeze i386, which is GPLv2. tools/configure generated using the included ./autogen.sh which ran autoconf 2.67-2 from Debian squeeze i386. autoconf is GPLv3+ but has a special exception for the autoconf output; this exception applies to us and exempts us from complying with GPLv3+ for configure, which is good as Xen is GPL2 only. - Ian Jackson ] Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu> Tested-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
* tools: only compile libfsimage/xfs on X86Ian Campbell2012-02-131-1/+2
| | | | | | | xfs is not portable, only compile it on X86 Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* remove the use of -Wno-unused-valueJan Beulich2011-12-131-1/+1
| | | | | | | | It has been hiding actual mistakes, and there are not too many changes necessary to make things build without suppressing this warning. Signed-off-by: Jan Beulich <jbeulich@suse.com> Acked-by: Keir Fraser <keir@xen.org>
* tools/build: Introduce {PREPEND,APPEND}_{LIB,INCLUDES}Roger Pau Monne2011-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | Create two new variables called APPEND_ and PREPEND_ to add compile flags at the beginning or at the end of the search path. Added a new semantic for user defined compile flags, here is the list of possible options: PREPEND_LIB: add libraries to the search path before xen (before xen installation folders). PREPEND_INCLUDES: add headers to the search path before xen (before xen installation folders). APPEND_LIB: add libraries to the search path at the end (after all xen installation folders have been added). APPEND_INCLUDES: add libraries to the search path at the end (after all xen installation folders have been added). EXTRA_INCLUDES and EXTRA_LIB can still be used, and they will have the same effect as PREPEND_INCLUDES and PREPEND_LIB. Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools/libfsimage: Avoid relative XEN_ROOT specificationJuergen Gross2011-10-071-1/+1
| | | | | | | | XEN_ROOT must be set to an absolute path to avoid out of the tree references Signed-off-by: Juergen Gross <juergen.gross@ts.fujitsu.com> Committed-by: Keir Fraser <keir@xen.org>
* tools/libfsimage: build fix (ctype macros applied to char)Christoph Egger2011-05-261-2/+3
| | | | | | | | Fix warning: array subscript has type 'char' Signed-off-by: Christoph Egger <Christoph.Egger@amd.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* pygrub: XFS support for pygrubMarco Nenciarini2011-05-244-1/+1194
| | | | | Signed-off-by: Marco Nenciarini <marco.nenciarini@devise.it> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools: Remove $(CFLAGS) from links lines.Ian Campbell2011-03-312-2/+2
| | | | | | | | The relevant variable in these circumstances is called $(LDFLAGS). Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* build: Make XEN_ROOT an absolute path.Keir Fraser2011-03-179-9/+9
| | | | | | | | Otherwise make can search the path relative to certain standard paths such as /usr/include (e.g., the line '-include $(XEN_ROOT)/.config' in Config.mk suffers from this). Signed-off-by: Keir Fraser <keir@xen.org>
* split LDLIBS from LDFLAGS to fix link errors in recent toolchainsStefano Stabellini2010-08-112-2/+2
| | | | | | | | | | | | | | | | Linker command lines are order-sensitive. Move linker options -Lfoo -lfoo from LDFLAGS to LDLIBS and place this new variable after the objects to link. This resolves build errors in xenpagin and blktap with recent toolchains. rename SHLIB_CFLAGS to SHLIB_LDFLAGS rename LDFLAGS_* to LDLIBS_* move LDFLAGS usage after CFLAGS in CC calls remove stale comments in xenpaging Makefile Signed-off-by: Olaf Hering <olaf@aepfle.de> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
* libfsimage: zfs build fix for NetBSDKeir Fraser2010-04-152-13/+13
| | | | | | | | uchar_t is not defined because both FSYS_ZFS and FSIMAGE are defined at build time. Also fix warnings with ctype. Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
* Port latest grub zfs boot code to pygrubKeir Fraser2010-04-1428-470/+999
| | | | | | | | Signed-off-by: Mark Johnson <mark.r.johnson@oracle.com> Add -Werror to CFLAGS and fix numerous warnings/errors. Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
* pygrub, reiserfs: Fix on-disk structure definition.Keir Fraser2009-12-231-2/+2
| | | | | | Without this patch pyGRUB could not read ReiserFS. Signed-off-by: Daniel Kiper <dkiper@net-space.pl>
* pygrub: add ext4 supportKeir Fraser2009-12-161-72/+157
| | | | | | | | This is a port of the following two patches: http://patches.ubuntulinux.org/g/grub/extracted/ext4_support.diff http://patches.ubuntulinux.org/g/grub/extracted/ext4_fix_variable_sized_inodes.diff Signed-off-by: Mark Johnson <mark.johnson@sun.com>
* libfsimage: Support for zfs version 16.Keir Fraser2009-07-064-11/+11
| | | | | | | Remove version checks to support boot of ZFS root filesystem version 16. Signed-off-by: Susan Kamm-Worrell <susan.kamm-worrell@sun.com>
* libfsimage: Support for zfs version 14.Keir Fraser2009-03-122-13/+2
| | | | Signed-off-by: Susan Kamm-Worrell <susan.kamm-worrell@sun.com>
* Use -MMD -MF in tools/* rather than -Wp,-M...Keir Fraser2009-01-122-6/+1
| | | | | | | | | | | | | | | | | | | | | | If you use -MMD -MF then the correct .o filename is written to the .*.d file as the compiler driver arranges everything. This was done in 19010:275abe1c5d24 for the hypervisor. In this patch we do the same elsewhere in the xen-unstable tree, particularly tools/. Specifically: * Change tools/Rules.mk to add -MMD -MF ... to CFLAGS and set DEPS. * Remove -Wp,-MD... from every other Makefile * Remove setting of DEPS from every other Makefile * Ensure that every Makefile says -include $(DEPS) * Ensure that every Makefile's clean target removes $(DEPS) Some Makefiles were already halfway there, but often for a different variable name eg PROG_DEP. The variable name is now standardised in Rules.mk as DEPS. I have done a test build with this change, on Debian etch. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools: Make functions static which should not be exported.Keir Fraser2008-07-156-18/+18
| | | | Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
* tools: replace sprintf with snprintf where applicableKeir Fraser2008-06-121-1/+1
| | | | Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
* libfsimage: make pygrub work on ufsKeir Fraser2008-06-091-2/+4
| | | | Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
* libfsimage: Build fix for NetBSD.Keir Fraser2008-06-051-5/+5
| | | | Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
* [libfsimage/zfs] compilation fix ZFS libfsimage support.Keir Fraser2008-05-021-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Depending on environments, zfs libfsimage support doesn't compile. This patch fixes it. ia64-linux-gnu-gcc -DPIC -O2 -fomit-frame-pointer -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes -Wno-unused-value -Wdeclaration-after-statement -I/usr/ia64-linux-gnu/ sys-root/usr/include -D__XEN_TOOLS__ -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -I../../../tools/libfsimage/common/ -Werror -Wp,-MD,.zfs_lzjb.opic.d -fPIC -c -o zfs_lzjb.opic zfs_ lzjb.c In file included from fsys_zfs.h:41, from zfs_lzjb.c:25: zfs-include/zfs_acl.h:29: error: redefinition of typedef uid_t /usr/ia64-linux-gnu/sys-root/usr/include/sys/types.h:82: error: previous declaration of uid_t was here This depends on how __uid_t is defined in the system header. No file under the zfs directory uses uid_t so that just removing the definition in the zfs_acl.h looks reasonable. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
* Add ZFS libfsimage support patchKeir Fraser2008-05-0131-6/+3587
| | | | | | | | | Add support to pygrub and libfsimage to boot ZFS root filesystems. Boot argument of zfs-bootfs is set to describe ZFS root pool and boot filesystem object number. Boot argument bootpath is set to describe the virtual device root mirror components. Signed-off-by: Susan Kamm-Worrell <susan.kamm-worrell@sun.com>
* [LIBFSIMAGE] Support 256 byte inodes on ext3Keir Fraser2008-04-161-7/+54
| | | | | | | Patch taken from Debian grub package version 0.97-32. See http://bugs.debian.org/463236 & http://bugs.debian.org/463123 Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
* libfsimage: Build check script needs only /bin/sh.Keir Fraser2008-03-271-1/+1
| | | | Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
* libfsimage: Revert broken parts of portability changes to the build system.Keir Fraser2008-03-272-5/+3
| | | | Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
* libfsimage: portability fixes for NetBSDKeir Fraser2008-03-266-15/+49
| | | | Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
* tools build: Fix build after subdir rules cleanups.Keir Fraser2008-03-251-1/+2
| | | | Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
* tools/libfsimage build: Use generic subdirs rules.Keir Fraser2008-03-251-5/+2
| | | | Signed-off-by: Bastian Blank <waldi@debian.org>
* Make check-libext2fs cross-friendlyKeir Fraser2008-01-282-2/+2
| | | | | | | check-libext2fs was calling host gcc; pass $CC from Makefile so it can call the cross-compiler instead. Signed-off-by: Aron Griffis <aron@hp.com>
* Fix libfsimage build on SolarisKeir Fraser2008-01-241-2/+2
| | | | | | The Solaris installation dirs were missing $(PREFIX) Signed-off-by: John Levon <john.levon@sun.com>
* Add INCLUDEDIR. Use it.Keir Fraser2008-01-221-4/+4
| | | | Signed-off-by: Bastian Blank <waldi@debian.org>
* Apply PREFIX directly to LIBDIR.Keir Fraser2008-01-222-6/+6
| | | | Signed-off-by: Bastian Blank <waldi@debian.org>
* tools: Some fixes for 'make clean'.Keir Fraser2007-12-142-2/+2
| | | | Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
* Revert 16560:822d4ec5cfb1.Keir Fraser2007-12-081-2/+2
| | | | | | | | | | | | | Preference seems to be to update library versions only when the ABI changes. Only libxenctrl/libxenguest have their version number changed to 3.2.0, as a reminder that they change on pretty much every major release. libfsimage/libxenstore/libblktap have not changed substantially recently, hence the ABI has not changed, and version number stays the same as in Xen 3.1 (and before). Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
* tools: Rationalise library soname versions.Keir Fraser2007-12-071-2/+2
| | | | | | | | | | | | | | | | * Arrange for the sonames of libxenstore, libxc, libfsimage and libblktap to be set from a single place in Config.mk. * Bumps the soname major version number to 3.2 in preparation for 3.2 rc1 after which we do not expect to have ABI changes. I have not done anything about libaio and libflask. The former is imported from elsewhere and if we're lucky will have sane versioning upstream. libflask has a very small interface and I'm hoping that the XSM authors have been keeping some ABI discipline. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
* Fix libfsimage build on NetBSD.Keir Fraser2007-09-235-15/+15
| | | | | | | | | | | | | Fixes a number of these errors: cc1: warnings being treated as errors fsys_fat.c: In function 'fat_dir': fsys_fat.c:304: warning: array subscript has type 'char' Signed-off-by: Christoph Egger <Christoph.Egger@amd.com> These ugly casts are needed according to the ISO C spec. Acked-by: Keir Fraser <keir@xensource.com>
* [TOOLS] Avoid unaligned accesses in libfsimage FAT16 codeTim Deegan2007-08-081-3/+3
| | | | | Signed-off-by: Kouya Shimura <kouya@jp.fujitsu.com> Signed-off-by: KUWAMURA Shin'ya <kuwa@jp.fujitsu.com>
* [IA64] Avoid use of kernel type in user code.Alex Williamson2007-06-111-1/+1
| | | | Signed-off-by: Tristan Gingold <tgingold@free.fr>
* ia64 doesn't use /usr/lib64 on any distribution. When it's present, it's a ↵kfraser@localhost.localdomain2007-05-031-0/+3
| | | | | | symlink to /usr/lib Signed-off-by: Aron Griffis <aron@hp.com>
* libfsimage: Fix data types for 64-bit architectures.kfraser@localhost.localdomain2007-04-111-7/+7
| | | | | | | In particular __u32 instead of ulong. Signed-off-by: Tomohiro Takahashi <takatom@jp.fujitsu.com> Signed-off-by: Keir Fraser <keir@xensource.com>
* libfs: Fix build with gcc4.kfraser@localhost.localdomain2007-02-211-6/+6
| | | | Signed-off-by: Keir Fraser <keir@xensource.com>
* Port fsys_fat.c from grub legacy. This enables pygrub to load from EFIAron Griffis2007-02-134-1/+599
| | | | | | FAT partitions on ia64. Signed-off-by: Aron Griffis <aron@hp.com>