Commit e37189e2 authored by Alessandro Rubini's avatar Alessandro Rubini Committed by Adam Wujek

MAKEALL: force preferred ppsi configuration for each wrpc configuration

Also, preserve and restore current configuration, so I don't get mad
when checking with MAKEALL during my tests for new feature.

The rationale for this is that wrpc-sw will soon select different ppsi
choices according to its own configuration, through $(PPSI-CFG-y).
Actually, it already does for the host process build.

MAKEALL must obey this choice, so we trim ppsi configuration
each time we reconfigure wrpc (removing the file would spit an
error instead).

Then, our Makefile forces a ppsi reconfig if ppsi/.config is missing
*or* empty.
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent c7d2c711
#!/bin/sh
# A trivial script to build with all known configurations
# (please add a configs/ file to test your special case
# (please add a file in confifs/ to test your special case)
T=$(mktemp /tmp/wrpc-config.XXXXXX)
TW=$(mktemp /tmp/save-dotconfig-wrpc.XXXXXX)
TP=$(mktemp /tmp/save-dotconfig-ppsi.XXXXXX)
test -f .config && cp .config $TW
test -f ppsi/.config && cp ppsi/.config $TP
configs=$(cd configs; echo *_defconfig)
if [ $# -ne 0 ]; then
......@@ -11,11 +15,18 @@ fi
for c in $configs; do
echo "##### Building with '$c'"
make -s clean; rm ppsi/.config; touch ppsi/.config
if ! make $c 2>&1 >> $T; then
echo "Error in configuration (see $T)"
exit 1
fi
make -s clean
make -s
# Remove "# configuration written to .config" from output
make -s | grep -v '^#'
done
rm $T
\ No newline at end of file
make -s clean
# Recover local configs
cp $TW .config; rm $TW
cp $TP ppsi/.config; rm $TP
rm $T
......@@ -137,7 +137,7 @@ PPSI-CFG-$(CONFIG_HOST_PROCESS) = unix_defconfig
PPSI-FLAGS-$(CONFIG_LM32) = CONFIG_NO_PRINTF=y
$(obj-ppsi):
test -f $(PPSI)/.config || $(MAKE) -C $(PPSI) $(PPSI-CFG-y)
test -s $(PPSI)/.config || $(MAKE) -C $(PPSI) $(PPSI-CFG-y)
$(MAKE) -C $(PPSI) ppsi.o WRPCSW_ROOT=.. \
CROSS_COMPILE=$(CROSS_COMPILE) CONFIG_NO_PRINTF=y
USER_CFLAGS="$(PPSI_USER_CFLAGS)"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment