Pull request for branch 2011.02-pre-package-generation v2
One patch was missing.
Regards,
--
Lionel Landwerlin
PATCH 1/3 vtun: fix startup script installation
From: Lionel Landwerlin <[email protected]>
In case etc/init.d does not exist.
--- package/vtun/vtun-3.0.2-001-Makefile.in.patch | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
package/vtun/vtun-3.0.2-001-Makefile.in.patch +1 -1
@@ -26,7 +26,7 @@ diff -urN vtun/Makefile.in vtun-2.6/Makefile.in $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(LOCK_DIR) $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(SBIN_DIR) $(INSTALL) -m 755 $(INSTALL_OWNER) vtund $(DESTDIR)$(SBIN_DIR) -+ $(INSTALL) -m 755 $(INSTALL_OWNER) scripts/vtund.rc.debian \ ++ $(INSTALL) -m 755 -D $(INSTALL_OWNER) scripts/vtund.rc.debian \ + $(DESTDIR)$(ETC_DIR)/init.d/S90vtun # DO NOT DELETE THIS LINE -- make depend depends on it.
Signature · 1 line
1.7.2.3
PATCH 2/3 package: avoid copying .m4 files from host to staging
In reply to llandwerlin at gmail.comFrom: Lionel Landwerlin <[email protected]>
Since we are preparing a package generation mechanism, we would like to avoid packages that move/touch/modify files which are not part of their own package. That's why we try to not install host files into the staging directory (in this case .m4 files) and instead we include $(HOST_DIR)/usr/share/aclocal into autoreconf search directory.
--- package/autoconf/autoconf.mk | 2 +- package/automake/automake.mk | 1 + package/libtool/libtool.mk | 9 --------- package/pkg-config/pkg-config.mk | 7 ------- 4 files changed, 2 insertions(+), 17 deletions(-)
package/autoconf/autoconf.mk +1 -1
@@ -23,4 +23,4 @@ $(eval $(call AUTOTARGETS,package,autoconf,host)) # variables used by other packages AUTOCONF:=$(HOST_DIR)/usr/bin/autoconf AUTOHEADER:=$(HOST_DIR)/usr/bin/autoheader -AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" $(HOST_DIR)/usr/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)" +AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" $(HOST_DIR)/usr/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)"
package/automake/automake.mk +1 -0
@@ -23,4 +23,5 @@ $(eval $(call AUTOTARGETS,package,automake,host)) # variables used by other packages AUTOMAKE = $(HOST_DIR)/usr/bin/automake ACLOCAL_DIR = $(STAGING_DIR)/usr/share/aclocal +ACLOCAL_HOST_DIR = $(HOST_DIR)/usr/share/aclocal ACLOCAL = $(HOST_DIR)/usr/bin/aclocal -I $(ACLOCAL_DIR)
package/libtool/libtool.mk +0 -9
@@ -7,15 +7,6 @@ LIBTOOL_VERSION = 2.2.10 LIBTOOL_SOURCE = libtool-$(LIBTOOL_VERSION).tar.gz LIBTOOL_SITE = $(BR2_GNU_MIRROR)/libtool -define HOST_LIBTOOL_CUSTOM_INSTALL - install -D -m 0644 $(HOST_DIR)/usr/share/aclocal/libtool.m4 \ - $(STAGING_DIR)/usr/share/aclocal/libtool.m4 - install -D -m 0644 $(HOST_DIR)/usr/share/aclocal/ltdl.m4 \ - $(STAGING_DIR)/usr/share/aclocal/ltdl.m4 -endef - -HOST_LIBTOOL_POST_INSTALL_HOOKS += HOST_LIBTOOL_CUSTOM_INSTALL - HOST_LIBTOOL_LIBTOOL_PATCH = NO $(eval $(call AUTOTARGETS,package,libtool))
package/pkg-config/pkg-config.mk +0 -7
@@ -15,13 +15,6 @@ HOST_PKG_CONFIG_CONF_OPT = \ --with-pc-path="$(STAGING_DIR)/usr/lib/pkgconfig" \ --disable-static -define HOST_PKG_CONFIG_INSTALL_M4 -install -D -m 0644 $(HOST_DIR)/usr/share/aclocal/pkg.m4 \ - $(STAGING_DIR)/usr/share/aclocal/pkg.m4 -endef - -HOST_PKG_CONFIG_POST_INSTALL_HOOKS += HOST_PKG_CONFIG_INSTALL_M4 - $(eval $(call AUTOTARGETS,package,pkg-config)) $(eval $(call AUTOTARGETS,package,pkg-config,host))
Signature · 1 line
1.7.2.3
PATCH 3/3 automake: install gtk-doc.m4 in host directory instead of staging
In reply to llandwerlin at gmail.comFrom: Lionel Landwerlin <[email protected]>
--- package/automake/automake.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
package/automake/automake.mk +1 -1
@@ -12,7 +12,7 @@ AUTOMAKE_DEPENDENCIES = host-autoconf autoconf microperl HOST_AUTOMAKE_DEPENDENCIES = host-autoconf define GTK_DOC_M4_INSTALL - $(INSTALL) -m 0644 package/automake/gtk-doc.m4 $(STAGING_DIR)/usr/share/aclocal/ + $(INSTALL) -D -m 0644 package/automake/gtk-doc.m4 $(HOST_DIR)/usr/share/aclocal/gtk-doc.m4 endef HOST_AUTOMAKE_POST_INSTALL_HOOKS += GTK_DOC_M4_INSTALL
Signature · 1 line
1.7.2.3
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"llandwerlin" == llandwerlin <[email protected]> writes:
llandwerlin> One patch was missing.
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard