* [Buildroot] [PATCH 1/2] neard: new package
From: Simon Dawson @ 2012-11-09 13:36 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20121109142044.09933dfa@skate>
Hi Thomas; thanks for the feedback.
On 9 November 2012 13:20, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
>
> > + depends on BR2_LINUX_KERNEL
>
> Why this dependency?
You're right; this is superfluous.
> > + help
> > + Near Field Communication (NFC) manager
>
> A slightly longer description would be useful here.
Okay.
> > + https://01.org/linux-nfc/documentation/how-start-linux-nfc-code...
>
> Those "..." at the end look strange.
Yes, they do look strange; but this is correct --- the dots are a
required part of the URL.
> > +NEARD_AUTORECONF = YES
>
> The package does not have any patches, and is downloaded from a
> tarball. Why is an autoreconf needed?
The autoreconf is not needed; thanks for pointing this out.
I'll rework the patch.
Simon.
^ permalink raw reply
* [Buildroot] [PATCH 1/2 v2] neard: new package
From: spdawson at gmail.com @ 2012-11-09 13:51 UTC (permalink / raw)
To: buildroot
From: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Simon Dawson <spdawson@gmail.com>
---
v2: Incorporated improvements suggested by Thomas Petazzoni
package/Config.in | 1 +
package/neard/Config.in | 12 ++++++++++++
package/neard/neard.mk | 15 +++++++++++++++
3 files changed, 28 insertions(+)
create mode 100644 package/neard/Config.in
create mode 100644 package/neard/neard.mk
diff --git a/package/Config.in b/package/Config.in
index 074e9df..6115fb4 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -237,6 +237,7 @@ source "package/mdadm/Config.in"
source "package/memtester/Config.in"
source "package/minicom/Config.in"
source "package/nanocom/Config.in"
+source "package/neard/Config.in"
source "package/ofono/Config.in"
source "package/open2300/Config.in"
source "package/openocd/Config.in"
diff --git a/package/neard/Config.in b/package/neard/Config.in
new file mode 100644
index 0000000..a50dbeb
--- /dev/null
+++ b/package/neard/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_NEARD
+ bool "neard"
+ select BR2_PACKAGE_DBUS
+ select BR2_PACKAGE_LIBGLIB2
+ select BR2_PACKAGE_LIBNL
+ help
+ Near Field Communication (NFC) manager. This userspace daemon is a part
+ of the NFC stack provided by the Linux NFC project.
+
+ http://git.kernel.org/?p=network/nfc/neard.git;a=summary
+
+ https://01.org/linux-nfc/documentation/how-start-linux-nfc-code...
diff --git a/package/neard/neard.mk b/package/neard/neard.mk
new file mode 100644
index 0000000..8c12627
--- /dev/null
+++ b/package/neard/neard.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# neard
+#
+#############################################################
+NEARD_VERSION = 0.7
+NEARD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/nfc
+NEARD_INSTALL_STAGING = YES
+NEARD_LICENSE = GPLv2
+NEARD_LICENSE_FILES = COPYING
+
+NEARD_DEPENDENCIES = dbus libglib2 libnl
+NEARD_CONF_OPT = --disable-traces
+
+$(eval $(autotools-package))
--
1.7.10.4
^ permalink raw reply related
* [Buildroot] Udev on a live CD system does not appear to populate /dev
From: Arnout Vandecappelle @ 2012-11-09 15:04 UTC (permalink / raw)
To: buildroot
In-Reply-To: <509D0071.3010004@macrium.com>
On 11/09/12 14:09, Antony Vennard wrote:
> I'm not entirely sure - I believe grub legacy can do efi; Fedora 17
> certainly uses uses a variant of grub 0.97 for its EFI bootloader by
> default, although they're moving to grub2 apparently.
>
> Don't worry, I'll find the patches in git when ready - I can see them in
> the git log.
They're not committed yet, so you have to look on the list instead.
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286540
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply
* [Buildroot] problem building a SDL app with buildroot
From: Samuel Martin @ 2012-11-09 16:36 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20121108183649.0cae75f1@skate>
Hi Thomas, Jemery, all,
2012/11/8 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>:
> Samuel,
>
> On Thu, 8 Nov 2012 11:49:58 +0100, Samuel Martin wrote:
>
>> As a quick fix, in your app *.mk file, you can try to add:
>> <your app prefix>_CONF_OPT += -DSDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config"
>>
>> You don't have to change anything in the sdl-config from the staging
>> area, it is already handled by the sdl package.
>>
>> BTW, that an issue we are aware of, and we talked a bit about it
>> during the last Buildroot Dev Days.
>> We just need some time to work on and figure out the best way to fix this.
>
> We indeed discussed it, but as far as I understood, there isn't really
> another solution than what we're doing at the moment. Options we
> discussed where:
>
> (1) Install those <foo>-config scripts in $(HOST_DIR)/usr/bin. This
> isn't possible as they would clash with other <foo>-config scripts
> installed by host packages.
>
> (2) Create a special directory, which is in the PATH passed when
> configuring/building packages, in which we would install those
> <foo>-config script. This works quite OK when those <foo>-config
> scripts are self-contained (which is the case most of the time), but
> not necessarily if they are more elaborate.
>
> So in general, I think we said it wasn't really worth the effort, and
> it was probably a lot better to work on moving packages to pkg-config
> instead.
Thomas, you're right.
> For example, in this case, Jeremy should rather use the pkg-config
> files of SDL to discover the right compiler/linker flags. pkg-config is
> very nicely integrated with CMake, it should even simplify the
> CMakeLists.txt.
Jeremy, actually it's weird that you need to find the sdl-config
binary because CMake provide a package for SDL.
So, as much as possible, it should use the CMake way: using FindSDL.
See: http://www.cmake.org/cmake/help/v2.8.10/cmake.html#module:FindSDL
Regards,
--
Sam
^ permalink raw reply
* [Buildroot] [PATCH] boost version update 1.52.0
From: Samuel Martin @ 2012-11-09 16:48 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1352464603-22886-1-git-send-email-alexander@mezon.ru>
Hi Alexander,
2012/11/9 Alexander Khryukin <alexander@mezon.ru>:
>
> Signed-off-by: Alexander Khryukin <alexander@mezon.ru>
> ---
> package/boost/boost.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/boost/boost.mk b/package/boost/boost.mk
> index 64856bc..e03c81d 100644
> --- a/package/boost/boost.mk
> +++ b/package/boost/boost.mk
> @@ -4,7 +4,7 @@
> #
> #############################################################
>
> -BOOST_VERSION = 1.49.0
> +BOOST_VERSION = 1.52.0
> BOOST_FILE_VERSION = $(subst .,_,$(BOOST_VERSION))
> BOOST_SOURCE = boost_$(BOOST_FILE_VERSION).tar.bz2
> BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSION)
> --
> 1.7.11.3
>
Some patch has already been sent to the ml, but not yet reviewed nor tested.
See:
http://lists.busybox.net/pipermail/buildroot/2012-November/061084.html
or:
http://patchwork.ozlabs.org/patch/197508/
Regards,
--
Sam
^ permalink raw reply
* [Buildroot] [PATCH] boost version update 1.52.0
From: Alexander Khryukin @ 2012-11-09 16:51 UTC (permalink / raw)
To: buildroot
In-Reply-To: <CAHXCMMJJFop7bpOpJRzDWy6Xq0SW4Fe80bM-hrh3fQfkPtw=Jw@mail.gmail.com>
? ??., 09/11/2012 ? 17:48 +0100, Samuel Martin ?????:
> Hi Alexander,
>
> 2012/11/9 Alexander Khryukin <alexander@mezon.ru>:
> >
> > Signed-off-by: Alexander Khryukin <alexander@mezon.ru>
> > ---
> > package/boost/boost.mk | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/package/boost/boost.mk b/package/boost/boost.mk
> > index 64856bc..e03c81d 100644
> > --- a/package/boost/boost.mk
> > +++ b/package/boost/boost.mk
> > @@ -4,7 +4,7 @@
> > #
> > #############################################################
> >
> > -BOOST_VERSION = 1.49.0
> > +BOOST_VERSION = 1.52.0
> > BOOST_FILE_VERSION = $(subst .,_,$(BOOST_VERSION))
> > BOOST_SOURCE = boost_$(BOOST_FILE_VERSION).tar.bz2
> > BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSION)
> > --
> > 1.7.11.3
> >
>
> Some patch has already been sent to the ml, but not yet reviewed nor tested.
>
> See:
> http://lists.busybox.net/pipermail/buildroot/2012-November/061084.html
> or:
> http://patchwork.ozlabs.org/patch/197508/
>
>
> Regards,
>
Ok, i hope it will be applied soon.
^ permalink raw reply
* [Buildroot] [PATCH] gnutls-2.12.20-glibc-2.16.patch glibc-2.16 and gnutls2 fix i forgot my signoff
From: Samuel Martin @ 2012-11-09 16:54 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1352464266-22684-1-git-send-email-alexander@mezon.ru>
Hi Alexander,
2012/11/9 Alexander Khryukin <alexander@mezon.ru>:
>
> Signed-off-by: Alexander Khryukin <alexander@mezon.ru>
> ---
> package/gnutls/gnutls-2.12.20-glibc2.16.patch | 26 ++++++++++++++++++++++++++
> 1 file changed, 26 insertions(+)
> create mode 100644 package/gnutls/gnutls-2.12.20-glibc2.16.patch
>
> diff --git a/package/gnutls/gnutls-2.12.20-glibc2.16.patch b/package/gnutls/gnutls-2.12.20-glibc2.16.patch
> new file mode 100644
> index 0000000..6b7f545
> --- /dev/null
> +++ b/package/gnutls/gnutls-2.12.20-glibc2.16.patch
> @@ -0,0 +1,26 @@
> +--- gnutls-2.12.20/gl/stdio.in.h
> ++++ gnutls-2.12.20/gl/stdio.in.h
When adding a patch to a package, we usually add a header to the patch
containing a description and the SoB line.
Regards,
--
Sam
^ permalink raw reply
* [Buildroot] [PATCH 1/2 v2] xtensa: add support for the Xtensa architecture
From: Arnout Vandecappelle @ 2012-11-09 16:56 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20121109101959.70d640d5@skate>
On 11/09/12 10:19, Thomas Petazzoni wrote:
> Unfortunately, the default toolchain configuration for Xtensa doesn't.
> I.e, I tried to build the minimal configuration:
>
> BR2_xtensa=y
> BR2_PACKAGE_LUA=y
> BR2_PACKAGE_LUA_INTERPRETER=y
> BR2_PACKAGE_AVAHI=y
>
> And the build of gcc intermediate fails horribly with pthread errors:
I get these same error with the default bfin config, and it also breaks
with BR2_PTHREADS_NONE=y
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286540
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply
* [Buildroot] [PATCH] gnutls-2.12.20-glibc-2.16.patch glibc-2.16 and gnutls2 fix i forgot my signoff
From: Alexander Khryukin @ 2012-11-09 17:19 UTC (permalink / raw)
To: buildroot
In-Reply-To: <CAHXCMMLpVAHmvEHdpkyorLHb=DJGmHhG6cnWkpZ0pkfEp5Sg9g@mail.gmail.com>
2012/11/9 Samuel Martin <s.martin49@gmail.com>
> Hi Alexander,
>
> 2012/11/9 Alexander Khryukin <alexander@mezon.ru>:
> >
> > Signed-off-by: Alexander Khryukin <alexander@mezon.ru>
> > ---
> > package/gnutls/gnutls-2.12.20-glibc2.16.patch | 26
> ++++++++++++++++++++++++++
> > 1 file changed, 26 insertions(+)
> > create mode 100644 package/gnutls/gnutls-2.12.20-glibc2.16.patch
> >
> > diff --git a/package/gnutls/gnutls-2.12.20-glibc2.16.patch
> b/package/gnutls/gnutls-2.12.20-glibc2.16.patch
> > new file mode 100644
> > index 0000000..6b7f545
> > --- /dev/null
> > +++ b/package/gnutls/gnutls-2.12.20-glibc2.16.patch
> > @@ -0,0 +1,26 @@
> > +--- gnutls-2.12.20/gl/stdio.in.h
> > ++++ gnutls-2.12.20/gl/stdio.in.h
> When adding a patch to a package, we usually add a header to the patch
> containing a description and the SoB line.
>
> Regards,
>
> --
> Sam
>
Looks as my mistake.
In a short time i'll send good patch.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20121109/9678e105/attachment-0001.html>
^ permalink raw reply
* [Buildroot] autobuild server down...
From: Arnout Vandecappelle @ 2012-11-09 17:33 UTC (permalink / raw)
To: buildroot
Did the autobuild server die under the pressure of all the failed perl builds? :-)
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286540
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply
* [Buildroot] [PATCH] perl: build with perlcross instead of qemu
From: Arnout Vandecappelle @ 2012-11-09 18:07 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20121109113112.1a7606ff@skate>
On 11/09/12 11:31, Thomas Petazzoni wrote:
> This patch unfortunately breaks the build of cpanminus, which
> apparently still requires qemu:
Yep, it does require qemu. To make it work with perlcross, you'd need to
build a host-perl with a few extra modules (to support network downloads) - but
building those modules can't be done with cross-miniperl because it has the
target's settings for which headers etc. exist. The perlcross docs state:
"And thinking of possible need to install additional modules for hostperl makes
my head spin."
So instead, I'll make cpanminus depend on host-qemu and try to exclude the
failing architectures.
The long term solution is probably to replace cpanminus with something
buildroot-friendly. The cross-build of the downloaded modules is probably
doable with cross-miniperl.
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286540
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply
* [Buildroot] [PATCH 1/2 v2] xtensa: add support for the Xtensa architecture
From: Chris Zankel @ 2012-11-09 18:34 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20121109101959.70d640d5@skate>
Hi Thomas,
Sorry that you had to spend so much time on it. There are currently the
following restrictions:
Only linuxthreads/old and no-threads is supported for Xtensa. There
actually is a port for NPTL, and I'm trying to get it, but might take
some time. I will update the patch to disable NTPL on linuxthreads for
Xtensa for now.
uClibc 0.9.33 doesn't have the required Xtensa patches, so you would
have to select snapshot. I'm not sure what the best approach is here.
Provide a 'back-port' patch with these patches for 0.9.33 or only enable
'snapshot' for Xtensa. I'll update the two patches to only allow to
select snapshot for now.
Note that uClibc has added a new config and the current patch that is in
buildroot (uClibc.snapshot.linuxthreads-errno-fix.patch) doesn't apply
anymore. I noticed that a similar patch was dropped for 0.9.33.2, so I
was just also removing this patch for snapshot. I believe you created
that patch, so do you know if it can be removed? I can provide a patch
for buildroot to fix uClibc snapshot.
Thanks,
-Chris
On 11/09/2012 01:19 AM, Thomas Petazzoni wrote:
> Dear Chris Zankel,
>
> On Thu, 08 Nov 2012 22:33:28 -0800, Chris Zankel wrote:
>> The Xtensa architecture had been removed because it required special
>> handling and depended on additional directories and files that became
>> obsolete over time. This change is more aligned to other architectures.
>>
>> Signed-off-by: Chris Zankel <chris@zankel.net>
> Unfortunately, the default toolchain configuration for Xtensa doesn't.
> I.e, I tried to build the minimal configuration:
>
> BR2_xtensa=y
> BR2_PACKAGE_LUA=y
> BR2_PACKAGE_LUA_INTERPRETER=y
> BR2_PACKAGE_AVAHI=y
>
> And the build of gcc intermediate fails horribly with pthread errors:
>
> xtensa-buildroot-linux-uclibc/bin/ -B/home/test/outputs/xtensa/host/usr/xtensa-buildroot-linux-uclibc/lib/ -isystem /home/test/outputs/xtensa/host/usr/xtensa-buildroot-linux-u
> clibc/include -isystem /home/test/outputs/xtensa/host/usr/xtensa-buildroot-linux-uclibc/sys-include -g -Os -O2 -g -Os -DIN_GCC -DCROSS_DIRECTORY_STRUCTURE -W -Wall -Wwrit
> e-strings -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -isystem ./include -fPIC -g -DHAVE_GTHR_DEFAULT -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED -
> fno-stack-protector -I. -I. -I../.././gcc -I/home/test/outputs/xtensa/toolchain/gcc-4.6.3/libgcc -I/home/test/outputs/xtensa/toolchain/gcc-4.6.3/libgcc/. -I/home/test/output
> s/xtensa/toolchain/gcc-4.6.3/libgcc/../gcc -I/home/test/outputs/xtensa/toolchain/gcc-4.6.3/libgcc/../include -DHAVE_CC_TLS -o _negdi2.o -MT _negdi2.o -MD -MP -MF _negdi2.dep
> -DL_negdi2 -c /home/test/outputs/xtensa/toolchain/gcc-4.6.3/libgcc/../gcc/libgcc2.c \
> -fvisibility=hidden -DHIDE_EXPORTS
> In file included from /home/test/outputs/xtensa/toolchain/uClibc_dev//usr/include/stdio.h:72:0,
> from /home/test/outputs/xtensa/toolchain/gcc-4.6.3/libgcc/../gcc/tsystem.h:87,
> from /home/test/outputs/xtensa/toolchain/gcc-4.6.3/libgcc/../gcc/libgcc2.c:29:
> /home/test/outputs/xtensa/toolchain/uClibc_dev//usr/include/bits/uClibc_stdio.h:274:2: error: unknown type name 'pthread_mutex_t'
> In file included from /home/test/outputs/xtensa/toolchain/uClibc_dev//usr/include/bits/uClibc_mutex.h:15:0,
> from /home/test/outputs/xtensa/toolchain/uClibc_dev//usr/include/bits/uClibc_stdio.h:107,
> from /home/test/outputs/xtensa/toolchain/uClibc_dev//usr/include/stdio.h:72,
> from /home/test/outputs/xtensa/toolchain/gcc-4.6.3/libgcc/../gcc/tsystem.h:87,
> from /home/test/outputs/xtensa/toolchain/gcc-4.6.3/libgcc/../gcc/libgcc2.c:29:
> /home/test/outputs/xtensa/toolchain/uClibc_dev//usr/include/pthread.h:227:28: error: unknown type name 'pthread_t'
> /home/test/outputs/xtensa/toolchain/uClibc_dev//usr/include/pthread.h:228:7: error: unknown type name 'pthread_attr_t'
> /home/test/outputs/xtensa/toolchain/uClibc_dev//usr/include/pthread.h:244:26: error: unknown type name 'pthread_t'
> /home/test/outputs/xtensa/toolchain/uClibc_dev//usr/include/pthread.h:249:32: error: unknown type name 'pthread_t'
> /home/test/outputs/xtensa/toolchain/uClibc_dev//usr/include/pthread.h:257:34: error: unknown type name 'pthread_t'
> /home/test/outputs/xtensa/toolchain/uClibc_dev//usr/include/pthread.h:265:28: error: unknown type name 'pthread_t'
> /home/test/outputs/xtensa/toolchain/uClibc_dev//usr/include/pthread.h:269:1: error: unknown type name 'pthread_t'
> /home/test/outputs/xtensa/toolchain/uClibc_dev//usr/include/pthread.h:272:27: error: unknown type name 'pthread_t'
> /home/test/outputs/xtensa/toolchain/uClibc_dev//usr/include/pthread.h:272:48: error: unknown type name 'pthread_t'
> /home/test/outputs/xtensa/toolchain/uClibc_dev//usr/include/pthread.h:280:31: error: unknown type name 'pthread_attr_t'
> /home/test/outputs/xtensa/toolchain/uClibc_dev//usr/include/pthread.h:283:34: error: unknown type name 'pthread_attr_t'
> /home/test/outputs/xtensa/toolchain/uClibc_dev//usr/include/pthread.h:287:1: error: unknown type name 'pthread_attr_t'
> /home/test/outputs/xtensa/toolchain/uClibc_dev//usr/include/pthread.h:292:41: error: unknown type name 'pthread_attr_t'
> /home/test/outputs/xtensa/toolchain/uClibc_dev//usr/include/pthread.h:298:1: error: unknown type name 'pthread_attr_t'
> [... many more ...]
> In file included from /home/test/outputs/xtensa/toolchain/uClibc_dev//usr/include/stdio.h:72:0,
> from /home/test/outputs/xtensa/toolchain/gcc-4.6.3/libgcc/../gcc/tsystem.h:87,
> from /home/test/outputs/xtensa/toolchain/gcc-4.6.3/libgcc/../gcc/libgcc2.c:29:
> /home/test/outputs/xtensa/toolchain/uClibc_dev//usr/include/bits/uClibc_stdio.h:274:2: error: unknown type name 'pthread_mutex_t'
> make[3]: *** [_muldi3.o] Error 1
> make[3]: *** Waiting for unfinished jobs....
> make[3]: *** [_negdi2.o] Error 1
> make[2]: *** [all-target-libgcc] Error 2
> make[1]: *** [/home/test/outputs/xtensa/toolchain/gcc-4.6.3-intermediate/.compiled] Error 2
> make: *** [all] Error 2
>
> Is it that the pthread support for Xtensa is not available in uClibc?
>
> Best regards,
>
> Thomas
^ permalink raw reply
* [Buildroot] [PATCH 1/4] perl: remove redundant patches
From: Arnout Vandecappelle @ 2012-11-09 19:34 UTC (permalink / raw)
To: buildroot
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
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>
---
package/perl/perl-configure-qemu.patch | 53 ------------------------------
package/perl/perl-fix-Module-Build.patch | 16 ---------
package/perl/perl-make-ext.patch | 24 --------------
package/perl/perl-mkppport.patch | 37 ---------------------
4 files changed, 130 deletions(-)
delete mode 100644 package/perl/perl-configure-qemu.patch
delete mode 100644 package/perl/perl-fix-Module-Build.patch
delete mode 100644 package/perl/perl-make-ext.patch
delete mode 100644 package/perl/perl-mkppport.patch
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-fix-Module-Build.patch b/package/perl/perl-fix-Module-Build.patch
deleted file mode 100644
index 26b15e4..0000000
--- a/package/perl/perl-fix-Module-Build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-
-Index: b/cpan/Module-Build/lib/Module/Build/Base.pm
-===================================================================
---- a/cpan/Module-Build/lib/Module/Build/Base.pm
-+++ b/cpan/Module-Build/lib/Module/Build/Base.pm
-@@ -456,7 +456,7 @@
- my $proto = shift;
- my $c = ref($proto) ? $proto->{config} : 'Module::Build::Config';
-
-- my $perl = $^X;
-+ my $perl = $ENV{RUN_PERL} || $^X;
- my $perl_basename = File::Basename::basename($perl);
-
- my @potential_perls;
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__
--
1.7.10.4
^ permalink raw reply related
* [Buildroot] [PATCH 2/4] perl: substitute perlcross pod with perl-version-specific pod
From: Arnout Vandecappelle @ 2012-11-09 19:34 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1352489646-30635-1-git-send-email-arnout@mind.be>
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
As suggested by Dan Pattison at ethertek ca.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
package/perl/perl.mk | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
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
--
1.7.10.4
^ permalink raw reply related
* [Buildroot] [PATCH 3/4] perl: remove the double configure hack
From: Arnout Vandecappelle @ 2012-11-09 19:34 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1352489646-30635-1-git-send-email-arnout@mind.be>
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
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>
---
package/perl/perl.mk | 14 ++------------
1 file 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
--
1.7.10.4
^ permalink raw reply related
* [Buildroot] [PATCH 4/4] cpanminus: requires host-qemu
From: Arnout Vandecappelle @ 2012-11-09 19:34 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1352489646-30635-1-git-send-email-arnout@mind.be>
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Must also disable all non-supported architectures, including x86
(which doesn't have a working fork()).
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
It still only works half the time. For instance, in one arm configuration
I have qemu sitting there consuming 100% CPU without any output, system
calls, or nothing...
---
package/cpanminus/Config.in | 11 +++++++++++
package/cpanminus/cpanminus.mk | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/package/cpanminus/Config.in b/package/cpanminus/Config.in
index b8b39dc..cf93a7e 100644
--- a/package/cpanminus/Config.in
+++ b/package/cpanminus/Config.in
@@ -1,5 +1,16 @@
config BR2_PACKAGE_CPANMINUS
bool "cpanminus"
+ # host-qemu doesn't work for the following platforms
+ depends on !BR2_avr32
+ depends on !BR2_bfin
+ depends on !BR2_sh2
+ depends on !BR2_sh2a
+ depends on !BR2_sh3
+ depends on !BR2_sh3eb
+ depends on !BR2_sh64
+ # host-qemu doesn't support system() on the following platforms
+ depends on !BR2_i386
+ depends on !BR2_x86_64
help
cpanminus is a script to get, unpack, build and install Perl modules
from CPAN.
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}")
--
1.7.10.4
^ permalink raw reply related
* [Buildroot] [PATCH] perl: build with perlcross instead of qemu
From: François Perrad @ 2012-11-09 21:13 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1352425626-10628-1-git-send-email-arnout@mind.be>
2012/11/9 Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>:
> The perlcross project makes it possible to properly cross-compile
> perl. It creates a host-miniperl that is configured for the target
> and uses that to cross-compile the perl modules.
>
> Unfortunately there are still a few hacks needed to make it work.
> Proper fixes can be developed and upstreamed later.
>
> Since there is no longer a dependency on qemu, it works on all
> architectures again.
>
> Also removed some config options:
> - BR2_PACKAGE_PERL_CUSTOM_INSTALL just allows a selection of modules;
> this can also be encoded by an empty BR2_PACKAGE_PERL_MODULES.
> - BR2_PACKAGE_PERL_DB_FILE and BR2_PACKAGE_PERL_GDBM_FILE can be
> derived automatically from the package configs.
>
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
The 3 following patches are now useless :
package/perl/perl-configure-qemu.patch
package/perl/perl-make-ext.patcg
package/perl/perl-mkppport.patch
Fran?ois
^ permalink raw reply
* [Buildroot] [PATCH 00/11] RFC: Manual content reorganization
From: Arnout Vandecappelle @ 2012-11-09 21:25 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1332285001-12881-1-git-send-email-s.martin49@gmail.com>
On 03/21/12 00:09, Samuel MARTIN wrote:
> This patch series aims to reorganize the manual content, as well as
> complete it... thought there are still lacks here and there after that
Sam,
Do you think we could still get this into 2012.11?
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286540
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply
* [Buildroot] [PATCH 4/5] lua: remove 3 sub-options, always install all
From: Arnout Vandecappelle @ 2012-11-09 21:41 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1346741921-28968-4-git-send-email-francois.perrad@gadz.org>
On 09/04/12 08:58, Francois Perrad wrote:
> Signed-off-by: Francois Perrad<francois.perrad@gadz.org>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Peter, please commit this one before -rc1, it fixes
http://autobuild.buildroot.net/results/d47b983abde8eebe02c228d638101b8d5cd92965/
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286540
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply
* [Buildroot] QT packackage grantlee not building
From: Sagaert Johan @ 2012-11-09 21:44 UTC (permalink / raw)
To: buildroot
Hi
Currently the build of the QT grantlee package is broken:
it seems like libpthread is not linked in.
[ 97%] Building CXX object templates/defaulttags/CMakeFiles/grantlee_defaulttags.dir/moc_spaceless.cxx.o
[ 97%] Building CXX object templates/defaulttags/CMakeFiles/grantlee_defaulttags.dir/moc_ssi.cxx.o
[ 97%] Building CXX object templates/defaulttags/CMakeFiles/grantlee_defaulttags.dir/moc_templatetag.cxx.o
[ 98%] Building CXX object templates/defaulttags/CMakeFiles/grantlee_defaulttags.dir/moc_widthratio.cxx.o
[ 98%] Building CXX object templates/defaulttags/CMakeFiles/grantlee_defaulttags.dir/moc_with.cxx.o
Linking CXX shared module ../../grantlee/0.2/grantlee_defaulttags.so
make[3]: Leaving directory `/home/buildroot12git/output/build/grantlee-0.2.0'
[ 98%] Built target grantlee_defaulttags
Linking CXX executable testgenerictypes_exec
/home/buildroot12git/output/host/usr/lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.6.3/../../../../arm-buildroot-linux-uclibcgnueabi/b
in/ld: /home/buildroot12git/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libQtCore.so: undefined reference to
symbol 'pthread_cancel'
/home/buildroot12git/output/host/usr/lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.6.3/../../../../arm-buildroot-linux-uclibcgnueabi/b
in/ld: note: 'pthread_cancel' is defined in DSO
/home/buildroot12git/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/lib/libpthread.so.0 so try adding it to the linker
command line
/home/buildroot12git/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/lib/libpthread.so.0: could not read symbols: Invalid
operation
collect2: ld returned 1 exit status
make[3]: *** [templates/tests/testgenerictypes_exec] Error 1
make[3]: Leaving directory `/home/buildroot12git/output/build/grantlee-0.2.0'
make[2]: *** [templates/tests/CMakeFiles/testgenerictypes_exec.dir/all] Error 2
make[2]: Leaving directory `/home/buildroot12git/output/build/grantlee-0.2.0'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/home/buildroot12git/output/build/grantlee-0.2.0'
make: *** [/home/buildroot12git/output/build/grantlee-0.2.0/.stamp_built] Error
Regards Johan
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20121109/fe4fbd19/attachment.html>
^ permalink raw reply
* [Buildroot] [PATCH 5/5] lua: refactor without useless define's
From: Arnout Vandecappelle @ 2012-11-09 21:47 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1346741921-28968-5-git-send-email-francois.perrad@gadz.org>
On 09/04/12 08:58, Francois Perrad wrote:
> Signed-off-by: Francois Perrad<francois.perrad@gadz.org>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
(build test on a few configs)
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286540
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply
* [Buildroot] QT packackage grantlee not building
From: Arnout Vandecappelle @ 2012-11-09 21:48 UTC (permalink / raw)
To: buildroot
In-Reply-To: <28814AE91EA94801B84C55B81555379F@JohanW7>
On 11/09/12 22:44, Sagaert Johan wrote:
> Currently the build of the QT grantlee package is broken:
> it seems like libpthread is not linked in.
Could you post a defconfig so we can try to reproduce?
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286540
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply
* [Buildroot] [PATCH 00/11] RFC: Manual content reorganization
From: Samuel Martin @ 2012-11-09 22:45 UTC (permalink / raw)
To: buildroot
In-Reply-To: <509D74B0.7070009@mind.be>
2012/11/9 Arnout Vandecappelle <arnout@mind.be>:
> On 03/21/12 00:09, Samuel MARTIN wrote:
>>
>> This patch series aims to reorganize the manual content, as well as
>> complete it... thought there are still lacks here and there after that
>
>
> Sam,
>
> Do you think we could still get this into 2012.11?
On it, and hope so! ;-)
I think I'll repost the updated and rebased version by sunday, or
early next week.
Regards,
--
Sam
^ permalink raw reply
* [Buildroot] [PATCH] target: add option to set the root password
From: Yann E. MORIN @ 2012-11-09 23:28 UTC (permalink / raw)
To: buildroot
Add an option in the menuconfig to specify a root password.
If set to empty, no root password is created; otherwise, the password is
encrypted using MD5 (MD5 is not the default for crypt(3), DES-56 is, but
MD5 is widely available, not-so-strong, but not-so-weak either).
Add a check for 'mkpasswd' as a new dependency.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
---
Switched to using MD5 as per Arnout's suggestion:
http://lists.busybox.net/pipermail/buildroot/2012-September/058712.html
---
support/dependencies/dependencies.sh | 7 +++++++
system/Config.in | 21 +++++++++++++++++++++
system/system.mk | 14 ++++++++++++++
3 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index 9f0f6a9..edf49e9 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -158,3 +158,10 @@ if grep ^BR2_TOOLCHAIN_BUILDROOT=y $CONFIG_FILE > /dev/null && \
exit 1 ;
fi
fi
+
+if grep -E '^TARGET_GENERIC_ROOT_PASSWD=".+"$' $CONFIG_FILE > /dev/null 2>&1; then
+ if ! which mkpasswd > /dev/null 2>&1; then
+ /bin/echo -e "\nYou need the 'mkpasswd' utility to set the root password\n"
+ exit 1
+ fi
+fi
diff --git a/system/Config.in b/system/Config.in
index 10c9d9d..9a9c197 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -12,6 +12,27 @@ config BR2_TARGET_GENERIC_ISSUE
help
Select system banner (/etc/issue) to be displayed at login.
+config BR2_TARGET_GENERIC_ROOT_PASSWD
+ string "root password"
+ default ""
+ help
+ Set the initial root password. It will be md5-encrypted.
+
+ If set to empty (the default), then no root password will be set,
+ and root will need no password to log in.
+
+ WARNING! WARNING!
+ Although pretty strong, MD5 is now an old hash function, and
+ suffers from som weaknesses, wihch makes it susceptible to attacks.
+ It is showing its age, so this root password should not be trusted
+ to properly secure any product that can be shipped to the wide,
+ hostile world.
+
+ WARNING! WARNING!
+ The password appears in clear in the .config file, and may appear
+ in the build log! Avoid using a valuable password if either the
+ .config file or the build log may be distributed!
+
choice
prompt "/dev management"
default BR2_ROOTFS_DEVICE_CREATION_STATIC
diff --git a/system/system.mk b/system/system.mk
index 4185202..5219f3f 100644
--- a/system/system.mk
+++ b/system/system.mk
@@ -1,5 +1,6 @@
TARGET_GENERIC_HOSTNAME:=$(call qstrip,$(BR2_TARGET_GENERIC_HOSTNAME))
TARGET_GENERIC_ISSUE:=$(call qstrip,$(BR2_TARGET_GENERIC_ISSUE))
+TARGET_GENERIC_ROOT_PASSWD:=$(call qstrip,$(BR2_TARGET_GENERIC_ROOT_PASSWD))
TARGET_GENERIC_GETTY:=$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT))
TARGET_GENERIC_GETTY_BAUDRATE:=$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE))
@@ -13,6 +14,13 @@ target-generic-issue:
mkdir -p $(TARGET_DIR)/etc
echo "$(TARGET_GENERIC_ISSUE)" > $(TARGET_DIR)/etc/issue
+target-no-root-passwd:
+ $(SED) "s/^root:[^:]*:/root::/" $(TARGET_DIR)/etc/shadow
+
+target-root-passwd:
+ root_passwd="$$( mkpasswd -m md5 "$(TARGET_GENERIC_ROOT_PASSWD)" )"; \
+ $(SED) "s,^root::,root:$${root_passwd}:," $(TARGET_DIR)/etc/shadow
+
target-generic-getty-busybox:
$(SED) '/# GENERIC_SERIAL$$/s~^.*#~$(TARGET_GENERIC_GETTY)::respawn:/sbin/getty -L $(TARGET_GENERIC_GETTY) $(TARGET_GENERIC_GETTY_BAUDRATE) vt100 #~' \
$(TARGET_DIR)/etc/inittab
@@ -39,6 +47,12 @@ ifneq ($(TARGET_GENERIC_ISSUE),)
TARGETS += target-generic-issue
endif
+ifneq ($(TARGET_GENERIC_ROOT_PASSWD),)
+TARGETS += target-root-passwd
+else
+TARGETS += target-no-root-passwd
+endif
+
ifeq ($(BR2_ROOTFS_SKELETON_DEFAULT),y)
ifeq ($(BR2_PACKAGE_SYSVINIT),y)
TARGETS += target-generic-getty-sysvinit
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH] iso9660 fs: use cpio initrd instead of ext2
From: Arnout Vandecappelle @ 2012-11-09 23:54 UTC (permalink / raw)
To: buildroot
The ext2 initrd is pretty broken, because it requires an additional
root=/dev/ram0 command line parameter, and a /init to mount
devtmps that isn't there in out ext2 rootfs. So just use a cpio
instead.
Note that there is no check if the kernel supports initramfs or the
selected compression method.
Also removed a bit of dead code in iso9660.mk.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
fs/iso9660/Config.in | 2 +-
fs/iso9660/iso9660.mk | 11 +++++------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/fs/iso9660/Config.in b/fs/iso9660/Config.in
index 4c00583..98ff78b 100644
--- a/fs/iso9660/Config.in
+++ b/fs/iso9660/Config.in
@@ -2,7 +2,7 @@ config BR2_TARGET_ROOTFS_ISO9660
bool "iso image"
depends on (BR2_i386 || BR2_x86_64)
depends on BR2_LINUX_KERNEL
- select BR2_TARGET_ROOTFS_EXT2
+ select BR2_TARGET_ROOTFS_CPIO
select BR2_TARGET_GRUB
help
Build a bootable iso9660 image
diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk
index f51b6ee..029c0dd 100644
--- a/fs/iso9660/iso9660.mk
+++ b/fs/iso9660/iso9660.mk
@@ -9,20 +9,19 @@
ISO9660_TARGET_DIR=$(BUILD_DIR)/iso9660
ISO9660_BOOT_MENU:=$(call qstrip,$(BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU))
-ISO9660_OPTS:=
-ifeq ($(BR2_TARGET_ROOTFS_ISO9660_SQUASH),y)
-ISO9660_OPTS+=-U
-endif
+ISO9660_CPIO_EXT-$(BR2_TARGET_ROOTFS_CPIO_GZIP) = .gz
+ISO9660_CPIO_EXT-$(BR2_TARGET_ROOTFS_CPIO_BZIP2) = .bz2
+ISO9660_CPIO_EXT-$(BR2_TARGET_ROOTFS_CPIO_LZMA) = .lzma
-$(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux rootfs-ext2 grub
+$(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux rootfs-cpio grub
@$(call MESSAGE,"Generating root filesystem image rootfs.iso9660")
mkdir -p $(ISO9660_TARGET_DIR)
mkdir -p $(ISO9660_TARGET_DIR)/boot/grub
cp $(GRUB_DIR)/stage2/stage2_eltorito $(ISO9660_TARGET_DIR)/boot/grub/
cp $(ISO9660_BOOT_MENU) $(ISO9660_TARGET_DIR)/boot/grub/menu.lst
cp $(LINUX_IMAGE_PATH) $(ISO9660_TARGET_DIR)/kernel
- cp $(BINARIES_DIR)/rootfs.ext2 $(ISO9660_TARGET_DIR)/initrd
+ cp $(BINARIES_DIR)/rootfs.cpio$(ISO9660_CPIO_EXT-y) $(ISO9660_TARGET_DIR)/initrd
# Use fakeroot to pretend all target binaries are owned by root
rm -f $(FAKEROOT_SCRIPT)
echo "chown -R 0:0 $(ISO9660_TARGET_DIR)" >> $(FAKEROOT_SCRIPT)
--
tg: (234fe44..) t/iso9660 (depends on: master)
^ permalink raw reply related
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