Carsten Schlote wrote: > From: Carsten Schlote <c.schl...@konzeptpark.de> > > The libacl.so is required by other target tools. > > The packet also includes acl control functions, > which can be installed on demand.
applied with some changes
cheers Marc
>
> Signed-off-by: Carsten Schlote <c.schl...@konzeptpark.de>
> ---
> .../add-DESTDIR-to-fix-crosscompile-install.patch | 235
> ++++++++++++++++++++
> patches/acl-2.2.49/series | 1 +
> rules/acl.in | 24 ++
> rules/acl.make | 102 +++++++++
> 4 files changed, 362 insertions(+), 0 deletions(-)
> create mode 100644
> patches/acl-2.2.49/add-DESTDIR-to-fix-crosscompile-install.patch
> create mode 100644 patches/acl-2.2.49/series
> create mode 100644 rules/acl.in
> create mode 100644 rules/acl.make
>
> diff --git a/patches/acl-2.2.49/add-DESTDIR-to-fix-crosscompile-install.patch
> b/patches/acl-2.2.49/add-DESTDIR-to-fix-crosscompile-install.patch
> new file mode 100644
> index 0000000..34d8d8c
> --- /dev/null
> +++ b/patches/acl-2.2.49/add-DESTDIR-to-fix-crosscompile-install.patch
> @@ -0,0 +1,235 @@
> +From: Carsten Schlote <c.schl...@konzeptpark.de>
> +Subject: Fix crosscompile install stage (DESTDIR)
> +
> +This patch adds $(DESDIR) to the installation paths to allow proper
> +use of make install from ptxdist.
> +
> +Signed-off: Carsten Schlote <c.schl...@konzeptpark.de>
> +---
> + Makefile | 8 +++++---
> + chacl/Makefile | 4 ++--
> + doc/Makefile | 6 +++---
> + getfacl/Makefile | 4 ++--
> + include/Makefile | 10 +++++-----
> + include/buildmacros | 40 ++++++++++++++++++++--------------------
> + libacl/Makefile | 2 +-
> + man/Makefile | 6 ++++++
> + setfacl/Makefile | 4 ++--
> + 9 files changed, 46 insertions(+), 38 deletions(-)
> +
> +Index: acl-2.2.48/chacl/Makefile
> +===================================================================
> +--- acl-2.2.48.orig/chacl/Makefile 2009-06-22 20:37:31.000000000 +0200
> ++++ acl-2.2.48/chacl/Makefile 2009-12-15 21:00:35.627907040 +0100
> +@@ -30,6 +30,6 @@
> + include $(BUILDRULES)
> +
> + install: default
> +- $(INSTALL) -m 755 -d $(PKG_BIN_DIR)
> +- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)
> ++ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_BIN_DIR)
> ++ $(LTINSTALL) -m 755 $(LTCOMMAND) $(DESTDIR)$(PKG_BIN_DIR)
> + install-dev install-lib:
> +Index: acl-2.2.48/doc/Makefile
> +===================================================================
> +--- acl-2.2.48.orig/doc/Makefile 2009-06-22 20:37:31.000000000 +0200
> ++++ acl-2.2.48/doc/Makefile 2009-12-15 21:00:35.627907040 +0100
> +@@ -31,12 +31,12 @@
> + $(ZIP) --best -c < CHANGES > $@
> +
> + install: default
> +- $(INSTALL) -m 755 -d $(PKG_DOC_DIR)
> +- $(INSTALL) -m 644 PORTING CHANGES.gz $(PKG_DOC_DIR)
> ++ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DOC_DIR)
> ++ $(INSTALL) -m 644 PORTING CHANGES.gz $(DESTDIR)$(PKG_DOC_DIR)
> + ifeq ($(PKG_DISTRIBUTION), debian)
> + $(INSTALL) -S CHANGES.gz $(PKG_DOC_DIR)/changelog.gz
> + else
> +- $(INSTALL) -m 644 COPYING COPYING.LGPL $(PKG_DOC_DIR)
> ++ $(INSTALL) -m 644 COPYING COPYING.LGPL $(DESTDIR)$(PKG_DOC_DIR)
> + endif
> +
> + install-dev install-lib:
> +Index: acl-2.2.48/getfacl/Makefile
> +===================================================================
> +--- acl-2.2.48.orig/getfacl/Makefile 2009-06-22 20:37:31.000000000 +0200
> ++++ acl-2.2.48/getfacl/Makefile 2009-12-15 21:00:35.627907040 +0100
> +@@ -31,6 +31,6 @@
> + include $(BUILDRULES)
> +
> + install: default
> +- $(INSTALL) -m 755 -d $(PKG_BIN_DIR)
> +- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)
> ++ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_BIN_DIR)
> ++ $(LTINSTALL) -m 755 $(LTCOMMAND) $(DESTDIR)$(PKG_BIN_DIR)
> + install-dev install-lib:
> +Index: acl-2.2.48/include/Makefile
> +===================================================================
> +--- acl-2.2.48.orig/include/Makefile 2009-06-22 20:37:31.000000000 +0200
> ++++ acl-2.2.48/include/Makefile 2009-12-15 21:00:35.627907040 +0100
> +@@ -31,10 +31,10 @@
> + include $(BUILDRULES)
> +
> + install-dev: default
> +- $(INSTALL) -m 755 -d $(PKG_INC_DIR)
> +- $(INSTALL) -m 755 -d $(PKG_INC_DIR)/sys
> +- $(INSTALL) -m 644 acl.h $(PKG_INC_DIR)/sys/acl.h
> +- $(INSTALL) -m 755 -d $(PKG_INC_DIR)/acl
> +- $(INSTALL) -m 644 libacl.h $(PKG_INC_DIR)/acl/libacl.h
> ++ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_INC_DIR)
> ++ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_INC_DIR)/sys
> ++ $(INSTALL) -m 644 acl.h $(DESTDIR)$(PKG_INC_DIR)/sys/acl.h
> ++ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_INC_DIR)/acl
> ++ $(INSTALL) -m 644 libacl.h $(DESTDIR)$(PKG_INC_DIR)/acl/libacl.h
> +
> + install install-lib:
> +Index: acl-2.2.48/include/buildmacros
> +===================================================================
> +--- acl-2.2.48.orig/include/buildmacros 2009-06-22 20:37:31.000000000
> +0200
> ++++ acl-2.2.48/include/buildmacros 2009-12-15 21:00:35.627907040 +0100
> +@@ -68,9 +68,9 @@
> + ifeq ($(ENABLE_SHARED),yes)
> + INSTALL_LTLIB = \
> + cd $(TOPDIR)/$(LIBNAME)/.libs; \
> +- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
> +- ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \
> +- ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR)
> ++ ../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_LIB_DIR); \
> ++ ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai
> $(DESTDIR)$(PKG_LIB_DIR); \
> ++ ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(DESTDIR)$(PKG_LIB_DIR)
> + endif
> +
> + # Libtool thinks the static and shared libs should be in the same dir, so
> +@@ -82,15 +82,15 @@
> + ifeq ($(ENABLE_SHARED),yes)
> + INSTALL_LTLIB_DEV = \
> + cd $(TOPDIR)/$(LIBNAME)/.libs; \
> +- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
> +- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \
> +- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
> +- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
> +- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
> ++ ../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DEVLIB_DIR); \
> ++ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai
> $(DESTDIR)$(PKG_DEVLIB_DIR); \
> ++ ../$(INSTALL) -m 644 $(LIBNAME).lai
> $(DESTDIR)$(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
> ++ ../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_LIB_DIR); \
> ++ ../$(INSTALL) -T so_base $(LIBNAME).lai $(DESTDIR)$(PKG_LIB_DIR); \
> + if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
> +- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a
> $(PKG_LIB_DIR)/$(LIBNAME).a; \
> +- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la
> $(PKG_LIB_DIR)/$(LIBNAME).la; \
> +- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so
> $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
> ++ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a
> $(DESTDIR)$(PKG_LIB_DIR)/$(LIBNAME).a; \
> ++ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la
> $(DESTDIR)$(PKG_LIB_DIR)/$(LIBNAME).la; \
> ++ ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so
> $(DESTDIR)$(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
> + fi
> + else
> + INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
> +@@ -98,8 +98,8 @@
> +
> + INSTALL_LTLIB_STATIC = \
> + cd $(TOPDIR)/$(LIBNAME)/.libs; \
> +- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
> +- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR)
> ++ ../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DEVLIB_DIR); \
> ++ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai
> $(DESTDIR)$(PKG_DEVLIB_DIR)
> +
> + INSTALL_MAN = \
> + @for d in $(MAN_PAGES); do \
> +@@ -114,14 +114,14 @@
> + t=$(MAN_DEST)/$$m.$(MAN_SECTION); \
> + if $$first; then \
> + if $(HAVE_ZIPPED_MANPAGES); then \
> +- $(ZIP) -9 -c $$d > $$d.gz; _sfx=.gz; \
> ++ $(ZIP) -9 -c $$d > $(DESTDIR)$$d.gz;
> _sfx=.gz; \
> + fi; \
> + u=$$m.$(MAN_SECTION)$$_sfx; \
> +- echo $(INSTALL) -m 644 $${d}$$_sfx $${t}$$_sfx;\
> +- $(INSTALL) -m 644 $${d}$$_sfx $${t}$$_sfx; \
> ++ echo $(INSTALL) -m 644 $${d}$$_sfx
> $(DESTDIR)$${t}$$_sfx;\
> ++ $(INSTALL) -m 644 $${d}$$_sfx
> $(DESTDIR)$${t}$$_sfx; \
> + else \
> +- echo $(INSTALL) -S $$u $${t}$$_sfx; \
> +- $(INSTALL) -S $$u $${t}$$_sfx; \
> ++ echo $(INSTALL) -S $$u $(DESTDIR)$${t}$$_sfx; \
> ++ $(INSTALL) -S $$u $(DESTDIR)$${t}$$_sfx; \
> + fi; \
> + first=false; \
> + done; \
> +@@ -132,8 +132,8 @@
> + @for l in $(LINGUAS) ""; do \
> + if test -f "$$l.mo" ; then \
> + ldir=$(PKG_LOCALE_DIR)/$$l/LC_MESSAGES; \
> +- $(INSTALL) -m 755 -d $$ldir; \
> +- $(INSTALL) -m 644 $$l.mo $$ldir/$(PKG_NAME).mo; \
> ++ $(INSTALL) -m 755 -d $(DESTDIR)$$ldir; \
> ++ $(INSTALL) -m 644 $$l.mo
> $(DESTDIR)$$ldir/$(PKG_NAME).mo; \
> + fi; \
> + done
> + endif
> +Index: acl-2.2.48/setfacl/Makefile
> +===================================================================
> +--- acl-2.2.48.orig/setfacl/Makefile 2009-06-29 21:17:07.000000000 +0200
> ++++ acl-2.2.48/setfacl/Makefile 2009-12-15 21:00:35.627907040 +0100
> +@@ -31,6 +31,6 @@
> + include $(BUILDRULES)
> +
> + install: default
> +- $(INSTALL) -m 755 -d $(PKG_BIN_DIR)
> +- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)
> ++ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_BIN_DIR)
> ++ $(LTINSTALL) -m 755 $(LTCOMMAND) $(DESTDIR)$(PKG_BIN_DIR)
> + install-dev install-lib:
> +Index: acl-2.2.48/man/Makefile
> +===================================================================
> +--- acl-2.2.48.orig/man/Makefile 2009-06-22 20:37:31.000000000 +0200
> ++++ acl-2.2.48/man/Makefile 2009-12-15 21:00:35.627907040 +0100
> +@@ -21,6 +21,7 @@
> +
> + SUBDIRS = man1 man3 man5
> +
> ++ifeq ($(PKG_DISTRIBUTION), debian)
> + default : $(SUBDIRS)
> +
> + install : $(addsuffix -install,$(SUBDIRS))
> +@@ -38,4 +39,9 @@
> + %-install-lib:
> + $(MAKE) -C $* install-lib
> +
> ++else
> ++default:
> ++install install-dev install-lib:
> ++endif
> ++
> + include $(BUILDRULES)
> +Index: acl-2.2.48/Makefile
> +===================================================================
> +--- acl-2.2.48.orig/Makefile 2009-06-22 20:37:31.000000000 +0200
> ++++ acl-2.2.48/Makefile 2009-12-15 21:00:35.627907040 +0100
> +@@ -88,9 +88,11 @@
> + $(MAKE) $(AM_MAKEFLAGS) include/builddefs; \
> + fi
> +
> +-install: default $(addsuffix -install,$(SUBDIRS))
> +- $(INSTALL) -m 755 -d $(PKG_DOC_DIR)
> +- $(INSTALL) -m 644 README $(PKG_DOC_DIR)
> ++install: install-bin install-lib install-dev
> ++
> ++install-bin: default $(addsuffix -install,$(SUBDIRS))
> ++ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DOC_DIR)
> ++ $(INSTALL) -m 644 README $(DESTDIR)$(PKG_DOC_DIR)
> +
> + install-dev: default $(addsuffix -install-dev,$(SUBDIRS))
> +
> +Index: acl-2.2.48/libacl/Makefile
> +===================================================================
> +--- acl-2.2.48.orig/libacl/Makefile 2009-12-15 21:05:25.195405601 +0100
> ++++ acl-2.2.48/libacl/Makefile 2009-12-15 21:13:23.017906558 +0100
> +@@ -33,7 +33,7 @@
> + HFILES = libobj.h libacl.h byteorder.h __acl_from_xattr.h __acl_to_xattr.h \
> + perm_copy.h
> +
> +-LCFLAGS = -include perm_copy.h
> ++LCFLAGS = -include perm_copy.h -I$(prefix)/include
> +
> + POSIX_CFILES = \
> + acl_add_perm.c acl_calc_mask.c acl_clear_perms.c acl_copy_entry.c \
> diff --git a/patches/acl-2.2.49/series b/patches/acl-2.2.49/series
> new file mode 100644
> index 0000000..ec8a579
> --- /dev/null
> +++ b/patches/acl-2.2.49/series
> @@ -0,0 +1 @@
> +add-DESTDIR-to-fix-crosscompile-install.patch
> diff --git a/rules/acl.in b/rules/acl.in
> new file mode 100644
> index 0000000..a1b7ba9
> --- /dev/null
> +++ b/rules/acl.in
> @@ -0,0 +1,24 @@
> +## SECTION=disk_and_file
> +
> +menuconfig ACL
> + tristate
> + select CROSS_LIBTOOL
> + select HOST_GETTEXT if ACL_GETTEXT
> + select ATTR
> + prompt "acl "
> + help
> + This package contains the getfacl and setfacl utilities needed for
> + manipulating access control lists.
> +
> +if ACL
> +
> +config ACL_SHARED
> + bool
> + default y
> + prompt "Install shared lib"
> +
> +config ACL_GETTEXT
> + bool
> + prompt "gettext support"
> +
> +endif
> diff --git a/rules/acl.make b/rules/acl.make
> new file mode 100644
> index 0000000..6a10f59
> --- /dev/null
> +++ b/rules/acl.make
> @@ -0,0 +1,102 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2009 by Carsten Schlote <c.schl...@konzeptpark.de>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_ACL) += acl
> +
> +#
> +# Paths and names
> +#
> +ACL_VERSION := 2.2.49
> +ACL := acl-$(ACL_VERSION)
> +ACL_SUFFIX := tar.gz
> +ACL_SOURCE := $(SRCDIR)/$(ACL).src.$(ACL_SUFFIX)
> +ACL_DIR := $(BUILDDIR)/$(ACL)
> +ACL_LICENSE := unknown
> +
> +ACL_URL := \
> + http://mirrors.zerg.biz/nongnu/acl/$(ACL).src.$(ACL_SUFFIX)
> +
> +#
> ----------------------------------------------------------------------------
> +# Get
> +#
> ----------------------------------------------------------------------------
> +
> +$(ACL_SOURCE):
> + @$(call targetinfo)
> + @$(call get, ACL)
> +
> +#
> ----------------------------------------------------------------------------
> +# Prepare
> +#
> ----------------------------------------------------------------------------
> +
> +ACL_PATH := PATH=$(CROSS_PATH)
> +ACL_ENV := $(CROSS_ENV) \
> + LIBTOOL=$(PTXCONF_SYSROOT_CROSS)/bin/libtool
> +
> +#
> +# autoconf
> +#
> +ACL_AUTOCONF := $(CROSS_AUTOCONF_USR) \
> + --libexecdir=/usr/lib
> +
> +ifdef PTXCONF_ACL_SHARED
> +ACL_AUTOCONF += --enable-shared
> +else
> +ACL_AUTOCONF += --disable-shared
> +endif
> +
> +ifdef PTXCONF_ACL_GETTEXT
> +ACL_AUTOCONF += --enable-gettext
> +else
> +ACL_AUTOCONF += --disable-gettext
> +endif
> +
> +#
> ----------------------------------------------------------------------------
> +# Target-Install
> +#
> ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/acl.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, acl)
> + @$(call install_fixup, acl,PACKAGE,acl)
> + @$(call install_fixup, acl,PRIORITY,optional)
> + @$(call install_fixup, acl,VERSION,$(ACL_VERSION))
> + @$(call install_fixup, acl,SECTION,base)
> + @$(call install_fixup, acl,AUTHOR,"Carsten Schlote
> <c.schl...@konzeptpark.de>")
> + @$(call install_fixup, acl,DEPENDS,)
> + @$(call install_fixup, acl,DESCRIPTION,missing)
> +
> + @$(call install_copy, acl, 0, 0, 0755, -, /usr/bin/chacl)
> + @$(call install_copy, acl, 0, 0, 0755, -, /usr/bin/setfacl)
> + @$(call install_copy, acl, 0, 0, 0755, -, /usr/bin/getfacl)
> +
> +ifdef PTXCONF_ACL_SHARED
> + @$(call install_copy, acl, 0, 0, 0644, -, /usr/lib/libacl.so.1.1.0)
> + @$(call install_link, acl, libacl.so.1.1.0, /usr/lib/libacl.so.1)
> + @$(call install_link, acl, libacl.so.1.1.0, /usr/lib/libacl.so)
> +endif
> +
> + @$(call install_finish, acl)
> +
> + @$(call touch)
> +
> +#
> ----------------------------------------------------------------------------
> +# Clean
> +#
> ----------------------------------------------------------------------------
> +
> +acl_clean:
> + rm -rf $(STATEDIR)/acl.*
> + rm -rf $(ACL_PKGDIR)/*
> + rm -rf $(ACL_DIR)
> +
> +# vim: syntax=make
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
-- ptxdist mailing list ptxdist@pengutronix.de
