mirror of
https://gitlab.com/prpl-foundation/prplmesh/prplMesh.git
synced 2025-12-20 01:21:22 +08:00
1c8b5e1cb0
Building IPK from tools/builder/openwrt/scripts/build.sh is done as
follows:
make package/feeds/prpl/prplmesh/prepare USE_SOURCE_DIR="/home/openwrt/prplMesh" V=s
make package/feeds/prpl/prplmesh/compile V=sc -j"$(nproc)"
The prplMesh revision comes out wrong since the REVISION variable is
passed from the OpenWRT package Makefile AND is exported by the OpenWRT
build system anyway.
This is simply confusing since the revision showing in the logs, and in
the config/version file, are wrong.
In order to fix this, the feed Makefile needs to be modified not to pass
REVISION when USE_SOURCE_DIR is defined, but in addition, prplmesh build
system should use a unique variable for the revision otherwise it will get
the REVISION exported by the OpenWRT build system.
This commit changes REVISION to PRPLMESH_REVISION so that it will use
the revision passed from the OpenWRT feed Makefile.
Also, since this commit requires a change in the feed, update it as well
in the build script - relevant commit in the feed:
6265989f2c.
Signed-off-by: Tomer Eliyahu <tomer.b.eliyahu@intel.com>
10 lines
359 B
CMake
Executable File
10 lines
359 B
CMake
Executable File
add_definitions(-DBEEROCKS_VERSION="${prplmesh_VERSION}")
|
|
add_definitions(-DBEEROCKS_BUILD_DATE="${BUILD_DATE}")
|
|
add_definitions(-DBEEROCKS_REVISION="${PRPLMESH_REVISION}")
|
|
|
|
add_definitions(-DBEEROCKS_BIN_PATH="${INSTALL_PATH}/bin/")
|
|
add_definitions(-DBEEROCKS_CONF_PATH="${INSTALL_PATH}/config/")
|
|
|
|
add_subdirectory("src/beerocks")
|
|
add_subdirectory("config")
|