- solve tizen-coreutils for opensuse 12.2 (remove man).
authorronan <ronan@ronan-pc.(none)>
Thu, 2 May 2013 11:01:35 +0000 (13:01 +0200)
committerronan <ronan@ronan-pc.(none)>
Thu, 2 May 2013 11:01:35 +0000 (13:01 +0200)
README
meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils-extraconf.inc
meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils/man.Makefile.am.patch [new file with mode: 0644]
meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils/tizen-coreutils.spec.patch [new file with mode: 0644]

diff --git a/README b/README
index 264489f..446115d 100644 (file)
--- a/README
+++ b/README
@@ -13,10 +13,10 @@ for fedora:
    - makeinfo is provide by texinfo.
 
 # for opensuse 12.2
-# zypper in make gcc gcc-c++ patch diffstat makeinfo chrpath python-ncurses python-pysqlite wget sudo glibc-locale
+# zypper in make gcc gcc-c++ patch diffstat makeinfo chrpath python-curses python-pysqlite wget sudo glibc-locale
 
 # for opensuse 12.3
-# zypper in make gcc gcc-c++ patch diffstat makeinfo chrpath python-ncurses python-pysqlite wget sudo glibc-locale
+# zypper in make gcc gcc-c++ patch diffstat makeinfo chrpath python-curses python-pysqlite wget sudo glibc-locale
 
 2) install unp 
 ### for opensuse 
index e69de29..5ea5989 100644 (file)
@@ -0,0 +1,11 @@
+SRC_URI += "file://man.Makefile.am.patch \
+            file://tizen-coreutils.spec.patch \
+           "
+
+do_patch_append () {
+ echo RLM begining of do_patch
+ cat ${WORKDIR}/man.Makefile.am.patch | patch -s -p1 --fuzz=2
+ cat ${WORKDIR}/tizen-coreutils.spec.patch | patch -s -p1 --fuzz=2
+
+ echo RLM end of do_patch
+}
diff --git a/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils/man.Makefile.am.patch b/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils/man.Makefile.am.patch
new file mode 100644 (file)
index 0000000..109c2bd
--- /dev/null
@@ -0,0 +1,45 @@
+diff --git a/man/Makefile.am b/man/Makefile.am
+index 32df9d1..a89f4c7 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -164,13 +164,7 @@ mapped_name = `echo $*|sed 's/install/ginstall/; s/test/[/'`
+                rm -rf $t;                                     \
+                mkdir $t;                                      \
+                (cd $t && $(LN_S) ../../src/$(mapped_name) $*); \
+-                  $(PERL) -- $(srcdir)/help2man               \
+-                   --source='$(PACKAGE_STRING)'               \
+-                   --include=$(srcdir)/$*.x                   \
+-                   --output=$t/$@ $t/$*;                      \
+              }                                                \
+-          && sed 's|$*\.td/||g' $t/$@ > $@                    \
+-          && chmod a-w $@                                     \
+           && rm -rf $t ;;                                     \
+       esac
+diff --git a/man/Makefile.in b/man/Makefile.in
+index f75b88b..65a01df 100644
+--- a/man/Makefile.in
++++ b/man/Makefile.in
+@@ -589,7 +589,7 @@ install-man1: $(man1_MANS) $(man_MANS)
+         inst=`echo $$inst | sed -e 's/^.*\///'`; \
+         inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+         echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+-        $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
++        #$(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
+       done
+ uninstall-man1:
+       @$(NORMAL_UNINSTALL)
+@@ -862,13 +862,7 @@ yes.1:            $(common_dep)   $(srcdir)/yes.x         ../src/yes.c
+                rm -rf $t;                                     \
+                mkdir $t;                                      \
+                (cd $t && $(LN_S) ../../src/$(mapped_name) $*); \
+-                  $(PERL) -- $(srcdir)/help2man               \
+-                   --source='$(PACKAGE_STRING)'               \
+-                   --include=$(srcdir)/$*.x                   \
+-                   --output=$t/$@ $t/$*;                      \
+              }                                                \
+-          && sed 's|$*\.td/||g' $t/$@ > $@                    \
+-          && chmod a-w $@                                     \
+           && rm -rf $t ;;                                     \
+       esac
diff --git a/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils/tizen-coreutils.spec.patch b/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils/tizen-coreutils.spec.patch
new file mode 100644 (file)
index 0000000..4e5f5d2
--- /dev/null
@@ -0,0 +1,13 @@
+diff --git a/packaging/tizen-coreutils.spec b/packaging/tizen-coreutils.spec
+index 7b60ead..9715037 100644
+--- a/packaging/tizen-coreutils.spec
++++ b/packaging/tizen-coreutils.spec
+@@ -64,7 +64,7 @@ mv %{buildroot}{%{_bindir},%{_sbindir}}/chroot
+ # These come from util-linux and/or procps.
+ for i in hostname uptime kill ; do
+-    rm %{buildroot}{%{_bindir}/$i,%{_mandir}/man1/$i.1}
++    rm -f %{buildroot}{%{_bindir}/$i,%{_mandir}/man1/$i.1}
+ done
+ # Use hard links instead of symbolic links for LC_TIME files (bug #246729).