From: jk7744.park Date: Tue, 8 Sep 2015 12:50:50 +0000 (+0900) Subject: tizen 2.3.1 release X-Git-Tag: submit/tizen_2.3.1/20150915.074140^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=df51c787d5153421cb46bc55bd15393e26d3968b;p=external%2Feglibc.git tizen 2.3.1 release --- diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..8947e72 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +timezone/* -whitespace diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fbdcf54 --- /dev/null +++ b/.gitignore @@ -0,0 +1,39 @@ +*~ +*.gz +*.Z +*.tar +*.tgz +*.bz2 +*.rej +*.orig +=* +TAGS +TODO +AUTHORS +copyr-* +copying.* +glibc-* + +configparms + +ieeetest +regex + +gpl2lgpl.sed +distinfo + +test-include +analysis +docs +releases + +libc.prj +.libc.prcs_aux +libc.proj +.snprj + +TODO.html + +autom4te*.cache + +rtkaio diff --git a/.svn-revision b/.svn-revision new file mode 100644 index 0000000..17f222f --- /dev/null +++ b/.svn-revision @@ -0,0 +1 @@ +12776 diff --git a/csu/.gitignore b/csu/.gitignore new file mode 100644 index 0000000..d8933cf --- /dev/null +++ b/csu/.gitignore @@ -0,0 +1 @@ +specs diff --git a/eglibc-common.manifest b/eglibc-common.manifest new file mode 100644 index 0000000..34308f6 --- /dev/null +++ b/eglibc-common.manifest @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/eglibc.manifest b/eglibc.manifest new file mode 100644 index 0000000..00c0b55 --- /dev/null +++ b/eglibc.manifest @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/nscd.manifest b/nscd.manifest new file mode 100644 index 0000000..97e8c31 --- /dev/null +++ b/nscd.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/packaging/build-locale-archive.c b/packaging/build-locale-archive.c old mode 100644 new mode 100755 diff --git a/packaging/eglibc-2.13-debian.patch.gz b/packaging/eglibc-2.13-debian.patch.gz old mode 100644 new mode 100755 diff --git a/packaging/eglibc.change b/packaging/eglibc.change index d9430d1..c8ae03e 100644 --- a/packaging/eglibc.change +++ b/packaging/eglibc.change @@ -1,2 +1,8 @@ +* Tue Nov 27 2012 Kwanwoo Nam - 2.13 +- Install locales which setting requested. + +* Wed Jun 6 2012 Junfeng Dong - 2.13 +- Anas' changes: Only install UTF locales of supported languages. + * Tue Jul 26 2011 Junfeng Dong - 2.13 - Import. diff --git a/packaging/eglibc.spec b/packaging/eglibc.spec index a2cdec5..bb5f6fe 100644 --- a/packaging/eglibc.spec +++ b/packaging/eglibc.spec @@ -1,5 +1,6 @@ %define multiarcharches %{ix86} x86_64 %define run_glibc_tests 0 +%define localepackage 0 Summary:a variant of the GNU C Library targetting embedded systems. Name: eglibc @@ -13,15 +14,17 @@ Release:1 License:LGPLv2+ and LGPLv2+ with exceptions and GPLv2+ Group: System/Libraries URL: http://www.eglibc.org -Source0: eglibc-2.13.tar.gz +Source0: eglibc-2.13.tar.bz2 Source1: manual.tar Source10: glibc_post_upgrade.c Source11: build-locale-archive.c Source12: tzdata-update.c +Source13: generate-supported.mk Patch1: slp-limit-hack.patch Patch2: eglibc-2.13-debian.patch.gz Patch3: glibc-arm-atomics-disable-qemu.patch +Patch4: use_fullpath.patch Provides: ldconfig # The dynamic linker supports DT_GNU_HASH @@ -107,10 +110,7 @@ Obsoletes: glibc-headers(i686) Obsoletes: %{name}-headers(i586) Obsoletes: %{name}-headers(i686) %endif -#Requires(pre): linux-headers -#Requires: linux-headers >= 2.2.1, %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release} -#BuildRequires: linux-headers >= 2.6.22 %description headers The glibc-headers package contains the header files necessary @@ -127,6 +127,9 @@ use the standard C libraries. Summary: Common binaries and locale data for glibc Requires: %{name} = %{version}-%{release} Requires: tzdata >= 2003a +Requires: grep +Requires: findutils +Requires: coreutils Group: System/Base Provides: glibc-common @@ -159,10 +162,11 @@ If unsure if you need this, don't install this package. %prep -%setup -q -%patch1 -p1 -%patch2 -p1 +%setup -q +%patch1 -p1 +%patch2 -p1 %patch3 -p1 +%patch4 -p1 # Hack here. rm -rf manual tar xf %SOURCE1 @@ -207,6 +211,9 @@ rm -rf $builddir mkdir $builddir ; cd $builddir ../configure CC="$GCC" CXX="$GXX" CFLAGS="$BuildFlags" \ --prefix=%{_prefix} \ + --bindir=%{_bindir} \ + --libdir=%{_libdir} \ + --libexecdir=%{_libexecdir} \ --enable-add-ons=nptl$AddOns --without-cvs $EnableKernel \ --with-headers=%{_prefix}/include \ --with-tls --with-__thread \ @@ -248,13 +255,33 @@ GCC=`cat Gcc` rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT -make -j1 install_root=$RPM_BUILD_ROOT install -C build-%{nptl_target_cpu}-linuxnptl PARALLELMFLAGS=-s -%ifnarch %{auxarches} + +mkdir -p %{buildroot}/usr/share/license +cp COPYING %{buildroot}/usr/share/license/%{name} +cp COPYING %{buildroot}/usr/share/license/%{name}-common +cp COPYING %{buildroot}/usr/share/license/%{name}-static +cp COPYING %{buildroot}/usr/share/license/%{name}-headers +cp COPYING %{buildroot}/usr/share/license/%{name}-utils +cp COPYING %{buildroot}/usr/share/license/nscd + +make install_root=$RPM_BUILD_ROOT install -C build-%{nptl_target_cpu}-linuxnptl PARALLELMFLAGS=-s +#%ifnarch %{auxarches} +%if localepackage +mkdir -p %{buildroot}/usr/lib/locale cd build-%{nptl_target_cpu}-linuxnptl && \ - make %{?_smp_mflags} install_root=$RPM_BUILD_ROOT install-locales -C ../localedata objdir=`pwd` && \ +# make %{?_smp_mflags} install_root=$RPM_BUILD_ROOT install-locales -C ../localedata objdir=`pwd` && \ + I18NPATH=../localedata GCONV_PATH=../iconvdata localedef --quiet -c -f UTF-8 -i C %{buildroot}/usr/lib/locale/C.UTF-8 cd .. + + make -f %{SOURCE13} IN=localedata/SUPPORTED \ + OUT=%{buildroot}/usr/share/i18n/SUPPORTED; %endif +# remove /usr/share/i18n unnecessary on the target device +if [ -d %{buildroot}/usr/share/i18n/ ]; then + rm -rf %{buildroot}/usr/share/i18n/ +fi + librtso=`basename $RPM_BUILD_ROOT/%{_lib}/librt.so.*` @@ -267,15 +294,13 @@ rm -f $RPM_BUILD_ROOT/%{_lib}/libNoVersion* cp -a bits/stdio-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/stdio-lock.h # And needs sanitizing as well. - - ln -sf libbsd-compat.a $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libbsd.a mkdir -p $RPM_BUILD_ROOT/etc/default # Take care of setuids # -- new security review sez that this shouldn't be needed anymore -#chmod 755 $RPM_BUILD_ROOT%{_prefix}/libexec/pt_chown +#chmod 755 $RPM_BUILD_ROOT%{_prefix}/%{_libexecdir}/pt_chown # This is for ncsd - in glibc 2.2 install -m 644 nscd/nscd.conf $RPM_BUILD_ROOT/etc @@ -392,17 +417,19 @@ sed -i -e '\|%{_prefix}/%{_lib}/lib.*\.a|d' \ -e '\|nscd|d' rpm.filelist grep '%{_prefix}/bin' < rpm.filelist >> common.filelist +%if localepackage grep '%{_prefix}/lib/locale' < rpm.filelist | grep -v /locale-archive.tmpl >> common.filelist -mkdir -p $RPM_BUILD_ROOT/%{_prefix}/libexec/ -mv -f build-%{nptl_target_cpu}-linuxnptl/login/pt_chown $RPM_BUILD_ROOT/%{_prefix}/libexec/ -echo '%{_prefix}/libexec/pt_chown' >> rpm.filelist -grep '%{_prefix}/libexec/pt_chown' < rpm.filelist >> common.filelist +%endif +mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/ +mv -f build-%{nptl_target_cpu}-linuxnptl/login/pt_chown $RPM_BUILD_ROOT/%{_libexecdir}/ +echo '%{_libexecdir}/pt_chown' >> rpm.filelist +grep '%{_libexecdir}/pt_chown' < rpm.filelist >> common.filelist grep '%{_prefix}/sbin/[^gi]' < rpm.filelist >> common.filelist grep '%{_prefix}/share' < rpm.filelist | grep -v '%{_prefix}/share/zoneinfo' >> common.filelist sed -i -e '\|%{_prefix}/bin|d' \ -e '\|%{_prefix}/lib/locale|d' \ - -e '\|%{_prefix}/libexec/pt_chown|d' \ + -e '\|%{_libexecdir}/pt_chown|d' \ -e '\|%{_prefix}/sbin/[^gi]|d' \ -e '\|%{_prefix}/share|d' rpm.filelist > nosegneg.filelist @@ -485,7 +512,7 @@ rm libpthread.a ar rcs libpthread.a libpthread.o rm libpthread.o # Delete the static libraries for profile. -ls *_p.a |xargs rm -f +ls *_p.a |xargs rm -f # Delete the static libraries for debug. ls ./debug/usr/lib/*.a |xargs rm -f popd @@ -516,6 +543,9 @@ touch $RPM_BUILD_ROOT/var/run/nscd/{socket,nscd.pid} mkdir -p $RPM_BUILD_ROOT/var/cache/ldconfig > $RPM_BUILD_ROOT/var/cache/ldconfig/aux-cache +mkdir -p $RPM_BUILD_ROOT/etc +cp -f nss/fixed-nsswitch.conf $RPM_BUILD_ROOT/etc/nsswitch.conf + %post -p /usr/sbin/glibc_post_upgrade.%{_target_cpu} %postun -p /sbin/ldconfig @@ -567,7 +597,7 @@ rm -f *.filelist* %verify(not md5 size mtime) %config(noreplace) /etc/localtime %verify(not md5 size mtime) %config(noreplace) /etc/ld.so.conf %dir /etc/ld.so.conf.d -%dir %{_prefix}/libexec/getconf +%dir %{_libexecdir}/getconf %dir %{_prefix}/%{_lib}/gconv %dir %attr(0700,root,root) /var/cache/ldconfig %attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/cache/ldconfig/aux-cache @@ -575,7 +605,9 @@ rm -f *.filelist* %doc README NEWS INSTALL FAQ BUGS NOTES PROJECTS CONFORMANCE %doc COPYING COPYING.LIB README.libm LICENSES %doc hesiod/README.hesiod - +/usr/share/license/%{name} +%manifest eglibc.manifest +%attr(0644,root,-) /etc/nsswitch.conf %ifnarch %{auxarches} %files -f common.filelist common @@ -583,22 +615,29 @@ rm -f *.filelist* %dir %{_prefix}/lib/locale %attr(0644,root,root) %verify(not md5 size mtime mode) %ghost %config(missingok,noreplace) %{_prefix}/lib/locale/locale-archive %dir %attr(755,root,root) /etc/default -%attr(4711,root,root) %{_prefix}/libexec/pt_chown +%attr(4711,root,root) %{_libexecdir}/pt_chown %doc documentation/* +/usr/share/license/%{name}-common +%manifest eglibc-common.manifest %files -f devel.filelist devel %defattr(-,root,root) %files -f static.filelist static %defattr(-,root,root) +/usr/share/license/%{name}-static %files -f headers.filelist headers %defattr(-,root,root) +/usr/share/license/%{name}-headers %files -f utils.filelist utils %defattr(-,root,root) +/usr/share/license/%{name}-utils %files -f nscd.filelist -n nscd +/usr/share/license/nscd +%manifest nscd.manifest %defattr(-,root,root) %config(noreplace) /etc/nscd.conf %config /etc/rc.d/init.d/nscd diff --git a/packaging/eglibc_2.13-10.diff.gz b/packaging/eglibc_2.13-10.diff.gz old mode 100644 new mode 100755 diff --git a/packaging/gcc-4.5_4.5.3-3.diff.gz b/packaging/gcc-4.5_4.5.3-3.diff.gz old mode 100644 new mode 100755 diff --git a/packaging/generate-supported.mk b/packaging/generate-supported.mk new file mode 100644 index 0000000..d2a28c2 --- /dev/null +++ b/packaging/generate-supported.mk @@ -0,0 +1,11 @@ +#!/usr/bin/make + +include $(IN) + +all: + rm -f $(OUT) + touch $(OUT) + for locale in $(SUPPORTED-LOCALES); do \ + [ $$locale = true ] && continue; \ + echo $$locale | sed 's,/, ,' >> $(OUT); \ + done diff --git a/packaging/glibc-arm-atomics-disable-qemu.patch b/packaging/glibc-arm-atomics-disable-qemu.patch old mode 100644 new mode 100755 diff --git a/packaging/glibc_post_upgrade.c b/packaging/glibc_post_upgrade.c old mode 100644 new mode 100755 diff --git a/packaging/manual.tar b/packaging/manual.tar old mode 100644 new mode 100755 diff --git a/packaging/slp-limit-hack.patch b/packaging/slp-limit-hack.patch old mode 100644 new mode 100755 diff --git a/packaging/tzdata-update.c b/packaging/tzdata-update.c old mode 100644 new mode 100755 diff --git a/packaging/use_fullpath.patch b/packaging/use_fullpath.patch new file mode 100644 index 0000000..92595d8 --- /dev/null +++ b/packaging/use_fullpath.patch @@ -0,0 +1,43 @@ +diff --git a/debug/catchsegv.sh b/debug/catchsegv.sh +index 58427a3..4fbfa14 100755 +--- a/debug/catchsegv.sh ++++ b/debug/catchsegv.sh +@@ -51,7 +51,7 @@ Written by Ulrich Drepper.' + esac + fi + +-segv_output=`mktemp ${TMPDIR:-/tmp}/segv_output.XXXXXX` || exit ++segv_output=`/bin/mktemp ${TMPDIR:-/tmp}/segv_output.XXXXXX` || exit + + # Redirect stderr to avoid termination message from shell. + (exec 3>&2 2>/dev/null +@@ -84,15 +84,15 @@ if test -s "$segv_output"; then + IFS=$old_IFS + ;; + esac +- sed '/Backtrace/q' "$segv_output" +- sed '1,/Backtrace/d' "$segv_output" | ++ /bin/sed '/Backtrace/q' "$segv_output" ++ /bin/sed '1,/Backtrace/d' "$segv_output" | + (while read line; do +- line=`echo $line | sed "s@^$prog\\(\\[.*\\)@\1@"` ++ line=`echo $line | /bin/sed "s@^$prog\\(\\[.*\\)@\1@"` + case "$line" in +- \[*) addr=`echo "$line" | sed 's/^\[\(.*\)\]$/\1/'` +- complete=`addr2line -f -e "$prog" $addr 2>/dev/null` ++ \[*) addr=`echo "$line" | /bin/sed 's/^\[\(.*\)\]$/\1/'` ++ complete=`/usr/bin/addr2line -f -e "$prog" $addr 2>/dev/null` + if test $? -eq 0; then +- echo "`echo "$complete"|sed 'N;s/\(.*\)\n\(.*\)/\2(\1)/;'`$line" ++ echo "`echo "$complete"| /bin/sed 'N;s/\(.*\)\n\(.*\)/\2(\1)/;'`$line" + else + echo "$line" + fi +@@ -102,6 +102,6 @@ if test -s "$segv_output"; then + esac + done) + fi +-rm -f "$segv_output" ++/bin/rm -f "$segv_output" + + exit $exval diff --git a/po/.gitignore b/po/.gitignore new file mode 100644 index 0000000..37752e3 --- /dev/null +++ b/po/.gitignore @@ -0,0 +1,2 @@ +*.mo +libc.pot.files