Pull request for branch yem/misc
From: "Yann E. MORIN" <[email protected]>
Hello All!
Here are a few patches I've been assigned to massage into shape, during the last devday:
- 186840 (nut)
- 241511 (ser2net)
- 242998 + 242999 (rpi)
I'll mark those patchwork IDs as superseded in a moment.
It also includes the OOT Makefile fix since it was in the same branch, sorry for the duplication... :-/
Regards,
Yann E. MORIN.
The following changes since commit 615881ff5e1a15e99396dd2615bb4ce8c415e0dc:
package/zic: bump (2013-11-05 23:56:46 +0100)
are available in the git repository at:
git://gitorious.org/buildroot/buildroot.git yem/misc
for you to fetch changes up to 155f4535a09b1cdce293c75108211da899c3a0a8:
Makefile: fix out-of-tree builds with multiple targets with 'all' (2013-11-06 00:19:16 +0100)
----------------------------------------------------------------
Yann E. MORIN (3):
package/nut: new package
package/ser2net: add startup script and template config file
Makefile: fix out-of-tree builds with multiple targets with 'all'
mathieu benoit (2):
rpi: improve documentation
rpi: rename board folder for consistency
board/raspberrypi/readme.txt | 127 --------------------------------- board/rpi/readme.txt | 128 ++++++++++++++++++++++++++++++++++ package/Config.in | 1 + package/nut/Config.in | 20 ++++++ package/nut/nut-0001-foo-config.patch | 72 +++++++++++++++++++ package/nut/nut.mk | 79 +++++++++++++++++++++ package/ser2net/S50ser2net | 48 +++++++++++++ package/ser2net/ser2net.conf | 3 + package/ser2net/ser2net.mk | 9 +++ support/scripts/mkmakefile | 8 +-- 10 files changed, 364 insertions(+), 131 deletions(-) delete mode 100644 board/raspberrypi/readme.txt create mode 100644 board/rpi/readme.txt create mode 100644 package/nut/Config.in create mode 100644 package/nut/nut-0001-foo-config.patch create mode 100644 package/nut/nut.mk create mode 100644 package/ser2net/S50ser2net create mode 100644 package/ser2net/ser2net.conf
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/5 package/nut: new package
From: "Yann E. MORIN" <[email protected]>
'nut' are the Network UPS Tools.
[Note: original patch from Dallas, but completely revamped
by Yann, so nothing remains from the original patch, but two variable names.]
[yann.morin.1998 at free.fr: refresh patch, use latest version,
add license, fix commit message, add dependencies, fix runtime path, fix libs-config, move to 'system utils']
---
We're adding 2.6.5 since its the latest version released. git tree seems pretty active, but has done no release since 2.6.5, more than one year ago. Any one who cares about having a tagged release should poke upstream (Debian) to do a release one of those days...
--- package/Config.in | 1 + package/nut/Config.in | 20 +++++++++ package/nut/nut-0001-foo-config.patch | 72 +++++++++++++++++++++++++++++++ package/nut/nut.mk | 79 +++++++++++++++++++++++++++++++++++ 4 files changed, 172 insertions(+) create mode 100644 package/nut/Config.in create mode 100644 package/nut/nut-0001-foo-config.patch create mode 100644 package/nut/nut.mk
package/Config.in +1 -0
@@ -962,6 +962,7 @@ source "package/lxc/Config.in" source "package/monit/Config.in" source "package/ncdu/Config.in" source "package/numactl/Config.in" +source "package/nut/Config.in" source "package/polkit/Config.in" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/procps/Config.in"
package/nut/Config.in new file +20 -0
@@ -0,0 +1,20 @@ +config BR2_PACKAGE_NUT + bool "nut" + help + Network UPS tools + + The primary goal of the Network UPS Tools (NUT) project is to provide + support for Power Devices, such as Uninterruptible Power Supplies, + Power Distribution Units and Solar Controllers. + + http://www.networkupstools.org/ + +if BR2_PACKAGE_NUT + +config BR2_PACKAGE_NUT_DRIVERS + string "drivers" + help + Select the individual drivers to enable, in a comma-separated list. + Leave empty for all. + +endif # BR2_PACKAGE_NUT
package/nut/nut-0001-foo-config.patch new file +72 -0
72 lines not on this page · raw message
package/nut/nut.mk new file +79 -0
79 lines not on this page · raw message
Signature · 1 line
1.8.1.2
PATCH 1/5 package/nut: new package
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
From: "Yann E. MORIN" <[email protected]>
'nut' are the Network UPS Tools.
Quoted 8 lines
[Note: original patch from Dallas, but completely revamped
by Yann, so nothing remains from the original patch, but two variable names.]Signed-off-by Dallas Clement <[email protected]>[yann.morin.1998 at free.fr: refresh patch, use latest version,
add license, fix commit message, add dependencies, fix runtime path, fix libs-config, move to 'system utils']
I would probably have put it under hardware handling or networking myself, but OK - Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 2/5 package/ser2net: add startup script and template config file
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
The default config file we install is intentionally limited, but given the number of possible configurations (port number, method, serial port...) it is not posible to provide a simple one-fits-all config file.
Instead, just provide a minimalistic one, that the user may customise with a post-build script, or a rootfs overlay.
--- package/ser2net/S50ser2net | 48 ++++++++++++++++++++++++++++++++++++++++++++ package/ser2net/ser2net.conf | 3 +++ package/ser2net/ser2net.mk | 9 +++++++++ 3 files changed, 60 insertions(+) create mode 100644 package/ser2net/S50ser2net create mode 100644 package/ser2net/ser2net.conf
package/ser2net/S50ser2net new file +48 -0
@@ -0,0 +1,48 @@ +#! /bin/sh +# ser2net startup script + +# Author: Yann E. MORIN <[email protected]> + +PATH=/usr/sbin:/usr/bin:/sbin:/bin +NAME=ser2net +DAEMON=/usr/bin/$NAME +PIDFILE=/var/run/$NAME.pid + +[ -f "${DAEMON}" -a -x "${DAEMON}" ] || exit 0 + +# Read configuration variable file if it is present +[ -r "/etc/default/${NAME}" ] && . "/etc/default/${NAME}" + +ARGS="-c /etc/ser2net.conf -P ${PIDFILE}" +[ -z "${CONTROLPORT}" ] || ARGS="${ARGS} -p ${CONTROLPORT}" + +case "$1" in + start) + printf "Starting ser2net daemon: " + if start-stop-daemon -S -q -p ${PIDFILE} -m --exec "${DAEMON}" -- ${ARGS}; then + printf "OK\n" + else + printf "failed\n" + fi + ;; + stop) + printf "Stoping ser2net daemon: " + start-stop-daemon -K -q -p ${PIDFILE} -s TERM + sleep 2 + if start-stop-daemon -K -q -p ${PIDFILE} -t; then + printf "failed, killing: " + start-stop-daemon -K -q -p ${PIDFILE} -s KILL -o + fi + rm -f "${PIDFILE}" + printf "OK\n" + ;; + restart|force-reload) + "${0}" stop + sleep 2 + "${0}" start + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac
package/ser2net/ser2net.conf new file +3 -0
@@ -0,0 +1,3 @@ +#CONTROLPORT:1000 +BANNER:buildroot:Welcome to ser2net, running on Buildroot\r\n +2000:raw:600:/dev/ttyS1:9600 8DATABITS NONE 1STOPBIT buildroot
package/ser2net/ser2net.mk +9 -0
@@ -9,4 +9,13 @@ SER2NET_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net SER2NET_LICENSE = GPLv2+ SER2NET_LICENSE_FILES = COPYING +define SER2NET_INSTALL_INIT_SYSV + $(INSTALL) -m 0755 -D package/ser2net/S50ser2net $(TARGET_DIR)/etc/init.d/S50ser2net +endef + +define SER2NET_INSTALL_CONF + $(INSTALL) -m 0644 -D package/ser2net/ser2net.conf $(TARGET_DIR)/etc/ser2net.conf +endef +SER2NET_POST_INSTALL_TARGET_HOOKS += SER2NET_INSTALL_CONF + $(eval $(autotools-package))
Signature · 1 line
1.8.1.2
PATCH 2/5 package/ser2net: add startup script and template config file
Quoted 31 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
From: "Yann E. MORIN" <[email protected]>
The default config file we install is intentionally limited, but given the number of possible configurations (port number, method, serial port...) it is not posible to provide a simple one-fits-all config file.Instead, just provide a minimalistic one, that the user may customise with a post-build script, or a rootfs overlay.
Signed-off-by "Yann E. MORIN" <[email protected]>--- package/ser2net/S50ser2net | 48 ++++++++++++++++++++++++++++++++++++++++++++ package/ser2net/ser2net.conf | 3 +++ package/ser2net/ser2net.mk | 9 +++++++++ 3 files changed, 60 insertions(+) create mode 100644 package/ser2net/S50ser2net create mode 100644 package/ser2net/ser2net.confpackage/ser2net/S50ser2net new file +6
-0@@ -0,0 +1,48 @@ +#! /bin/sh +# ser2net startup script + +# Author: Yann E. MORIN <[email protected]> + +PATH=/usr/sbin:/usr/bin:/sbin:/bin
package/ser2net/S50ser2net line 16
Quoted 10 lines
package/ser2net/S50ser2net new file +10
-0+NAME=ser2net +DAEMON=/usr/bin/$NAME +PIDFILE=/var/run/$NAME.pid + +[ -f "${DAEMON}" -a -x "${DAEMON}" ] || exit 0 + +# Read configuration variable file if it is present +[ -r "/etc/default/${NAME}" ] && . "/etc/default/${NAME}" + +ARGS="-c /etc/ser2net.conf -P ${PIDFILE}"
What are people supposed to put in /etc/default/ser2net? CONTROLPORT=..? How about just letting people specify ARGS=..?
Looking at the man page, /etc/ser2net.conf seems to be default, so that can be dropped. You're using start-stop-daemon below, so I'm not quite sure what you are doing here with PIDFILE?
package/ser2net/S50ser2net line 22
Quoted 6 lines
package/ser2net/S50ser2net new file +6
-0+[ -z "${CONTROLPORT}" ] || ARGS="${ARGS} -p ${CONTROLPORT}" + +case "$1" in + start) + printf "Starting ser2net daemon: " + if start-stop-daemon -S -q -p ${PIDFILE} -m --exec "${DAEMON}" -- ${ARGS}; then
I believe you need to pass '-n' to ser2net to not get it to background itself (and get the correct pid in PIDFILE).
package/ser2net/S50ser2net line 35
Quoted 13 lines
package/ser2net/S50ser2net new file +13
-0+ printf "OK\n" + else + printf "failed\n" + fi + ;; + stop) + printf "Stoping ser2net daemon: " + start-stop-daemon -K -q -p ${PIDFILE} -s TERM + sleep 2 + if start-stop-daemon -K -q -p ${PIDFILE} -t; then + printf "failed, killing: " + start-stop-daemon -K -q -p ${PIDFILE} -s KILL -o + fi
Any particular reason why this is needed? A quick
git grep 'start-stop-daemon.*-K' shows that we're not doing anything like this anywhere else.
package/ser2net/S50ser2net line 42
Quoted 7 lines
package/ser2net/S50ser2net new file +7
-0+ rm -f "${PIDFILE}" + printf "OK\n" + ;; + restart|force-reload) + "${0}" stop + sleep 2 + "${0}" start
Why the sleep?
package/ser2net/S50ser2net line 45
Quoted 3 lines
package/ser2net/S50ser2net new file +3
-0+ ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
Where does $SCRIPTNAME come from? Why not just $0?
package/ser2net/ser2net.conf line 3
Quoted 12 lines
package/ser2net/S50ser2net new file +3
-0+ exit 1 + ;; +esacpackage/ser2net/ser2net.conf new file +3
-0@@ -0,0 +1,3 @@ +#CONTROLPORT:1000 +BANNER:buildroot:Welcome to ser2net, running on Buildroot\r\n +2000:raw:600:/dev/ttyS1:9600 8DATABITS NONE 1STOPBIT buildroot
CONTROLPORT doesn't seem to be valid in the configuration file according to the man page.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 3/5 rpi: improve documentation
In reply to Yann E. MORINFrom: mathieu benoit <[email protected]>
[yann.morin.1998 at free.fr: further improvements for readability and
completeness]
--- board/raspberrypi/readme.txt | 167 ++++++++++++++++++++++--------------------- 1 file changed, 84 insertions(+), 83 deletions(-)
board/raspberrypi/readme.txt +84 -83
@@ -4,124 +4,125 @@ Intro ===== To be able to use your RaspberryPi board with the images generated by -Buildroot, you have a prior choice to make, will you use: - - Volatile rootfs in RAM (The rootfs is an initramfs) or - - Persistent rootfs on the SDCard +Buildroot, you have to choose whether you will use: + + * Volatile rootfs in RAM (the rootfs is an initramfs) or + * Persistent rootfs on the SDCard Also, a good source of information is http://elinux.org/R-Pi_Hub -Volatile rootfs +How to build it =============== -How to build it ---------------- +Configure Buildroot +------------------- + +The rpi_defconfig configuration is a minimal configuration with all that +is required to bring the Raspberry Pi. You should base your work on this +defconfig: + + $ make rpi_defconfig + +If you want to use a persistent rootfs, skip to "Build the rootfs", below. + +For a volatile rootfs, you have to slightly adjust the configuration: + + $ make menuconfig + * Select "Filesystem images" + * Select "initial RAM filesystem linked into linux kernel" + +You may also deselect "tar the root filesystem". + +Build the rootfs +---------------- -You need to use the rpi_defconfig, to do so: - * make rpi_defconfig +Note: you will need to have access to the network, since Buildroot will +download the packages' sources. -Then, you need to select the kind of images you want: - * make menuconfig - * Select "Filesystem images" - * Select "initial RAM filesystem linked into linux kernel" +You may now build your rootfs with: -What is generated ------------------ + $ make + +(This may take a while; consider getting yourself a coffee ;-) ) + +Result of the build +------------------- After building, you should obtain this tree: output/images/ +-- rootfs.tar +-- rpi-firmware - |?? +-- bootcode.bin - |?? +-- config.txt - |?? +-- fixup_cd.dat - |?? +-- fixup.dat - |?? +-- start_cd.elf - |?? `-- start.elf + | +-- bootcode.bin + | +-- config.txt + | +-- fixup_cd.dat + | +-- fixup.dat + | +-- start_cd.elf + | `-- start.elf `-- zImage -Note : rootfs.tar will only be there if you kept "tar the root filesystem" -option selected in "Filesystem images". - -Where should the binaries be copied on the SDCard -------------------------------------------------- +Note for Volatile: rootfs.tar will only be there if you kept +"tar the root filesystem" option selected in "Filesystem images". -Your SDCard must have its first partition using fat32 and marked bootable. +Prepare you SDCard +================== -At the root of the partition, the RaspberryPi must find the following files: +For more information, visit +http://elinux.org/RPi_Advanced_Setup#Advanced_SD_card_setup - * bootcode.bin - * config.txt - * fixup_cd.dat - * fixup.dat - * start_cd.elf - * start.elf - * zImage +In summary, your SDCard must have first partition in fat32 and marked bootable. -So you should copy the entire content of output/images/rpi-firmware along with -zImage. +Create the required partitions: + - for a persistent rootfs, 10MiB is enough memory for the boot fat32 + partition, and a second partition is required for the root filesystem + - for a volatile rootfs, 50MiB is required for the boot fat32 partition Note: You can create any number of partitions you desire, the only requirement -is that the first partition must be using fat32 and bootable. +is that the first partition must be using fat32 and be bootable. -Persistent rootfs -================= - -How to build it ---------------- +Mount the partitions (adjust 'sdX' to match your SDcard device): -You only need to use the rpi_defconfig, to do so: - * make rpi_defconfig + $ sudo mount /dev/sdX1 /mnt/mountpointboot + $ sudo mount /dev/sdX2 /mnt/mountpointroot (only for persistent rootfs) -What is generated ------------------ +Install the binaries to the SDCard +---------------------------------- -After building, you should obtain this tree: +At the root of the boot partition, the RaspberryPi must find the following +files: - output/images/ - +-- rootfs.tar - +-- rpi-firmware - |?? +-- bootcode.bin - |?? +-- config.txt - |?? +-- fixup_cd.dat - |?? +-- fixup.dat - |?? +-- start_cd.elf - |?? `-- start.elf - `-- zImage + * bootcode.bin + * config.txt + * fixup.dat + * start.elf + * zImage -Where should the binaries be copied on the SDCard -------------------------------------------------- +For example: -Your SDCard must have its first partition using fat32 and marked bootable. -It should also have another partition which will contain your rootfs, it should -be partitioned as ext4. + $ cp output/images/rpi-firmware/* /mnt/mountpointboot + $ cp output/images/zImage /mnt/mountpointboot/zImage.img -Boot partition -~~~~~~~~~~~~~~ +Note: The default name is kernel.img. +Actually, the name is zImage and it's define in the file config.txt like: +kernel=zImage -The first partition will contain everything used to boot the RaspberryPi. -You must copy theses files at the root of partition: +If you use a volatile rootfs, Skip to "Finish", below. For a persistent +rootfs, there are further steps to do. - * bootcode.bin - * config.txt - * fixup_cd.dat - * fixup.dat - * start_cd.elf - * start.elf - * zImage +Extract (as root!) the contents of the rootfs.tar archive into the second +partition you created above: -So you should copy the entire content of output/images/rpi-firmware along with -zImage. + $ sudo tar xf rootfs.tar -C /mnt/mountpointroot -Rootfs partition -~~~~~~~~~~~~~~~~ +Finish +====== -The second partition will contain your rootfs. -Simply extract (as root!) the contents of the rootfs.tar archive -into this partition. +Unmount all the partitions: -For example: (Assuming mountpoint is a directory and exist) + $ sudo umount /mnt/mountpointboot + $ sudo umount /mnt/mountpointroot (only for persistent rootfs) - $ sudo mount /dev/sdXY /mnt/mountpoint - $ sudo tar xf rootfs.tar -C /mnt/mountpoint +And eject your SDcard from your computer SDcard reader. +Insert the SDcard into your Raspberry Pi, and power it up. Your new system +should come up, now.
Signature · 1 line
1.8.1.2
PATCH 3/5 rpi: improve documentation
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
From: mathieu benoit <[email protected]>
Signed-off-by Mathieu Benoit <[email protected]>[yann.morin.1998 at free.fr: further improvements for readability and
completeness]Signed-off-by "Yann E. MORIN" <[email protected]>--- board/raspberrypi/readme.txt | 167 ++++++++++++++++++++++--------------------- 1 file changed, 84 insertions(+), 83 deletions(-)
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 4/5 rpi: rename board folder for consistency
In reply to Yann E. MORINFrom: mathieu benoit <[email protected]>
All the Raspberry Pi files (packages and config) are prefix with "rpi", so rename the board directory to "rpi" for consistency.
---
board/{raspberrypi => rpi}/readme.txt | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename board/{raspberrypi => rpi}/readme.txt (100%)board/rpi/readme.txt renamed from board/raspberrypi/readme.txt +0 -0
Signature · 1 line
1.8.1.2
PATCH 4/5 rpi: rename board folder for consistency
Dear Yann E. MORIN,
Quoted 11 lines · Yann E. MORIN
From: mathieu benoit <[email protected]>
All the Raspberry Pi files (packages and config) are prefix with "rpi", so rename the board directory to "rpi" for consistency.
Signed-off-by Mathieu Benoit <[email protected]>Signed-off-by "Yann E. MORIN" <[email protected]>--- board/{raspberrypi => rpi}/readme.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename board/{raspberrypi => rpi}/readme.txt (100%)
I'm not sure I agree with this one. I find "rasberrypi" a lot more obvious for the new comer. Maybe our defconfig should also be called rasberrypi_defconfig.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 4/5 rpi: rename board folder for consistency
Thomas, All,
Quoted 13 lines · On Wednesday 06 November 2013 11:11:03 Thomas Petazzoni wrote:
Quoted 11 lines · Yann E. MORIN
From: mathieu benoit <[email protected]>
All the Raspberry Pi files (packages and config) are prefix with "rpi", so rename the board directory to "rpi" for consistency.
Signed-off-by Mathieu Benoit <[email protected]>Signed-off-by "Yann E. MORIN" <[email protected]>--- board/{raspberrypi => rpi}/readme.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename board/{raspberrypi => rpi}/readme.txt (100%)
Quoted 3 lines
I'm not sure I agree with this one. I find "rasberrypi" a lot more obvious for the new comer. Maybe our defconfig should also be called
rasberrypi_defconfig.
Well, 'rpi' is a very common nickname for the Raspberry Pi, so I don't think there will be confusion for a newcomer (to Buildroot).
On the other hand, all our other boards are using the full name, not a shortname/nickname, neither in board/ nor in configs/
So, in hindsight, I agree with Thomas here: we should use raspberrypi, not rpi.
I'll fix and resubmit.
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +0/33 662376056 | Software Designer | \ / CAMPAIGN | ^ | | --==< O_o >==-- '------------.-------: X AGAINST | /e\ There is no | | http://ymorin.is-a-geek.org/ | (*_*) | / \ HTML MAIL | """ conspiracy. | '------------------------------'-------'------------------'--------------------'
PATCH 4/5 rpi: rename board folder for consistency
Yann, Thomas, All,
"Yann E. MORIN" <[email protected]> wrote on 11/06/2013 04:26:20 AM:
Quoted 9 lines
Thomas, All,
Quoted 3 lines · On Wednesday 06 November 2013 11:11:03 Thomas Petazzoni wrote:
I'm not sure I agree with this one. I find "rasberrypi" a lot more obvious for the new comer. Maybe our defconfig should also be called
rasberrypi_defconfig.Well, 'rpi' is a very common nickname for the Raspberry Pi, so I don't think there will be confusion for a newcomer (to Buildroot).
I disagree, I was one who didn't really know what rpi stood for because to me that acronym has a completely different meaning. I believe I asked you to clarify what rpi stood for on the IRC. In order to make the leap to what rpi stood for I had to go to the git logs for the board/rpi directory. I guess the point being, I agree with Thomas (not that there is anything to argue here) and we should assume people are dumb (me included :) ) and we should try to eliminate potential confusion.
Thanks,
-Ryan
Quoted 7 lines
On the other hand, all our other boards are using the full name, not a shortname/nickname, neither in board/ nor in configs/
So, in hindsight, I agree with Thomas here: we should use raspberrypi, not rpi.
I'll fix and resubmit.
PATCH 5/5 Makefile: fix out-of-tree builds with multiple targets with 'all'
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
For out-of-tree builds, this use-case fails to build:
$ make clean all
This is because 'all' is filtered-out in the Makefile wrapper, since the wrapper itself has a 'all' target.
The 'all' target is just the usual naming for the default target in a Makefile. In fact, the first target is the default one, so we can name it whatever we want.
Rename the Makefile wrapper 'all' target to avoid name-clashing.
Fixes #6644.
--- support/scripts/mkmakefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
support/scripts/mkmakefile +4 -4
@@ -32,16 +32,16 @@ MAKEFLAGS += --no-print-directory .PHONY: all \$(MAKECMDGOALS) -all := \$(filter-out all Makefile,\$(MAKECMDGOALS)) +all := \$(filter-out Makefile,\$(MAKECMDGOALS)) -all: +_all: \$(MAKE) \$(MAKEARGS) \$(all) Makefile:; -\$(all): all +\$(all): _all @: -%/: all +%/: _all @: EOF
Signature · 1 line
1.8.1.2
PATCH 5/5 Makefile: fix out-of-tree builds with multiple targets with 'all'
Quoted 15 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
From: "Yann E. MORIN" <[email protected]> For out-of-tree builds, this use-case fails to build:
$ make clean allThis is because 'all' is filtered-out in the
Makefilewrapper, since the wrapper itself has a 'all' target.The 'all' target is just the usual naming for the default target in a
Makefile. In fact, the first target is the default one, so we can name it whatever we want.Rename the
Makefilewrapper 'all' target to avoid name-clashing.
Quoted 7 lines
Fixes #6644.
Reported-by Ryan Barnett <[email protected]>Signed-off-by "Yann E. MORIN" <[email protected]>Cc Ryan Barnett <[email protected]>Cc Thomas Petazzoni <[email protected]>Tested-by Ryan Barnett <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard