From c27bc8c855879c45742546c7f038458e1ef2f817 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 29 Jul 2005 09:12:50 +0000 Subject: added ipkg 0.99.152 cleaned ipkg subdir (one copy of terse.patch is enough) --- packages/ipkg/ipkg-0.99.135/terse.patch | 18 ---------- packages/ipkg/ipkg-0.99.138/.mtn2git_empty | 0 packages/ipkg/ipkg-0.99.138/terse.patch | 18 ---------- packages/ipkg/ipkg-0.99.140/terse.patch | 18 ---------- packages/ipkg/ipkg-0.99.144/terse.patch | 18 ---------- packages/ipkg/ipkg-0.99.146/.mtn2git_empty | 0 packages/ipkg/ipkg-0.99.146/terse.patch | 18 ---------- packages/ipkg/ipkg-0.99.147/terse.patch | 18 ---------- packages/ipkg/ipkg-0.99.148/terse.patch | 18 ---------- packages/ipkg/ipkg-0.99.151/.mtn2git_empty | 0 packages/ipkg/ipkg-0.99.151/terse.patch | 18 ---------- packages/ipkg/ipkg-native_0.99.152.bb | 13 +++++++ packages/ipkg/ipkg/.mtn2git_empty | 0 packages/ipkg/ipkg/terse.patch | 18 ++++++++++ packages/ipkg/ipkg_0.99.152.bb | 54 ++++++++++++++++++++++++++++++ 15 files changed, 85 insertions(+), 144 deletions(-) delete mode 100644 packages/ipkg/ipkg-0.99.135/terse.patch delete mode 100644 packages/ipkg/ipkg-0.99.138/.mtn2git_empty delete mode 100644 packages/ipkg/ipkg-0.99.138/terse.patch delete mode 100644 packages/ipkg/ipkg-0.99.140/terse.patch delete mode 100644 packages/ipkg/ipkg-0.99.144/terse.patch delete mode 100644 packages/ipkg/ipkg-0.99.146/.mtn2git_empty delete mode 100644 packages/ipkg/ipkg-0.99.146/terse.patch delete mode 100644 packages/ipkg/ipkg-0.99.147/terse.patch delete mode 100644 packages/ipkg/ipkg-0.99.148/terse.patch delete mode 100644 packages/ipkg/ipkg-0.99.151/.mtn2git_empty delete mode 100644 packages/ipkg/ipkg-0.99.151/terse.patch create mode 100644 packages/ipkg/ipkg-native_0.99.152.bb create mode 100644 packages/ipkg/ipkg/.mtn2git_empty create mode 100644 packages/ipkg/ipkg/terse.patch create mode 100644 packages/ipkg/ipkg_0.99.152.bb (limited to 'packages/ipkg') diff --git a/packages/ipkg/ipkg-0.99.135/terse.patch b/packages/ipkg/ipkg-0.99.135/terse.patch deleted file mode 100644 index 3c4d6bed7e..0000000000 --- a/packages/ipkg/ipkg-0.99.135/terse.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- C/ipkg_cmd.c~terse -+++ C/ipkg_cmd.c -@@ -148,9 +146,7 @@ - int result; - p_userdata = userdata; - result = (cmd->fun)(conf, argc, argv); -- if ( result == 0 ) { -- ipkg_message(conf, IPKG_NOTICE, "Successfully terminated.\n"); -- } else { -+ if ( result != 0 ) { - ipkg_message(conf, IPKG_NOTICE, "An error ocurred, return value: %d.\n", result); - } - diff --git a/packages/ipkg/ipkg-0.99.138/.mtn2git_empty b/packages/ipkg/ipkg-0.99.138/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/ipkg/ipkg-0.99.138/terse.patch b/packages/ipkg/ipkg-0.99.138/terse.patch deleted file mode 100644 index 3c4d6bed7e..0000000000 --- a/packages/ipkg/ipkg-0.99.138/terse.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- C/ipkg_cmd.c~terse -+++ C/ipkg_cmd.c -@@ -148,9 +146,7 @@ - int result; - p_userdata = userdata; - result = (cmd->fun)(conf, argc, argv); -- if ( result == 0 ) { -- ipkg_message(conf, IPKG_NOTICE, "Successfully terminated.\n"); -- } else { -+ if ( result != 0 ) { - ipkg_message(conf, IPKG_NOTICE, "An error ocurred, return value: %d.\n", result); - } - diff --git a/packages/ipkg/ipkg-0.99.140/terse.patch b/packages/ipkg/ipkg-0.99.140/terse.patch deleted file mode 100644 index 3c4d6bed7e..0000000000 --- a/packages/ipkg/ipkg-0.99.140/terse.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- C/ipkg_cmd.c~terse -+++ C/ipkg_cmd.c -@@ -148,9 +146,7 @@ - int result; - p_userdata = userdata; - result = (cmd->fun)(conf, argc, argv); -- if ( result == 0 ) { -- ipkg_message(conf, IPKG_NOTICE, "Successfully terminated.\n"); -- } else { -+ if ( result != 0 ) { - ipkg_message(conf, IPKG_NOTICE, "An error ocurred, return value: %d.\n", result); - } - diff --git a/packages/ipkg/ipkg-0.99.144/terse.patch b/packages/ipkg/ipkg-0.99.144/terse.patch deleted file mode 100644 index 3c4d6bed7e..0000000000 --- a/packages/ipkg/ipkg-0.99.144/terse.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- C/ipkg_cmd.c~terse -+++ C/ipkg_cmd.c -@@ -148,9 +146,7 @@ - int result; - p_userdata = userdata; - result = (cmd->fun)(conf, argc, argv); -- if ( result == 0 ) { -- ipkg_message(conf, IPKG_NOTICE, "Successfully terminated.\n"); -- } else { -+ if ( result != 0 ) { - ipkg_message(conf, IPKG_NOTICE, "An error ocurred, return value: %d.\n", result); - } - diff --git a/packages/ipkg/ipkg-0.99.146/.mtn2git_empty b/packages/ipkg/ipkg-0.99.146/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/ipkg/ipkg-0.99.146/terse.patch b/packages/ipkg/ipkg-0.99.146/terse.patch deleted file mode 100644 index 3c4d6bed7e..0000000000 --- a/packages/ipkg/ipkg-0.99.146/terse.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- C/ipkg_cmd.c~terse -+++ C/ipkg_cmd.c -@@ -148,9 +146,7 @@ - int result; - p_userdata = userdata; - result = (cmd->fun)(conf, argc, argv); -- if ( result == 0 ) { -- ipkg_message(conf, IPKG_NOTICE, "Successfully terminated.\n"); -- } else { -+ if ( result != 0 ) { - ipkg_message(conf, IPKG_NOTICE, "An error ocurred, return value: %d.\n", result); - } - diff --git a/packages/ipkg/ipkg-0.99.147/terse.patch b/packages/ipkg/ipkg-0.99.147/terse.patch deleted file mode 100644 index 3c4d6bed7e..0000000000 --- a/packages/ipkg/ipkg-0.99.147/terse.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- C/ipkg_cmd.c~terse -+++ C/ipkg_cmd.c -@@ -148,9 +146,7 @@ - int result; - p_userdata = userdata; - result = (cmd->fun)(conf, argc, argv); -- if ( result == 0 ) { -- ipkg_message(conf, IPKG_NOTICE, "Successfully terminated.\n"); -- } else { -+ if ( result != 0 ) { - ipkg_message(conf, IPKG_NOTICE, "An error ocurred, return value: %d.\n", result); - } - diff --git a/packages/ipkg/ipkg-0.99.148/terse.patch b/packages/ipkg/ipkg-0.99.148/terse.patch deleted file mode 100644 index 3c4d6bed7e..0000000000 --- a/packages/ipkg/ipkg-0.99.148/terse.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- C/ipkg_cmd.c~terse -+++ C/ipkg_cmd.c -@@ -148,9 +146,7 @@ - int result; - p_userdata = userdata; - result = (cmd->fun)(conf, argc, argv); -- if ( result == 0 ) { -- ipkg_message(conf, IPKG_NOTICE, "Successfully terminated.\n"); -- } else { -+ if ( result != 0 ) { - ipkg_message(conf, IPKG_NOTICE, "An error ocurred, return value: %d.\n", result); - } - diff --git a/packages/ipkg/ipkg-0.99.151/.mtn2git_empty b/packages/ipkg/ipkg-0.99.151/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/ipkg/ipkg-0.99.151/terse.patch b/packages/ipkg/ipkg-0.99.151/terse.patch deleted file mode 100644 index 3c4d6bed7e..0000000000 --- a/packages/ipkg/ipkg-0.99.151/terse.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- C/ipkg_cmd.c~terse -+++ C/ipkg_cmd.c -@@ -148,9 +146,7 @@ - int result; - p_userdata = userdata; - result = (cmd->fun)(conf, argc, argv); -- if ( result == 0 ) { -- ipkg_message(conf, IPKG_NOTICE, "Successfully terminated.\n"); -- } else { -+ if ( result != 0 ) { - ipkg_message(conf, IPKG_NOTICE, "An error ocurred, return value: %d.\n", result); - } - diff --git a/packages/ipkg/ipkg-native_0.99.152.bb b/packages/ipkg/ipkg-native_0.99.152.bb new file mode 100644 index 0000000000..3011b32b75 --- /dev/null +++ b/packages/ipkg/ipkg-native_0.99.152.bb @@ -0,0 +1,13 @@ +SECTION = "base" +include ipkg_${PV}.bb + +# NOTE: ipkg now obeys ${libdir}, so ipkg-native now installs +# things into the wrong location inside of offline_root. Backup +# the target libdir and use that. +target_libdir := "${libdir}" + +inherit native + +DEPENDS = "libtool-native automake-native" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-${PV}" +PROVIDES = "" diff --git a/packages/ipkg/ipkg/.mtn2git_empty b/packages/ipkg/ipkg/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/ipkg/ipkg/terse.patch b/packages/ipkg/ipkg/terse.patch new file mode 100644 index 0000000000..3c4d6bed7e --- /dev/null +++ b/packages/ipkg/ipkg/terse.patch @@ -0,0 +1,18 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- C/ipkg_cmd.c~terse ++++ C/ipkg_cmd.c +@@ -148,9 +146,7 @@ + int result; + p_userdata = userdata; + result = (cmd->fun)(conf, argc, argv); +- if ( result == 0 ) { +- ipkg_message(conf, IPKG_NOTICE, "Successfully terminated.\n"); +- } else { ++ if ( result != 0 ) { + ipkg_message(conf, IPKG_NOTICE, "An error ocurred, return value: %d.\n", result); + } + diff --git a/packages/ipkg/ipkg_0.99.152.bb b/packages/ipkg/ipkg_0.99.152.bb new file mode 100644 index 0000000000..684ff784b3 --- /dev/null +++ b/packages/ipkg/ipkg_0.99.152.bb @@ -0,0 +1,54 @@ +SECTION = "base" +DESCRIPTION = "Itsy Package Manager" +DESCRIPTION_libipkg = "Itsy Package Manager Library" +LICENSE = "GPL" +PROVIDES = "virtual/ipkg libipkg" +PR = "r0" + +PACKAGES =+ "libipkg-dev libipkg" +FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so" +FILES_libipkg = "${libdir}" +AUTO_LIBNAME_PKGS = "libipkg" + +SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://terse.patch;patch=1 " + +S = "${WORKDIR}/ipkg/C" + +inherit autotools pkgconfig + +EXTRA_OECONF += "--with-ipkglibdir=/usr/lib" + +pkg_postinst_ipkg () { +#!/bin/sh +if [ "x$D" != "x" ]; then + install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d + # this happens at S98 where our good 'ole packages script used to run + echo -e "#!/bin/sh +ipkg-cl configure +" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure + chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure +fi + +update-alternatives --install ${bindir}/ipkg ipkg ${bindir}/ipkg-cl 100 +} + +pkg_postrm_ipkg () { +#!/bin/sh +update-alternatives --remove ipkg ${bindir}/ipkg-cl +} + +do_stage() { + oe_libinstall -so libipkg ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/replace/ + install -m 0644 replace/replace.h ${STAGING_INCDIR}/replace/ + install -d ${STAGING_INCDIR}/libipkg/ + for f in *.h + do + install -m 0644 $f ${STAGING_INCDIR}/libipkg/ + done +} + +# +# FIXME: Install /etc/ipkg.conf and /etc/ipkg/arch.conf +# -- cgit v1.2.3