d-two/operating-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update buildroot v2020.02.4 (#811)

Browse Source 
* Update buildroot to 2020.02.4

Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>

* fix patches

Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
This commit is contained in:
Pascal Vizeli
2020-08-06 20:54:14 +02:00
committed by GitHub
parent 1f4bd67f7e
commit fa53c7bc99
239 changed files with 3051 additions and 938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
buildroot/support/download/git
View File

@@ -176,6 +176,19 @@ date="$( _git log -1 --pretty=format:%cD )"
# There might be submodules, so fetch them.
if [ ${recurse} -eq 1 ]; then
_git submodule update --init --recursive
# Older versions of git will store the absolute path of the git tree
# in the .git of submodules, while newer versions just use relative
# paths. Detect and fix the older variants to use relative paths, so
# that the archives are reproducible across a wider range of git
# versions. However, we can't do that if git is too old and uses
# full repositories for submodules.
cmd='printf "%s\n" "${path}/"'
for module_dir in $( _git submodule --quiet foreach "'${cmd}'" ); do
[ -f "${module_dir}/.git" ] || continue
relative_dir="$( sed -r -e 's,/+,/,g; s,[^/]+/,../,g' <<<"${module_dir}" )"
sed -r -i -e "s:^gitdir\: $(pwd)/:gitdir\: "${relative_dir}":" "${module_dir}/.git"
done
fi
# Generate the archive, sort with the C locale so that it is reproducible.

9
buildroot/support/scripts/br2-external
View File

@@ -33,9 +33,8 @@ main() {
# Trap any unexpected error to generate a meaningful error message
trap "error 'unexpected error while generating ${ofile}\n'" ERR
do_validate ${@//:/ }
mkdir -p "${outputdir}"
do_validate "${outputdir}" ${@//:/ }
do_mk "${outputdir}"
do_kconfig "${outputdir}"
}
@@ -51,7 +50,9 @@ main() {
# snippet means that there were no error.
#
do_validate() {
local outputdir="${1}"
local br2_ext
shift
if [ ${#} -eq 0 ]; then
# No br2-external tree is valid
@@ -60,7 +61,7 @@ do_validate() {
for br2_ext in "${@}"; do
do_validate_one "${br2_ext}"
done
done >"${outputdir}/.br2-external.mk"
}
do_validate_one() {
@@ -74,7 +75,7 @@ do_validate_one() {
error "'%s': permission denied\n" "${br2_ext}"
fi
if [ ! -f "${br2_ext}/external.desc" ]; then
error "'%s': does not have a name (in 'external.desc'). See %s\n" \
error "'%s': does not have an 'external.desc'. See %s\n" \
"${br2_ext}" "${MANUAL_URL}"
fi
br2_name="$(sed -r -e '/^name: +(.*)$/!d; s//\1/' "${br2_ext}/external.desc")"

2
buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/openjdk-hello-world.mk
View File

@@ -8,7 +8,7 @@ OPENJDK_HELLO_WORLD_DEPENDENCIES = openjdk
define OPENJDK_HELLO_WORLD_BUILD_CMDS
$(INSTALL) -D $(OPENJDK_HELLO_WORLD_PKGDIR)/HelloWorld.java $(@D)/HelloWorld.java
$(HOST_DIR)/bin/javac $(@D)/HelloWorld.java
$(JAVAC) $(@D)/HelloWorld.java
endef
define OPENJDK_HELLO_WORLD_INSTALL_TARGET_CMDS

2
buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/openjdk-jni-test.mk
View File

@@ -10,7 +10,7 @@ JNI_INCLUDE_PATH = $(BUILD_DIR)/openjdk-$(OPENJDK_VERSION)/build/linux-aarch64-s
define OPENJDK_JNI_TEST_BUILD_CMDS
# Compile Java classes and generate native headers
$(HOST_DIR)/bin/javac -d $(@D) -h $(@D) \
$(JAVAC) -d $(@D) -h $(@D) \
$(OPENJDK_JNI_TEST_PKGDIR)/JniTest.java \
$(OPENJDK_JNI_TEST_PKGDIR)/JniWrapper.java \
$(OPENJDK_JNI_TEST_PKGDIR)/JniHelper.java