diff options
Diffstat (limited to 'cross')
| -rwxr-xr-x | cross/armel/tizen-fetch.sh | 46 | ||||
| -rw-r--r-- | cross/armel/tizen/tizen.patch | 15 | ||||
| -rw-r--r-- | cross/armel/toolchain.cmake | 2 |
3 files changed, 25 insertions, 38 deletions
diff --git a/cross/armel/tizen-fetch.sh b/cross/armel/tizen-fetch.sh index 1252199481..a0fa72b7d7 100755 --- a/cross/armel/tizen-fetch.sh +++ b/cross/armel/tizen-fetch.sh @@ -51,7 +51,7 @@ if [ ! -d $TMPDIR ]; then mkdir -p $TMPDIR fi -TIZEN_URL=http://download.tizen.org/releases/weekly/tizen +TIZEN_URL=http://download.tizen.org/releases/daily/tizen BUILD_XML=build.xml REPOMD_XML=repomd.xml PRIMARY_XML=primary.xml @@ -120,19 +120,21 @@ fetch_tizen_pkgs_init() fetch_tizen_pkgs() { - PROFILE=$1 - PACKAGE_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]]/*[local-name()="location"]/@href)' + ARCH=$1 + PACKAGE_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="location"]/@href)' - PACKAGE_CHECKSUM_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]]/*[local-name()="checksum"]/text())' + PACKAGE_CHECKSUM_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="checksum"]/text())' for pkg in ${@:2} do Inform "Fetching... $pkg" XPATH=${PACKAGE_XPATH_TPL/_PKG_/$pkg} + XPATH=${XPATH/_ARCH_/$ARCH} Xpath_get $XPATH $TMP_PRIMARY PKG_PATH=$XPATH_RESULT XPATH=${PACKAGE_CHECKSUM_XPATH_TPL/_PKG_/$pkg} + XPATH=${XPATH/_ARCH_/$ARCH} Xpath_get $XPATH $TMP_PRIMARY CHECKSUM=$XPATH_RESULT @@ -142,33 +144,33 @@ fetch_tizen_pkgs() Debug "Download $PKG_URL to $PKG_PATH" Fetch $PKG_URL $PKG_PATH true - + echo "$CHECKSUM $PKG_PATH" | sha256sum -c - > /dev/null if [ $? -ne 0 ]; then Error "Fail to fetch $PKG_URL to $PKG_PATH" Debug "Checksum = $CHECKSUM" exit 1 fi - done } -Inform "Initialize arm base" +Inform "Initialize base" fetch_tizen_pkgs_init arm base -Inform "fetch base common packages" -fetch_tizen_pkgs base gcc glibc glibc-devel linux-glibc-devel -Inform "fetch base coreclr packages" -fetch_tizen_pkgs base lldb lldb-devel libuuid libuuid-devel libgcc libstdc++ libstdc++-devel -Inform "fetch base corefx packages" -fetch_tizen_pkgs base libcom_err libcom_err-devel zlib zlib-devel libopenssl libopenssl-devel - -Inform "initialize arm mobile" -fetch_tizen_pkgs_init arm-wayland mobile -Inform "fetch mobile common packages" -fetch_tizen_pkgs mobile libicu-devel -Inform "fetch mobile coreclr packages" -fetch_tizen_pkgs mobile libunwind libunwind-devel tizen-release -Inform "fetch mobile corefx packages" -fetch_tizen_pkgs mobile gssdp gssdp-devel krb5 krb5-devel libcurl libcurl-devel +Inform "fetch common packages" +fetch_tizen_pkgs armv7l gcc glibc glibc-devel +fetch_tizen_pkgs noarch linux-glibc-devel +Inform "fetch coreclr packages" +fetch_tizen_pkgs armv7l lldb lldb-devel libuuid libuuid-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel +Inform "fetch corefx packages" +fetch_tizen_pkgs armv7l libcom_err libcom_err-devel zlib zlib-devel libopenssl libopenssl-devel + +Inform "Initialize unified" +fetch_tizen_pkgs_init standard unified +Inform "fetch common packages" +fetch_tizen_pkgs armv7l libicu-devel +Inform "fetch coreclr packages" +fetch_tizen_pkgs armv7l tizen-release +Inform "fetch corefx packages" +fetch_tizen_pkgs armv7l gssdp gssdp-devel krb5 krb5-devel libcurl libcurl-devel diff --git a/cross/armel/tizen/tizen.patch b/cross/armel/tizen/tizen.patch index c92dc02809..d223427c97 100644 --- a/cross/armel/tizen/tizen.patch +++ b/cross/armel/tizen/tizen.patch @@ -16,18 +16,3 @@ diff -u -r a/usr/lib/libpthread.so b/usr/lib/libpthread.so OUTPUT_FORMAT(elf32-littlearm) -GROUP ( /lib/libpthread.so.0 /usr/lib/libpthread_nonshared.a ) +GROUP ( libpthread.so.0 libpthread_nonshared.a ) -diff -u -r a/usr/lib/libpthread.so b/usr/lib/libpthread.so ---- a/etc/os-release 2016-10-17 23:39:36.000000000 +0900 -+++ b/etc/os-release 2017-01-05 14:34:39.099867682 +0900 -@@ -1,7 +1,7 @@ - NAME=Tizen --VERSION="3.0.0 (Tizen3/Mobile)" -+VERSION="4.0.0 (Tizen4/Mobile)" - ID=tizen --VERSION_ID=3.0.0 --PRETTY_NAME="Tizen 3.0.0 (Tizen3/Mobile)" -+VERSION_ID=4.0.0 -+PRETTY_NAME="Tizen 4.0.0 (Tizen4/Mobile)" - ANSI_COLOR="0;36" --CPE_NAME="cpe:/o:tizen:tizen:3.0.0" -+CPE_NAME="cpe:/o:tizen:tizen:4.0.0" diff --git a/cross/armel/toolchain.cmake b/cross/armel/toolchain.cmake index ae3bd7c1ba..86e2306b61 100644 --- a/cross/armel/toolchain.cmake +++ b/cross/armel/toolchain.cmake @@ -16,7 +16,7 @@ set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -target ${TOOLCHAIN}") set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} --sysroot=${CROSS_ROOTFS}") if("$ENV{__DistroRid}" MATCHES "tizen.*") - set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/4.9.2") + set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/6.2.1") include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi) add_compile_options(-Wno-deprecated-declarations) # compile-time option |