* [Buildroot] [git commit] List the useful hook points available in buildroot
From: Peter Korsgaard @ 2012-11-30 20:21 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=0435a0913cc43f4dff12a081c5b1416d4a7f7730
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
The complete list can be obtained with the following command:
grep "_HOOKS[ ]\+?=" package/pkg-generic.mk
Signed-off-by: Davide Viti <zinosat@tiscali.it>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
docs/manual/adding-packages-generic.txt | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index 3f21f86..6c1c35e 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -358,6 +358,9 @@ useful for generic packages.
The following hook points are available:
+* +LIBFOO_POST_DOWNLOAD_HOOKS+
+* +LIBFOO_POST_EXTRACT_HOOKS+
+* +LIBFOO_PRE_PATCH_HOOKS+
* +LIBFOO_POST_PATCH_HOOKS+
* +LIBFOO_PRE_CONFIGURE_HOOKS+
* +LIBFOO_POST_CONFIGURE_HOOKS+
^ permalink raw reply related
* [Buildroot] [PATCHv3 for-next 1/6] perl: remove redundant patches
From: Peter Korsgaard @ 2012-11-30 20:18 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1354118962-18601-1-git-send-email-arnout@mind.be>
>>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> writes:
Arnout> From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Arnout> Now we are using perlcross, the patches to make perl work with qemu are
Arnout> redundant, so remove them.
Committed series to next, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] cpanminus: fix installation paths
From: Peter Korsgaard @ 2012-11-30 20:17 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=c4fbc4202ea47829396bc446e84fd85153513974
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
perlcross seems to set the installation paths differently than perl's
Configure, so adapt the reference to these paths in cpanminus.
[Francois: install into /usr/lib/perl]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/cpanminus/cpanminus.mk | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package/cpanminus/cpanminus.mk b/package/cpanminus/cpanminus.mk
index af35e93..e7e3f29 100644
--- a/package/cpanminus/cpanminus.mk
+++ b/package/cpanminus/cpanminus.mk
@@ -11,8 +11,8 @@ CPANMINUS_DEPENDENCIES = host-qemu perl $(call qstrip,$(BR2_PACKAGE_CPANMINUS_NA
CPANMINUS_RUN_PERL = $(QEMU_USER) $(STAGING_DIR)/usr/bin/perl
CPANMINUS_ARCHNAME = $(shell $(CPANMINUS_RUN_PERL) -MConfig -e "print Config->{archname}")
-CPANMINUS_PERL_LIB = $(STAGING_DIR)/usr/lib/perl5/$(PERL_VERSION)
-CPANMINUS_PERL_SITELIB = $(TARGET_DIR)/usr/lib/perl5/site_perl/$(PERL_VERSION)
+CPANMINUS_PERL_LIB = $(STAGING_DIR)/usr/lib/perl
+CPANMINUS_PERL_SITELIB = $(TARGET_DIR)/usr/lib/perl
CPANMINUS_PERL_ARCHLIB = $(CPANMINUS_PERL_LIB)/$(CPANMINUS_ARCHNAME)
CPANMINUS_PERL_SITEARCH = $(CPANMINUS_PERL_SITELIB)/$(CPANMINUS_ARCHNAME)
CPANMINUS_PERL5LIB = $(CPANMINUS_PERL_SITEARCH):$(CPANMINUS_PERL_SITELIB):$(CPANMINUS_PERL_ARCHLIB):$(CPANMINUS_PERL_LIB)
@@ -27,8 +27,8 @@ define CPANMINUS_INSTALL_TARGET_CMDS
echo "PERL5LIB=$(CPANMINUS_PERL5LIB) $(CPANMINUS_RUN_PERL) \"\$$@\"" >>$(@D)/run_perl
chmod +x $(@D)/run_perl
PERL5LIB=$(CPANMINUS_PERL5LIB) \
- PERL_MM_OPT="DESTDIR=$(TARGET_DIR) PERL=$(@D)/run_perl PERL_LIB=$(CPANMINUS_PERL_LIB) PERL_ARCHLIB=$(CPANMINUS_PERL_ARCHLIB)" \
- PERL_MB_OPT="--destdir $(TARGET_DIR)" \
+ PERL_MM_OPT="DESTDIR=$(CPANMINUS_PERL_SITELIB) PERL=$(@D)/run_perl PERL_LIB=$(CPANMINUS_PERL_LIB) PERL_ARCHLIB=$(CPANMINUS_PERL_ARCHLIB)" \
+ PERL_MB_OPT="--destdir $(CPANMINUS_PERL_SITELIB)" \
RUN_PERL="$(@D)/run_perl" \
$(CPANMINUS_RUN_PERL) $(@D)/cpanm \
--perl=$(@D)/run_perl \
@@ -36,7 +36,7 @@ define CPANMINUS_INSTALL_TARGET_CMDS
--no-man-pages \
$(CPANMINUS_MIRROR) \
$(call qstrip,$(BR2_PACKAGE_CPANMINUS_MODULES))
- find $(CPANMINUS_PERL_SITEARCH) -type f -name *.bs -exec rm -f {} \;
+ -find $(CPANMINUS_PERL_SITEARCH) -type f -name *.bs -exec rm -f {} \;
endef
else
define CPANMINUS_INSTALL_TARGET_CMDS
^ permalink raw reply related
* [Buildroot] [git commit branch/next] cpanminus: fix installation paths
From: Peter Korsgaard @ 2012-11-30 20:17 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=c4fbc4202ea47829396bc446e84fd85153513974
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/next
perlcross seems to set the installation paths differently than perl's
Configure, so adapt the reference to these paths in cpanminus.
[Francois: install into /usr/lib/perl]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/cpanminus/cpanminus.mk | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package/cpanminus/cpanminus.mk b/package/cpanminus/cpanminus.mk
index af35e93..e7e3f29 100644
--- a/package/cpanminus/cpanminus.mk
+++ b/package/cpanminus/cpanminus.mk
@@ -11,8 +11,8 @@ CPANMINUS_DEPENDENCIES = host-qemu perl $(call qstrip,$(BR2_PACKAGE_CPANMINUS_NA
CPANMINUS_RUN_PERL = $(QEMU_USER) $(STAGING_DIR)/usr/bin/perl
CPANMINUS_ARCHNAME = $(shell $(CPANMINUS_RUN_PERL) -MConfig -e "print Config->{archname}")
-CPANMINUS_PERL_LIB = $(STAGING_DIR)/usr/lib/perl5/$(PERL_VERSION)
-CPANMINUS_PERL_SITELIB = $(TARGET_DIR)/usr/lib/perl5/site_perl/$(PERL_VERSION)
+CPANMINUS_PERL_LIB = $(STAGING_DIR)/usr/lib/perl
+CPANMINUS_PERL_SITELIB = $(TARGET_DIR)/usr/lib/perl
CPANMINUS_PERL_ARCHLIB = $(CPANMINUS_PERL_LIB)/$(CPANMINUS_ARCHNAME)
CPANMINUS_PERL_SITEARCH = $(CPANMINUS_PERL_SITELIB)/$(CPANMINUS_ARCHNAME)
CPANMINUS_PERL5LIB = $(CPANMINUS_PERL_SITEARCH):$(CPANMINUS_PERL_SITELIB):$(CPANMINUS_PERL_ARCHLIB):$(CPANMINUS_PERL_LIB)
@@ -27,8 +27,8 @@ define CPANMINUS_INSTALL_TARGET_CMDS
echo "PERL5LIB=$(CPANMINUS_PERL5LIB) $(CPANMINUS_RUN_PERL) \"\$$@\"" >>$(@D)/run_perl
chmod +x $(@D)/run_perl
PERL5LIB=$(CPANMINUS_PERL5LIB) \
- PERL_MM_OPT="DESTDIR=$(TARGET_DIR) PERL=$(@D)/run_perl PERL_LIB=$(CPANMINUS_PERL_LIB) PERL_ARCHLIB=$(CPANMINUS_PERL_ARCHLIB)" \
- PERL_MB_OPT="--destdir $(TARGET_DIR)" \
+ PERL_MM_OPT="DESTDIR=$(CPANMINUS_PERL_SITELIB) PERL=$(@D)/run_perl PERL_LIB=$(CPANMINUS_PERL_LIB) PERL_ARCHLIB=$(CPANMINUS_PERL_ARCHLIB)" \
+ PERL_MB_OPT="--destdir $(CPANMINUS_PERL_SITELIB)" \
RUN_PERL="$(@D)/run_perl" \
$(CPANMINUS_RUN_PERL) $(@D)/cpanm \
--perl=$(@D)/run_perl \
@@ -36,7 +36,7 @@ define CPANMINUS_INSTALL_TARGET_CMDS
--no-man-pages \
$(CPANMINUS_MIRROR) \
$(call qstrip,$(BR2_PACKAGE_CPANMINUS_MODULES))
- find $(CPANMINUS_PERL_SITEARCH) -type f -name *.bs -exec rm -f {} \;
+ -find $(CPANMINUS_PERL_SITEARCH) -type f -name *.bs -exec rm -f {} \;
endef
else
define CPANMINUS_INSTALL_TARGET_CMDS
^ permalink raw reply related
* [Buildroot] [git commit] cpanminus: requires host-qemu
From: Peter Korsgaard @ 2012-11-30 20:17 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=3ffc4815b79de99228de9b605cec91e2ff5d467c
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
It's still broken, but is someone wants to try it out then at least
the dependency is there.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/cpanminus/cpanminus.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/cpanminus/cpanminus.mk b/package/cpanminus/cpanminus.mk
index d3a338b..af35e93 100644
--- a/package/cpanminus/cpanminus.mk
+++ b/package/cpanminus/cpanminus.mk
@@ -7,7 +7,7 @@
CPANMINUS_VERSION = 1.5018
CPANMINUS_SOURCE = miyagawa-cpanminus-$(CPANMINUS_VERSION)-0-gee6cd30.tar.gz
CPANMINUS_SITE = https://github.com/miyagawa/cpanminus/tarball/$(CPANMINUS_VERSION)
-CPANMINUS_DEPENDENCIES = perl $(call qstrip,$(BR2_PACKAGE_CPANMINUS_NATIVE_DEPENDENCIES))
+CPANMINUS_DEPENDENCIES = host-qemu perl $(call qstrip,$(BR2_PACKAGE_CPANMINUS_NATIVE_DEPENDENCIES))
CPANMINUS_RUN_PERL = $(QEMU_USER) $(STAGING_DIR)/usr/bin/perl
CPANMINUS_ARCHNAME = $(shell $(CPANMINUS_RUN_PERL) -MConfig -e "print Config->{archname}")
^ permalink raw reply related
* [Buildroot] [git commit branch/next] cpanminus: requires host-qemu
From: Peter Korsgaard @ 2012-11-30 20:17 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=3ffc4815b79de99228de9b605cec91e2ff5d467c
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/next
It's still broken, but is someone wants to try it out then at least
the dependency is there.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/cpanminus/cpanminus.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/cpanminus/cpanminus.mk b/package/cpanminus/cpanminus.mk
index d3a338b..af35e93 100644
--- a/package/cpanminus/cpanminus.mk
+++ b/package/cpanminus/cpanminus.mk
@@ -7,7 +7,7 @@
CPANMINUS_VERSION = 1.5018
CPANMINUS_SOURCE = miyagawa-cpanminus-$(CPANMINUS_VERSION)-0-gee6cd30.tar.gz
CPANMINUS_SITE = https://github.com/miyagawa/cpanminus/tarball/$(CPANMINUS_VERSION)
-CPANMINUS_DEPENDENCIES = perl $(call qstrip,$(BR2_PACKAGE_CPANMINUS_NATIVE_DEPENDENCIES))
+CPANMINUS_DEPENDENCIES = host-qemu perl $(call qstrip,$(BR2_PACKAGE_CPANMINUS_NATIVE_DEPENDENCIES))
CPANMINUS_RUN_PERL = $(QEMU_USER) $(STAGING_DIR)/usr/bin/perl
CPANMINUS_ARCHNAME = $(shell $(CPANMINUS_RUN_PERL) -MConfig -e "print Config->{archname}")
^ permalink raw reply related
* [Buildroot] [git commit] perl: fix configure step
From: Peter Korsgaard @ 2012-11-30 20:17 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=9ba19df16ab9da681c2e5be2f2c7693c24ed0d8d
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Configure -A symbol=val generates a extra space in config.sh,
which causes failure like this :
Building Module-Runtime-0.013
Unknown OS type ' linux' - using default settings
[Arnout: use -A define:foo instead of patching config.sh]
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/perl/perl.mk | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index 0893eb5..391047d 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -55,14 +55,14 @@ PERL_CONF_OPT = \
--target-tools-prefix=$(TARGET_CROSS) \
--prefix=/usr \
-Dld="$(TARGET_CC_NOCCACHE)" \
- -A ccflags="$(TARGET_CFLAGS)" \
- -A ldflags="$(TARGET_LDFLAGS) -lm" \
- -A mydomain="" \
- -A myhostname="$(BR2_TARGET_GENERIC_HOSTNAME)" \
- -A myuname="Buildroot $(BR2_VERSION_FULL)" \
- -A osname=linux \
- -A osvers=$(LINUX_VERSION) \
- -A perladmin=root
+ -Dccflags="$(TARGET_CFLAGS)" \
+ -Dldflags="$(TARGET_LDFLAGS) -lm" \
+ -A define:mydomain="" \
+ -A define:myhostname="$(BR2_TARGET_GENERIC_HOSTNAME)" \
+ -A define:myuname="Buildroot $(BR2_VERSION_FULL)" \
+ -A define:osname=linux \
+ -A define:osvers=$(LINUX_VERSION) \
+ -A define:perladmin=root
ifeq ($(shell expr $(PERL_VERSION_MAJOR) % 2), 1)
PERL_CONF_OPT += -Dusedevel
^ permalink raw reply related
* [Buildroot] [git commit branch/next] perl: fix configure step
From: Peter Korsgaard @ 2012-11-30 20:17 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=9ba19df16ab9da681c2e5be2f2c7693c24ed0d8d
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/next
Configure -A symbol=val generates a extra space in config.sh,
which causes failure like this :
Building Module-Runtime-0.013
Unknown OS type ' linux' - using default settings
[Arnout: use -A define:foo instead of patching config.sh]
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/perl/perl.mk | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index 0893eb5..391047d 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -55,14 +55,14 @@ PERL_CONF_OPT = \
--target-tools-prefix=$(TARGET_CROSS) \
--prefix=/usr \
-Dld="$(TARGET_CC_NOCCACHE)" \
- -A ccflags="$(TARGET_CFLAGS)" \
- -A ldflags="$(TARGET_LDFLAGS) -lm" \
- -A mydomain="" \
- -A myhostname="$(BR2_TARGET_GENERIC_HOSTNAME)" \
- -A myuname="Buildroot $(BR2_VERSION_FULL)" \
- -A osname=linux \
- -A osvers=$(LINUX_VERSION) \
- -A perladmin=root
+ -Dccflags="$(TARGET_CFLAGS)" \
+ -Dldflags="$(TARGET_LDFLAGS) -lm" \
+ -A define:mydomain="" \
+ -A define:myhostname="$(BR2_TARGET_GENERIC_HOSTNAME)" \
+ -A define:myuname="Buildroot $(BR2_VERSION_FULL)" \
+ -A define:osname=linux \
+ -A define:osvers=$(LINUX_VERSION) \
+ -A define:perladmin=root
ifeq ($(shell expr $(PERL_VERSION_MAJOR) % 2), 1)
PERL_CONF_OPT += -Dusedevel
^ permalink raw reply related
* [Buildroot] [git commit] perl: remove the double configure hack
From: Peter Korsgaard @ 2012-11-30 20:17 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=92cad6008d6b6a18f09d77f6e4c08572967eb9f7
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
configure had to be called twice because with --mode=cross the
miniperl-step failed. However, just leaving out the --mode parameter
is sufficient to make it work. Since GNU_TARGET_NAME is always
different from the host's tuple (it has -buildroot- in it), we can
safely assume that the configure script will automatically enter
cross mode.
Also fix a type in perladmin definition.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/perl/perl.mk | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index b84917b..0893eb5 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -47,19 +47,10 @@ ifeq ($(BR2_PACKAGE_GDBM),y)
PERL_DEPENDENCIES += gdbm
endif
-# Normally, --mode=cross should automatically do the two steps
-# below, but it doesn't work for some reason.
-PERL_HOST_CONF_OPT = \
- --mode=buildmini \
- --target=$(GNU_TARGET_NAME) \
- --target-arch=$(GNU_TARGET_NAME) \
- --set-target-name=$(GNU_TARGET_NAME)
-
# We have to override LD, because an external multilib toolchain ld is not
# wrapped to provide the required sysroot options. We also can't use ccache
# because the configure script doesn't support it.
PERL_CONF_OPT = \
- --mode=target \
--target=$(GNU_TARGET_NAME) \
--target-tools-prefix=$(TARGET_CROSS) \
--prefix=/usr \
@@ -71,7 +62,7 @@ PERL_CONF_OPT = \
-A myuname="Buildroot $(BR2_VERSION_FULL)" \
-A osname=linux \
-A osvers=$(LINUX_VERSION) \
- -A perlamdin=root
+ -A perladmin=root
ifeq ($(shell expr $(PERL_VERSION_MAJOR) % 2), 1)
PERL_CONF_OPT += -Dusedevel
@@ -87,8 +78,7 @@ PERL_CONF_OPT += --only-mod=$(subst $(space),$(comma),$(PERL_MODULES))
endif
define PERL_CONFIGURE_CMDS
- (cd $(@D); HOSTCC='$(HOSTCC_NOCACHE)' ./configure $(PERL_HOST_CONF_OPT))
- (cd $(@D); ./configure $(PERL_CONF_OPT))
+ (cd $(@D); HOSTCC='$(HOSTCC_NOCACHE)' ./configure $(PERL_CONF_OPT))
$(SED) 's/UNKNOWN-/Buildroot $(BR2_VERSION_FULL) /' $(@D)/patchlevel.h
endef
^ permalink raw reply related
* [Buildroot] [git commit branch/next] perl: remove the double configure hack
From: Peter Korsgaard @ 2012-11-30 20:17 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=92cad6008d6b6a18f09d77f6e4c08572967eb9f7
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/next
configure had to be called twice because with --mode=cross the
miniperl-step failed. However, just leaving out the --mode parameter
is sufficient to make it work. Since GNU_TARGET_NAME is always
different from the host's tuple (it has -buildroot- in it), we can
safely assume that the configure script will automatically enter
cross mode.
Also fix a type in perladmin definition.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/perl/perl.mk | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index b84917b..0893eb5 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -47,19 +47,10 @@ ifeq ($(BR2_PACKAGE_GDBM),y)
PERL_DEPENDENCIES += gdbm
endif
-# Normally, --mode=cross should automatically do the two steps
-# below, but it doesn't work for some reason.
-PERL_HOST_CONF_OPT = \
- --mode=buildmini \
- --target=$(GNU_TARGET_NAME) \
- --target-arch=$(GNU_TARGET_NAME) \
- --set-target-name=$(GNU_TARGET_NAME)
-
# We have to override LD, because an external multilib toolchain ld is not
# wrapped to provide the required sysroot options. We also can't use ccache
# because the configure script doesn't support it.
PERL_CONF_OPT = \
- --mode=target \
--target=$(GNU_TARGET_NAME) \
--target-tools-prefix=$(TARGET_CROSS) \
--prefix=/usr \
@@ -71,7 +62,7 @@ PERL_CONF_OPT = \
-A myuname="Buildroot $(BR2_VERSION_FULL)" \
-A osname=linux \
-A osvers=$(LINUX_VERSION) \
- -A perlamdin=root
+ -A perladmin=root
ifeq ($(shell expr $(PERL_VERSION_MAJOR) % 2), 1)
PERL_CONF_OPT += -Dusedevel
@@ -87,8 +78,7 @@ PERL_CONF_OPT += --only-mod=$(subst $(space),$(comma),$(PERL_MODULES))
endif
define PERL_CONFIGURE_CMDS
- (cd $(@D); HOSTCC='$(HOSTCC_NOCACHE)' ./configure $(PERL_HOST_CONF_OPT))
- (cd $(@D); ./configure $(PERL_CONF_OPT))
+ (cd $(@D); HOSTCC='$(HOSTCC_NOCACHE)' ./configure $(PERL_CONF_OPT))
$(SED) 's/UNKNOWN-/Buildroot $(BR2_VERSION_FULL) /' $(@D)/patchlevel.h
endef
^ permalink raw reply related
* [Buildroot] [git commit] perl: substitute perlcross pod with perl-version-specific pod
From: Peter Korsgaard @ 2012-11-30 20:16 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=1a002b5a9d2317a046d97c242ba48f79f3fabbd3
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
As suggested by Dan Pattison at ethertek ca.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/perl/perl.mk | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index f3c73dd..b84917b 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -13,8 +13,11 @@ PERL_LICENSE_FILES = Artistic
PERL_INSTALL_STAGING = YES
PERL_CROSS_VERSION = 0.7
+PERL_CROSS_BASE_VERSION = 5.$(PERL_VERSION_MAJOR).0
PERL_CROSS_SITE = http://download.berlios.de/perlcross
-PERL_CROSS_SOURCE = perl-5.$(PERL_VERSION_MAJOR).0-cross-$(PERL_CROSS_VERSION).tar.gz
+PERL_CROSS_SOURCE = perl-$(PERL_CROSS_BASE_VERSION)-cross-$(PERL_CROSS_VERSION).tar.gz
+PERL_CROSS_OLD_POD = perl$(subst .,,$(PERL_CROSS_BASE_VERSION))delta.pod
+PERL_CROSS_NEW_POD = perl$(subst .,,$(PERL_VERSION))delta.pod
# We use the perlcross hack to cross-compile perl. It should
# be extracted over the perl sources, so we don't define that
@@ -32,6 +35,11 @@ define PERL_CROSS_EXTRACT
endef
PERL_POST_EXTRACT_HOOKS += PERL_CROSS_EXTRACT
+define PERL_CROSS_SET_POD
+ $(SED) s/$(PERL_CROSS_OLD_POD)/$(PERL_CROSS_NEW_POD)/g $(@D)/Makefile
+endef
+PERL_POST_PATCH_HOOKS += PERL_CROSS_SET_POD
+
ifeq ($(BR2_PACKAGE_BERKELEYDB),y)
PERL_DEPENDENCIES += berkeleydb
endif
^ permalink raw reply related
* [Buildroot] [git commit branch/next] perl: substitute perlcross pod with perl-version-specific pod
From: Peter Korsgaard @ 2012-11-30 20:16 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=1a002b5a9d2317a046d97c242ba48f79f3fabbd3
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/next
As suggested by Dan Pattison at ethertek ca.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/perl/perl.mk | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index f3c73dd..b84917b 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -13,8 +13,11 @@ PERL_LICENSE_FILES = Artistic
PERL_INSTALL_STAGING = YES
PERL_CROSS_VERSION = 0.7
+PERL_CROSS_BASE_VERSION = 5.$(PERL_VERSION_MAJOR).0
PERL_CROSS_SITE = http://download.berlios.de/perlcross
-PERL_CROSS_SOURCE = perl-5.$(PERL_VERSION_MAJOR).0-cross-$(PERL_CROSS_VERSION).tar.gz
+PERL_CROSS_SOURCE = perl-$(PERL_CROSS_BASE_VERSION)-cross-$(PERL_CROSS_VERSION).tar.gz
+PERL_CROSS_OLD_POD = perl$(subst .,,$(PERL_CROSS_BASE_VERSION))delta.pod
+PERL_CROSS_NEW_POD = perl$(subst .,,$(PERL_VERSION))delta.pod
# We use the perlcross hack to cross-compile perl. It should
# be extracted over the perl sources, so we don't define that
@@ -32,6 +35,11 @@ define PERL_CROSS_EXTRACT
endef
PERL_POST_EXTRACT_HOOKS += PERL_CROSS_EXTRACT
+define PERL_CROSS_SET_POD
+ $(SED) s/$(PERL_CROSS_OLD_POD)/$(PERL_CROSS_NEW_POD)/g $(@D)/Makefile
+endef
+PERL_POST_PATCH_HOOKS += PERL_CROSS_SET_POD
+
ifeq ($(BR2_PACKAGE_BERKELEYDB),y)
PERL_DEPENDENCIES += berkeleydb
endif
^ permalink raw reply related
* [Buildroot] [git commit] perl: remove redundant patches
From: Peter Korsgaard @ 2012-11-30 20:16 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=74b9fa00efa16ec74f1d3df6137b9961fd60d3fc
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Now we are using perlcross, the patches to make perl work with qemu are
redundant, so remove them.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/perl/perl-configure-qemu.patch | 53 --------------------------------
package/perl/perl-make-ext.patch | 24 --------------
package/perl/perl-mkppport.patch | 37 ----------------------
3 files changed, 0 insertions(+), 114 deletions(-)
diff --git a/package/perl/perl-configure-qemu.patch b/package/perl/perl-configure-qemu.patch
deleted file mode 100644
index c2d6b92..0000000
--- a/package/perl/perl-configure-qemu.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Add qemu support
-
-see https://rt.perl.org/rt3//Public/Bug/Display.html?id=114798
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-
-Index: b/Configure
-===================================================================
---- a/Configure
-+++ b/Configure
-@@ -2837,6 +2837,9 @@
- ;;
- *) echo "Using usrinc $usrinc." >&4 ;;
- esac
-+ case "$targetrun" in
-+ *qemu*) targethost=dummy ;;
-+ esac
- case "$targethost" in
- '') echo "Targethost not defined." >&4; croak=y ;;
- *) echo "Using targethost $targethost." >&4
-@@ -2868,7 +2871,7 @@
- case "$targetfrom" in
- '') targetfrom=scp ;;
- esac
-- run=$run-$targetrun
-+ run=$run-`basename $targetrun`
- to=$to-$targetto
- from=$from-$targetfrom
- case "$targetdir" in
-@@ -2908,6 +2911,14 @@
- $targetrun -l $targetuser $targethost "cd \$cwd && ./\$exe \$@"
- EOF
- ;;
-+ *qemu*)
-+ to=:
-+ from=:
-+ cat >$run <<EOF
-+#!/bin/sh
-+$targetrun -L $qemulib "\$@"
-+EOF
-+ ;;
- *) echo "Unknown targetrun '$targetrun'" >&4
- exit 1
- ;;
-@@ -5048,7 +5059,7 @@
- echo " ";
- echo "Checking if your compiler accepts $flag" 2>&1;
- echo "int main(void) { return 0; }" > gcctest.c;
--if $cc -O2 $flag -o gcctest gcctest.c 2>gcctest.out && ./gcctest; then
-+if $cc -O2 $flag -o gcctest gcctest.c 2>gcctest.out && $run ./gcctest; then
- echo "Yes, it does." 2>&1;
- if $test -s gcctest.out ; then
- echo "But your platform does not like it:";
diff --git a/package/perl/perl-make-ext.patch b/package/perl/perl-make-ext.patch
deleted file mode 100644
index e0195e7..0000000
--- a/package/perl/perl-make-ext.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Don't use RUN with make (only for perl)
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-
-Index: b/make_ext.pl
-===================================================================
---- a/make_ext.pl
-+++ b/make_ext.pl
-@@ -458,11 +458,13 @@
- # Give makefile an opportunity to rewrite itself.
- # reassure users that life goes on...
- my @args = ('config', @$pass_through);
-- system(@run, @make, @args) and print "@run @make @args failed, continuing anyway...\n";
-+# system(@run, @make, @args) and print "@run @make @args failed, continuing anyway...\n";
-+ system(@make, @args) and print "@make @args failed, continuing anyway...\n";
- }
- my @targ = ($target, @$pass_through);
- print "Making $target in $ext_dir\n at run @make @targ\n";
-- my $code = system(@run, @make, @targ);
-+# my $code = system(@run, @make, @targ);
-+ my $code = system(@make, @targ);
- die "Unsuccessful make($ext_dir): code=$code" if $code != 0;
-
- chdir $return_dir || die "Cannot cd to $return_dir: $!";
diff --git a/package/perl/perl-mkppport.patch b/package/perl/perl-mkppport.patch
deleted file mode 100644
index 97f27a2..0000000
--- a/package/perl/perl-mkppport.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Add RUN
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-
-Index: b/mkppport
-===================================================================
---- a/mkppport
-+++ b/mkppport
-@@ -1,6 +1,7 @@
- use strict;
- use warnings;
-
-+use Config;
- use Getopt::Long;
- use File::Spec;
- use File::Compare qw( compare );
-@@ -136,14 +137,18 @@
- #----------------------------------------------
- sub run
- {
-+ my @run = $Config{run};
-+ @run = () if not defined $run[0] or $run[0] eq '';
- my @args = ("-I" . File::Spec->catdir((File::Spec->updir) x 2, 'lib'), @_);
- my $run = $perl =~ m/\s/ ? qq("$perl") : $perl;
- for (@args) {
- $_ = qq("$_") if $^O eq 'VMS' && /^[^"]/;
- $run .= " $_";
- }
-- print "running $run\n";
-- system $run and die "$run failed: $?\n";
-+# print "running $run\n";
-+# system $run and die "$run failed: $?\n";
-+ print "running ", join(' ', @run, $run), "\n";
-+ system join(' ', @run, $run) and die "@run $run failed: $?\n";
- }
-
- __END__
^ permalink raw reply related
* [Buildroot] [git commit branch/next] perl: remove redundant patches
From: Peter Korsgaard @ 2012-11-30 20:16 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=74b9fa00efa16ec74f1d3df6137b9961fd60d3fc
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/next
Now we are using perlcross, the patches to make perl work with qemu are
redundant, so remove them.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/perl/perl-configure-qemu.patch | 53 --------------------------------
package/perl/perl-make-ext.patch | 24 --------------
package/perl/perl-mkppport.patch | 37 ----------------------
3 files changed, 0 insertions(+), 114 deletions(-)
diff --git a/package/perl/perl-configure-qemu.patch b/package/perl/perl-configure-qemu.patch
deleted file mode 100644
index c2d6b92..0000000
--- a/package/perl/perl-configure-qemu.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Add qemu support
-
-see https://rt.perl.org/rt3//Public/Bug/Display.html?id=114798
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-
-Index: b/Configure
-===================================================================
---- a/Configure
-+++ b/Configure
-@@ -2837,6 +2837,9 @@
- ;;
- *) echo "Using usrinc $usrinc." >&4 ;;
- esac
-+ case "$targetrun" in
-+ *qemu*) targethost=dummy ;;
-+ esac
- case "$targethost" in
- '') echo "Targethost not defined." >&4; croak=y ;;
- *) echo "Using targethost $targethost." >&4
-@@ -2868,7 +2871,7 @@
- case "$targetfrom" in
- '') targetfrom=scp ;;
- esac
-- run=$run-$targetrun
-+ run=$run-`basename $targetrun`
- to=$to-$targetto
- from=$from-$targetfrom
- case "$targetdir" in
-@@ -2908,6 +2911,14 @@
- $targetrun -l $targetuser $targethost "cd \$cwd && ./\$exe \$@"
- EOF
- ;;
-+ *qemu*)
-+ to=:
-+ from=:
-+ cat >$run <<EOF
-+#!/bin/sh
-+$targetrun -L $qemulib "\$@"
-+EOF
-+ ;;
- *) echo "Unknown targetrun '$targetrun'" >&4
- exit 1
- ;;
-@@ -5048,7 +5059,7 @@
- echo " ";
- echo "Checking if your compiler accepts $flag" 2>&1;
- echo "int main(void) { return 0; }" > gcctest.c;
--if $cc -O2 $flag -o gcctest gcctest.c 2>gcctest.out && ./gcctest; then
-+if $cc -O2 $flag -o gcctest gcctest.c 2>gcctest.out && $run ./gcctest; then
- echo "Yes, it does." 2>&1;
- if $test -s gcctest.out ; then
- echo "But your platform does not like it:";
diff --git a/package/perl/perl-make-ext.patch b/package/perl/perl-make-ext.patch
deleted file mode 100644
index e0195e7..0000000
--- a/package/perl/perl-make-ext.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Don't use RUN with make (only for perl)
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-
-Index: b/make_ext.pl
-===================================================================
---- a/make_ext.pl
-+++ b/make_ext.pl
-@@ -458,11 +458,13 @@
- # Give makefile an opportunity to rewrite itself.
- # reassure users that life goes on...
- my @args = ('config', @$pass_through);
-- system(@run, @make, @args) and print "@run @make @args failed, continuing anyway...\n";
-+# system(@run, @make, @args) and print "@run @make @args failed, continuing anyway...\n";
-+ system(@make, @args) and print "@make @args failed, continuing anyway...\n";
- }
- my @targ = ($target, @$pass_through);
- print "Making $target in $ext_dir\n at run @make @targ\n";
-- my $code = system(@run, @make, @targ);
-+# my $code = system(@run, @make, @targ);
-+ my $code = system(@make, @targ);
- die "Unsuccessful make($ext_dir): code=$code" if $code != 0;
-
- chdir $return_dir || die "Cannot cd to $return_dir: $!";
diff --git a/package/perl/perl-mkppport.patch b/package/perl/perl-mkppport.patch
deleted file mode 100644
index 97f27a2..0000000
--- a/package/perl/perl-mkppport.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Add RUN
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-
-Index: b/mkppport
-===================================================================
---- a/mkppport
-+++ b/mkppport
-@@ -1,6 +1,7 @@
- use strict;
- use warnings;
-
-+use Config;
- use Getopt::Long;
- use File::Spec;
- use File::Compare qw( compare );
-@@ -136,14 +137,18 @@
- #----------------------------------------------
- sub run
- {
-+ my @run = $Config{run};
-+ @run = () if not defined $run[0] or $run[0] eq '';
- my @args = ("-I" . File::Spec->catdir((File::Spec->updir) x 2, 'lib'), @_);
- my $run = $perl =~ m/\s/ ? qq("$perl") : $perl;
- for (@args) {
- $_ = qq("$_") if $^O eq 'VMS' && /^[^"]/;
- $run .= " $_";
- }
-- print "running $run\n";
-- system $run and die "$run failed: $?\n";
-+# print "running $run\n";
-+# system $run and die "$run failed: $?\n";
-+ print "running ", join(' ', @run, $run), "\n";
-+ system join(' ', @run, $run) and die "@run $run failed: $?\n";
- }
-
- __END__
^ permalink raw reply related
* [Buildroot] [PATCH 17/33] matchbox packages: fix broken urls
From: Peter Korsgaard @ 2012-11-30 20:16 UTC (permalink / raw)
To: buildroot
In-Reply-To: <CAHXCMML9f9eM7odmYWDrztZeK_ivwNeZDz5LWFMbhRV_xxFagg@mail.gmail.com>
>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:
Samuel> Indeed... it seems pretty down :-(
Samuel> Luckily, by the time this patch tried to be merged it got down!
Samuel> Well, I'll switch to some alive location and repost.
Thanks!
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH for-2012.11 0/5] Introduce errors for legacy API
From: Peter Korsgaard @ 2012-11-30 20:10 UTC (permalink / raw)
To: buildroot
In-Reply-To: <50AF8F3B.9090504@mind.be>
>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:
Hi,
Arnout> The problem with warnings is that we produce so much output
Arnout> that they'll just be hidden. They would make sense if an error
Arnout> follows soon after. But in all likelihood, if an error follows,
Arnout> it will be much further down.
Arnout> [snip]
Arnout> So, is there still anything that I should change?
I'm still not 100% happy with it, but I think this is the best we can do
for 2012.11, so I've committed the series, thanks!
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] legacy: BR2_PACKAGE_LIBINTL is replaced by gettext
From: Peter Korsgaard @ 2012-11-30 20:07 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=26803e88013ca7e30153952435d110f5da8c88ce
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
Config.in.legacy | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index 04ccb92..7ddc6ea 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -48,6 +48,21 @@ if BR2_LEGACY_CHECK_2012_11
# Legacy options from 2012.08
#
+config BR2_PACKAGE_GETTEXT_STATIC
+ bool "libgettext.a is now selected by BR2_PREFER_STATIC_LIB"
+ select BR2_LEGACY
+ help
+ To build a static gettext library, select BR2_PREFER_STATIC_LIB.
+
+
+config BR2_PACKAGE_LIBINTL
+ bool "libintl"
+ select BR2_LEGACY
+ select BR2_PACKAGE_GETTEXT
+ help
+ libintl is now installed by selecting BR2_PACKAGE_GETTEXT. This now
+ only installs the library, not the executables.
+
config BR2_PACKAGE_INPUT_TOOLS_EVTEST
bool "input-tools evtest is now a separate package evtest"
select BR2_LEGACY
^ permalink raw reply related
* [Buildroot] [git commit] legacy: evtest is dropped from input-tools package
From: Peter Korsgaard @ 2012-11-30 20:07 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=c430fab22242efd4251a6fc1ccba87f4d732e303
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
We select BR2_PACKAGE_EVTEST automatically. This has only limited use:
when the LEGACY_CHECK menu is disabled in menuconfig (or even oldconfig),
it will also unselect BR2_PACKAGE_EVTEST again. Still, it can serve as a
hint of how to fix things.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
Config.in.legacy | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index 4bc8784..04ccb92 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -48,4 +48,11 @@ if BR2_LEGACY_CHECK_2012_11
# Legacy options from 2012.08
#
+config BR2_PACKAGE_INPUT_TOOLS_EVTEST
+ bool "input-tools evtest is now a separate package evtest"
+ select BR2_LEGACY
+ select BR2_PACKAGE_EVTEST
+ help
+ The evtest program from input-tools is now a separate package.
+
endif
^ permalink raw reply related
* [Buildroot] [git commit] legacy: add error target for host-pkg-config
From: Peter Korsgaard @ 2012-11-30 20:07 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=be2460c545def6f00b6aade8719e1eef5f3ba875
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
Makefile.legacy | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/Makefile.legacy b/Makefile.legacy
index c8b568d..e0b7ec2 100644
--- a/Makefile.legacy
+++ b/Makefile.legacy
@@ -13,6 +13,16 @@ $(error "You have legacy configuration in your .config! Please check your config
endif
#
+# Legacy options from 2012.08
+#
+
+host-pkg-config:
+ @$(call MESSAGE,host-pkg-config is replaced by host-pkgconf)
+ @$(call MESSAGE,please update your .mk files)
+ @false
+.PHONY: host-pkg-config
+
+#
# Legacy options from 2012.05
#
GENTARGETS = $$(error The GENTARGETS macro no longer exists; use $$$$(eval $$$$(generic-package)) or $$$$(eval $$$$(host-generic-package)))
^ permalink raw reply related
* [Buildroot] [git commit] legacy: move old GENTARGETS macros to Makefile.legacy
From: Peter Korsgaard @ 2012-11-30 20:06 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=cc1cd3b267212c0e932db4855ff7c1afe0b45e67
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
Makefile.legacy | 7 +++++++
package/Makefile.in | 6 ------
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Makefile.legacy b/Makefile.legacy
index 2e015a1..c8b568d 100644
--- a/Makefile.legacy
+++ b/Makefile.legacy
@@ -11,3 +11,10 @@
ifeq ($(BR2_LEGACY),y)
$(error "You have legacy configuration in your .config! Please check your configuration.")
endif
+
+#
+# Legacy options from 2012.05
+#
+GENTARGETS = $$(error The GENTARGETS macro no longer exists; use $$$$(eval $$$$(generic-package)) or $$$$(eval $$$$(host-generic-package)))
+AUTOTARGETS = $$(error The AUTOTARGETS macro no longer exists; use $$$$(eval $$$$(autotools-package)) or $$$$(eval $$$$(host-autotools-package)))
+CMAKETARGETS = $$(error The CMAKETARGETS macro no longer exists; use $$$$(eval $$$$(cmake-package)) or $$$$(eval $$$$(host-cmake-package)))
diff --git a/package/Makefile.in b/package/Makefile.in
index 9fdc745..2dd81c7 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -305,12 +305,6 @@ else
SHARED_STATIC_LIBS_OPTS=--enable-static --enable-shared
endif
-# Warn if a package uses the deprecated GENTARGETS macros. This can be
-# removed again for BR-2012.11.
-GENTARGETS = $$(error The GENTARGETS macro no longer exists; use $$$$(eval $$$$(generic-package)) or $$$$(eval $$$$(host-generic-package)))
-AUTOTARGETS = $$(error The AUTOTARGETS macro no longer exists; use $$$$(eval $$$$(autotools-package)) or $$$$(eval $$$$(host-autotools-package)))
-CMAKETARGETS = $$(error The CMAKETARGETS macro no longer exists; use $$$$(eval $$$$(cmake-package)) or $$$$(eval $$$$(host-cmake-package)))
-
include package/pkg-utils.mk
include package/pkg-download.mk
include package/pkg-autotools.mk
^ permalink raw reply related
* [Buildroot] [git commit] pkg-infra: introduce errors for legacy API
From: Peter Korsgaard @ 2012-11-30 20:06 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=ebcfa987df4095a7805ff124ab648fb607c89215
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
As discussed in the BR developer days, we want to be more strict about API
changes in buildroot. I.e., we want to make it less likely that a user's
customizations break down after upgrading buildroot.
A first step is to make sure that the user is warned about API changes.
This patch introduces Makefile.legacy and Config.in.legacy, which will
issue clear error messages for such situations.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
Config.in | 2 ++
Config.in.legacy | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
Makefile | 7 ++++++-
Makefile.legacy | 13 +++++++++++++
4 files changed, 72 insertions(+), 1 deletions(-)
diff --git a/Config.in b/Config.in
index eaafece..b319ac7 100644
--- a/Config.in
+++ b/Config.in
@@ -434,3 +434,5 @@ source "fs/Config.in"
source "boot/Config.in"
source "linux/Config.in"
+
+source "Config.in.legacy"
diff --git a/Config.in.legacy b/Config.in.legacy
new file mode 100644
index 0000000..4bc8784
--- /dev/null
+++ b/Config.in.legacy
@@ -0,0 +1,51 @@
+#
+# Config.in.legacy - support for backward compatibility
+#
+# When an existing Config.in symbol is removed, it should be added again in this
+# file, and take appropriate action to approximate backward compatibility. If
+# there is an equivalent (set of) new symbols, these can just be select'ed by
+# the old symbol. This makes sure that running 'make oldconfig' will make things
+# "just work" when upgrading to a new buildroot version. If the change is too
+# fundamental and cannot be fixed by a simple select, then the old symbol should
+# select BR2_LEGACY. If that symbol is set, the build will issue an error.
+#
+# When adding legacy symbols to this file, add them to the front. The oldest
+# symbols will be removed again after about two years.
+#
+# The symbol should be copied as-is from the place where it was previously
+# defined, but the help text should be removed or replaced with something that
+# explains how to fix it.
+
+config BR2_LEGACY
+ bool
+ help
+ This option is selected automatically when your old .config uses an
+ option that no longer exists in current buildroot. In that case, the
+ build will fail. Look for config options which are selected in the
+ menu below: they no longer exist and should be replaced by something
+ else.
+
+# This comment fits exactly in a 80-column display
+comment "Legacy detected: check the content of the menu below"
+ depends on BR2_LEGACY
+
+# This option should get a new name with every buildroot release, so it defaults
+# to y again for people who upgrade.
+menuconfig BR2_LEGACY_CHECK_2012_11
+ bool "Check for legacy config options"
+ default y
+ help
+ Select this option to see the config options that are present in your
+ current .config but are no longer supported by buildroot. If any of
+ the options in this menu is selected, they should be replaced with
+ something else. As long as they stay selected, the build will fail.
+ Just de-select this option to automatically remove all the legacy
+ configuration.
+
+if BR2_LEGACY_CHECK_2012_11
+
+#
+# Legacy options from 2012.08
+#
+
+endif
diff --git a/Makefile b/Makefile
index 21aa054..1e257e9 100644
--- a/Makefile
+++ b/Makefile
@@ -290,6 +290,12 @@ endif
all: world
+# Include legacy before the other things, because package .mk files
+# may rely on it.
+ifneq ($(BR2_DEPRECATED),y)
+include Makefile.legacy
+endif
+
include package/Makefile.in
include support/dependencies/dependencies.mk
@@ -762,4 +768,3 @@ print-version:
include docs/manual/manual.mk
.PHONY: $(noconfig_targets)
-
diff --git a/Makefile.legacy b/Makefile.legacy
new file mode 100644
index 0000000..2e015a1
--- /dev/null
+++ b/Makefile.legacy
@@ -0,0 +1,13 @@
+#
+# Makefile.legacy - support for backward compatibility
+#
+# This file contains placeholders to detect backward-compatibility problems.
+# When a buildroot "API" feature is being deprecated, a rule should be added
+# here that issues an error when the old feature is used.
+#
+# This file is not included if BR2_DEPRECATED is selected, so it is possible
+# to bypass the errors (although that's usually a bad idea).
+
+ifeq ($(BR2_LEGACY),y)
+$(error "You have legacy configuration in your .config! Please check your configuration.")
+endif
^ permalink raw reply related
* [Buildroot] [PATCH 17/33] matchbox packages: fix broken urls
From: Samuel Martin @ 2012-11-30 19:57 UTC (permalink / raw)
To: buildroot
In-Reply-To: <87fw3rayff.fsf@dell.be.48ers.dk>
2012/11/30 Peter Korsgaard <jacmet@uclibc.org>:
>>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:
[...]
> Samuel> -MATCHBOX_COMMON_SITE = http://matchbox-project.org/sources/matchbox-common/$(MATCHBOX_COMMON_VERSION)
> Samuel> +MATCHBOX_COMMON_SITE = http://projects.o-hand.com/matchbox/sources/matchbox-common/$(MATCHBOX_COMMON_VERSION_MAJOR)
>
> Hmm, projects.o-hand.com doesn't seem to exist?
At least, it did...
>
> host -a projects.o-hand.com
> Trying "projects.o-hand.com"
> Received 105 bytes from 64.71.0.60#53 in 59 ms
> Trying "projects.o-hand.com"
> Host projects.o-hand.com not found: 3(NXDOMAIN)
Indeed... it seems pretty down :-(
Luckily, by the time this patch tried to be merged it got down!
Well, I'll switch to some alive location and repost.
Regards,
--
Sam
^ permalink raw reply
* [Buildroot] [PATCH] matchbox-lib: Append -lX11 to the linker
From: Peter Korsgaard @ 2012-11-30 19:55 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1351596554-27077-1-git-send-email-markos.chandras@gmail.com>
>>>>> "Markos" == Markos Chandras <markos.chandras@gmail.com> writes:
Markos> From: Markos Chandras <markos.chandras@imgtec.com>
Markos> Fixes building with binutils-2.22
Markos> http://autobuild.buildroot.net/results/b4b26dd9c7d7bebe45638ba125fb49a5f5d0cc14/build-end.log
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] matchbox-lib: Append -lX11 to the linker
From: Peter Korsgaard @ 2012-11-30 19:54 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=cc6da8b28ef6b6dde2eaaaf40d21f366508221ad
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Fixes building with binutils-2.22
http://autobuild.buildroot.net/results/b4b26dd9c7d7bebe45638ba125fb49a5f5d0cc14/build-end.log
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/matchbox/matchbox-lib/matchbox-lib.mk | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/package/matchbox/matchbox-lib/matchbox-lib.mk b/package/matchbox/matchbox-lib/matchbox-lib.mk
index de11dfc..339f512 100644
--- a/package/matchbox/matchbox-lib/matchbox-lib.mk
+++ b/package/matchbox/matchbox-lib/matchbox-lib.mk
@@ -10,6 +10,7 @@ MATCHBOX_LIB_SITE = http://matchbox-project.org/sources/libmatchbox/$(MATCHBOX_L
MATCHBOX_LIB_INSTALL_STAGING = YES
MATCHBOX_LIB_DEPENDENCIES = host-pkgconf expat xlib_libXext
MATCHBOX_LIB_CONF_OPT = --enable-expat --disable-doxygen-docs
+MATCHBOX_LIB_CONF_ENV = LIBS="-lX11"
define MATCHBOX_LIB_POST_INSTALL_FIXES
$(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
^ permalink raw reply related
* [Buildroot] [PATCHv2] flex: fix build for nommu systems
From: Peter Korsgaard @ 2012-11-30 19:53 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1354272363-10162-1-git-send-email-gustavo@zacarias.com.ar>
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> The flex binary uses fork() so it breaks on !MMU builds.
Gustavo> Since we usually don't require flex in the target and the common
Gustavo> scenario is that we just want libfl in staging reverse the options so
Gustavo> that BR2_PACKAGE_FLEX just builds and install libfl.a and change the
Gustavo> LIBFL option to BR2_PACKAGE_FLEX_BINARY to install the binary in the
Gustavo> target.
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox