Skip to contentSkip to conversation

recipes: add chkconfig and dependecies

PATCH Applied Kang Kai 2 participants 5 messages Mar 3, 2011 – Mar 4, 2011

lore
Share & tools
lore

Kang Kai

author
#0 lore raw

cover recipes: add chkconfig and dependecies

From: Kang Kai <[email protected]>

Add chkconfig for lsb command test, because lsb will check 2 commands install_initd and remove_initd linked to command chkconfig.
slang and newt are depencies both from OE.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: kangkai/distro01
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/distro01

Thanks,
Kang Kai <[email protected]>
---

Kang Kai (3):
recipe: add chkconfig for LSB command test
recipe: add newt from OE
recipe: add slang from OE

 .../recipes-extended/chkconfig/chkconfig_1.3.49.bb |   27 ++++++++
 .../newt/files/include-without-python.patch        |   71 ++++++++++++++++++++
 meta/recipes-extended/newt/libnewt_0.52.12.bb      |   37 ++++++++++
 meta/recipes-extended/slang/slang/fix-uclibc.patch |   11 +++
 meta/recipes-extended/slang/slang_2.2.2.bb         |   25 +++++++
 5 files changed, 171 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-extended/chkconfig/chkconfig_1.3.49.bb
 create mode 100644 meta/recipes-extended/newt/files/include-without-python.patch
 create mode 100644 meta/recipes-extended/newt/libnewt_0.52.12.bb
 create mode 100644 meta/recipes-extended/slang/slang/fix-uclibc.patch
 create mode 100644 meta/recipes-extended/slang/slang_2.2.2.bb
author
#1 lore raw

PATCH 1/3 recipe: add chkconfig for LSB command test

From: Kang Kai <[email protected]>

chkconfig is a system tool for maintaining the /etc/rc*.d hierarchy, and LSB command test will check 2 links point to command chkconfig

---
 .../recipes-extended/chkconfig/chkconfig_1.3.49.bb |   27 ++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-extended/chkconfig/chkconfig_1.3.49.bb
meta/recipes-extended/chkconfig/chkconfig_1.3.49.bb new file +27 -0
new file mode 100644
index 0000000..bbaba71
@@ -0,0 +1,27 @@
+SUMMARY = "A system tool for maintaining the /etc/rc*.d hierarchy"
+
+DESCRIPTION = "Chkconfig is a basic system utility.  It updates and queries runlevel \
+information for system services.  Chkconfig manipulates the numerous \
+symbolic links in /etc/rc.d, to relieve system administrators of some \
+of the drudgery of manually editing the symbolic links."
+
+HOMEPAGE = "http://fedorahosted.org/releases/c/h/chkconfig"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018"
+
+DEPENDS = "libnewt gettext popt"
+
+PR = "r0"
+
+SRC_URI = "http://fedorahosted.org/releases/c/h/chkconfig/${P}.tar.bz2"
+SRC_URI[md5sum] = "9b5e91d25f4f3b21f4c0bdf55a721431"
+SRC_URI[sha256sum] = "775100a9d6f70fbd8f33ed24b560b6842161fc496c21b1fc6d2aed646f9d855f"
+
+inherit autotools
+
+do_install_append() {
+#    mkdir -p ${D}/etc/rc.d/init.d
+#   mkdir -p  ${D}/etc/rc.d/rc{0,1,2,3,4,5,6}.d
+    mkdir -p ${D}/etc/chkconfig.d
+}
Signature · 1 line
1.7.1
author
#2 lore raw

PATCH 2/3 recipe: add newt from OE

In reply to Kang Kai

From: Kang Kai <[email protected]>

newt is a library for text mode user interfaces, and required by chkconfig because of LSB command test.

---
 .../newt/files/include-without-python.patch        |   71 ++++++++++++++++++++
 meta/recipes-extended/newt/libnewt_0.52.12.bb      |   37 ++++++++++
 2 files changed, 108 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-extended/newt/files/include-without-python.patch
 create mode 100644 meta/recipes-extended/newt/libnewt_0.52.12.bb
meta/recipes-extended/newt/files/include-without-python.patch new file +71 -0
new file mode 100644
index 0000000..277ee33
@@ -0,0 +1,71 @@
+From 3d13bbbb769050fac4cc6c904c174edc27e4f03d Mon Sep 17 00:00:00 2001
+From: Otavio Salvador <[email protected]>
+Date: Thu, 20 Jan 2011 14:14:51 -0200
+Subject: [PATCH] build: add -without-python
+
+Signed-off-by: Otavio Salvador <[email protected]>
+---
+ Makefile.in  |    8 ++++----
+ configure.ac |   10 ++++++++--
+ 2 files changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index e764e61..74e9097 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -77,7 +77,7 @@ showkey:	showkey.o $(LIBNEWT)
+ 	$(CC) -g -o showkey showkey.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
+ 
+ _snackmodule.so:   snackmodule.c $(LIBNEWTSH)
+-	for ver in $(PYTHONVERS) ; do \
++	[ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS) ; do \
+ 	    	mkdir -p $$ver ;\
+ 			PCFLAGS=`$$ver-config --cflags`; \
+ 			PIFLAGS=`$$ver-config --includes`; \
+@@ -85,7 +85,7 @@ _snackmodule.so:   snackmodule.c $(LIBNEWTSH)
+ 			PLFLAGS=`$$ver-config --libs`; \
+ 	        $(CC) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snackmodule.o snackmodule.c ;\
+ 	        $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L.  -lnewt $(LIBS);\
+-	done
++	done || :
+ 	touch $@
+ 
+ whiptail: $(NDIALOGOBJS) $(LIBNEWTSH)
+@@ -141,11 +141,11 @@ install-sh: sharedlib $(WHIPTCLSO) _snackmodule.so
+ 	ln -sf $(LIBNEWTSONAME) $(instroot)/$(libdir)/libnewt.so
+ 	ln -sf $(LIBNEWTSH) $(instroot)/$(libdir)/$(LIBNEWTSONAME)
+ 	[ -n "$(WHIPTCLSO)" ] && install -m 755 whiptcl.so $(instroot)/$(libdir) || :
+-	for ver in $(PYTHONVERS) ; do \
++	[ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS) ; do \
+ 	   [ -d $(instroot)/$(libdir)/$$ver/site-packages ] || install -m 755 -d $(instroot)/$(libdir)/$$ver/site-packages ;\
+ 	   install -m 755 $$ver/_snackmodule.so $(instroot)/$(libdir)/$$ver/site-packages ;\
+ 	   install -m 644 snack.py $(instroot)/$(libdir)/$$ver/site-packages ;\
+-	done
++	done || :
+ 
+ Makefile: newt.spec
+ 	echo "You need to rerun ./configure before continuing"
+diff --git a/configure.ac b/configure.ac
+index 7bc381a..dc04352 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,8 +54,14 @@ fi
+ AC_CHECK_HEADERS([popt.h libintl.h])
+ 
+ AC_MSG_CHECKING([for python versions])
+-PYTHONVERS=$(echo /usr/include/python*/Python.h | sed "s|/usr/include/||g"| sed "s|/Python.h||g" 2> /dev/null)
+-AC_MSG_RESULT([$PYTHONVERS])
++AC_ARG_WITH([python], [  --without-python        do not compile python support])
++if test "x$with_python" = "xno"; then
++  AC_MSG_RESULT([skipped])
++  PYTHONVERS=
++else
++  PYTHONVERS=$(ls /usr/include/python*/Python.h 2> /dev/null | sed "s|/usr/include/||g"| sed "s|/Python.h||g" 2> /dev/null)
++  AC_MSG_RESULT([$PYTHONVERS])
++fi
+ AC_SUBST([PYTHONVERS])
+ 
+ AC_ARG_WITH([tcl], [  --without-tcl           do not compile whiptcl.so])
+-- 
+1.7.2.3
+
meta/recipes-extended/newt/libnewt_0.52.12.bb new file +37 -0
new file mode 100644
index 0000000..eefd6bd
@@ -0,0 +1,37 @@
+SUMMARY = "A library for text mode user interfaces"
+
+DESCRIPTION = "Newt is a programming library for color text mode, widget based user \
+interfaces.  Newt can be used to add stacked windows, entry widgets, \
+checkboxes, radio buttons, labels, plain text fields, scrollbars, \
+etc., to text mode user interfaces.  This package also contains the \
+shared library needed by programs built with newt, as well as a \
+/usr/bin/dialog replacement called whiptail.  Newt is based on the \
+slang library."
+
+HOMEPAGE = "https://fedorahosted.org/newt/"
+SECTION = "libs"
+
+LICENSE = "LGPL"
+LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
+
+# slang needs to be >= 2.2
+DEPENDS = "slang popt"
+
+PR = "r0"
+
+SRCREV = "c3c7be75f6ef1adfc2be5f99c1e8ef3f0ab58c38"
+SRC_URI = "git://git.fedorahosted.org/git/newt;protocol=git \
+           file://include-without-python.patch"
+S = "${WORKDIR}/git"
+
+EXTRA_OECONF = "--without-python --without-tcl"
+
+inherit autotools
+
+PACKAGES_prepend = "whiptail "
+
+do_configure_prepend() {
+    sh autogen.sh
+}
+
+FILES_whiptail = "${bindir}/whiptail"
Signature · 1 line
1.7.1
author
#3 lore raw

PATCH 3/3 recipe: add slang from OE

In reply to Kang Kai

From: Kang Kai <[email protected]>

slang is the shared library for the S-Lang extension language, and required by newt because of LSB command check

---
 meta/recipes-extended/slang/slang/fix-uclibc.patch |   11 ++++++++
 meta/recipes-extended/slang/slang_2.2.2.bb         |   25 ++++++++++++++++++++
 2 files changed, 36 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-extended/slang/slang/fix-uclibc.patch
 create mode 100644 meta/recipes-extended/slang/slang_2.2.2.bb
meta/recipes-extended/slang/slang/fix-uclibc.patch new file +11 -0
new file mode 100644
index 0000000..c2b8225
@@ -0,0 +1,11 @@
+--- slang-2.1.3.orig/src/slcommon.c	2007-01-10 18:09:07.000000000 +0200
++++ slang-2.1.3.orig/src/slcommon.c	2008-03-19 16:09:09.000000000 +0200
+@@ -191,7 +191,7 @@ 
+    return p;
+ }
+ 
+-#if !defined(HAVE_ISSETUGID) && defined(__GLIBC__) && (__GLIBC__ >= 2)
++#if !defined(HAVE_ISSETUGID) && defined(__GLIBC__) && (__GLIBC__ >= 2) && !defined(__UCLIBC__)
+ extern int __libc_enable_secure;
+ # define HAVE___LIBC_ENABLE_SECURE 1
+ #endif
meta/recipes-extended/slang/slang_2.2.2.bb new file +25 -0
new file mode 100644
index 0000000..7fe76af
@@ -0,0 +1,25 @@
+SUMMARY = "The shared library for the S-Lang extension language"
+
+DESCRIPTION = "S-Lang is an interpreted language and a programming library.  The \
+S-Lang language was designed so that it can be easily embedded into \
+a program to provide the program with a powerful extension language. \
+The S-Lang library, provided in this package, provides the S-Lang \
+extension language.  S-Lang's syntax resembles C, which makes it easy \
+to recode S-Lang procedures in C if you need to."
+
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "pcre"
+PR = "r0"
+
+LICENSE = "GPL Artistic"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
+
+
+SRC_URI = "ftp://space.mit.edu/pub/davis/slang/v2.2/OLD/slang-${PV}.tar.bz2 \
+           file://fix-uclibc.patch"
+
+inherit autotools
+
+SRC_URI[md5sum] = "974437602a781cfe92ab61433dd16d03"
+SRC_URI[sha256sum] = "cfaf8551fa3855f9b0043309bb553ef6d457f931b404df5a6ba6a5a69371fc42"
Signature · 1 line
1.7.1
Applied
#4 lore raw
In reply to Kang Kai
Quoted 32 lines · Kang Kai

From: Kang Kai<[email protected]>

Add chkconfig for lsb command test, because lsb will check 2 commands install_initd and remove_initd linked to command chkconfig.
slang and newt are depencies both from OE.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: kangkai/distro01
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/distro01

Thanks,
Kang Kai<[email protected]>
---

Kang Kai (3):
recipe: add chkconfig for LSB command test
recipe: add newt from OE
recipe: add slang from OE

  .../recipes-extended/chkconfig/chkconfig_1.3.49.bb |   27 ++++++++
  .../newt/files/include-without-python.patch        |   71 ++++++++++++++++++++
  meta/recipes-extended/newt/libnewt_0.52.12.bb      |   37 ++++++++++
  meta/recipes-extended/slang/slang/fix-uclibc.patch |   11 +++
  meta/recipes-extended/slang/slang_2.2.2.bb         |   25 +++++++
  5 files changed, 171 insertions(+), 0 deletions(-)

create mode 100644 meta/recipes-extended/chkconfig/chkconfig_1.3.49.bb create mode 100644 meta/recipes-extended/newt/files/include-without-python.patch create mode 100644 meta/recipes-extended/newt/libnewt_0.52.12.bb create mode 100644 meta/recipes-extended/slang/slang/fix-uclibc.patch create mode 100644 meta/recipes-extended/slang/slang_2.2.2.bb

Quoted 5 lines

_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky

Merged into OE-Core and Bernard,

I also added chkconfig to the task-poky-lsb.bb

Thanks
Sau!