From b2f192faabe412adce79534e22efe9fb69ee40e2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 21 Jul 2006 10:10:31 +0000 Subject: Rename /openembedded/ -> /meta/ git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- openembedded/packages/ipkg/files/terse.patch | 18 ------- openembedded/packages/ipkg/files/uclibc.patch | 13 ----- .../packages/ipkg/files/uninclude-replace.patch | 10 ---- openembedded/packages/ipkg/ipkg-collateral.bb | 23 --------- .../packages/ipkg/ipkg-collateral/akita/dest | 4 -- .../packages/ipkg/ipkg-collateral/akita/lists | 4 -- .../packages/ipkg/ipkg-collateral/collie/dest | 4 -- openembedded/packages/ipkg/ipkg-collateral/dest | 1 - .../ipkg/ipkg-collateral/ipkg.conf.comments | 23 --------- .../packages/ipkg/ipkg-collateral/jornada56x/dest | 4 -- openembedded/packages/ipkg/ipkg-collateral/lists | 2 - .../packages/ipkg/ipkg-collateral/openmn/src | 1 - .../packages/ipkg/ipkg-collateral/poodle/dest | 4 -- .../packages/ipkg/ipkg-collateral/simpad/dest | 3 -- openembedded/packages/ipkg/ipkg-collateral/src | 0 .../packages/ipkg/ipkg-collateral/tosa/dest | 4 -- openembedded/packages/ipkg/ipkg-native.inc | 12 ----- openembedded/packages/ipkg/ipkg-native_0.99.154.bb | 2 - openembedded/packages/ipkg/ipkg.inc | 56 ---------------------- openembedded/packages/ipkg/ipkg_0.99.154.bb | 2 - 20 files changed, 190 deletions(-) delete mode 100644 openembedded/packages/ipkg/files/terse.patch delete mode 100644 openembedded/packages/ipkg/files/uclibc.patch delete mode 100644 openembedded/packages/ipkg/files/uninclude-replace.patch delete mode 100644 openembedded/packages/ipkg/ipkg-collateral.bb delete mode 100644 openembedded/packages/ipkg/ipkg-collateral/akita/dest delete mode 100644 openembedded/packages/ipkg/ipkg-collateral/akita/lists delete mode 100644 openembedded/packages/ipkg/ipkg-collateral/collie/dest delete mode 100644 openembedded/packages/ipkg/ipkg-collateral/dest delete mode 100644 openembedded/packages/ipkg/ipkg-collateral/ipkg.conf.comments delete mode 100644 openembedded/packages/ipkg/ipkg-collateral/jornada56x/dest delete mode 100644 openembedded/packages/ipkg/ipkg-collateral/lists delete mode 100644 openembedded/packages/ipkg/ipkg-collateral/openmn/src delete mode 100644 openembedded/packages/ipkg/ipkg-collateral/poodle/dest delete mode 100644 openembedded/packages/ipkg/ipkg-collateral/simpad/dest delete mode 100644 openembedded/packages/ipkg/ipkg-collateral/src delete mode 100644 openembedded/packages/ipkg/ipkg-collateral/tosa/dest delete mode 100644 openembedded/packages/ipkg/ipkg-native.inc delete mode 100644 openembedded/packages/ipkg/ipkg-native_0.99.154.bb delete mode 100644 openembedded/packages/ipkg/ipkg.inc delete mode 100644 openembedded/packages/ipkg/ipkg_0.99.154.bb (limited to 'openembedded/packages/ipkg') diff --git a/openembedded/packages/ipkg/files/terse.patch b/openembedded/packages/ipkg/files/terse.patch deleted file mode 100644 index 3c4d6bed7..000000000 --- a/openembedded/packages/ipkg/files/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/openembedded/packages/ipkg/files/uclibc.patch b/openembedded/packages/ipkg/files/uclibc.patch deleted file mode 100644 index d0d3a3ff7..000000000 --- a/openembedded/packages/ipkg/files/uclibc.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: C/libbb/libbb.h -=================================================================== ---- C.orig/libbb/libbb.h 2003-02-24 10:31:52.000000000 -0500 -+++ C/libbb/libbb.h 2005-01-20 03:07:10.031420944 -0500 -@@ -340,7 +340,7 @@ - #define CONSOLE_DEV "/dev/console" - - /* Cope with mmu-less systems somewhat gracefully */ --#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_MMU__) -+#if defined(__UCLIBC__) && !defined(__ARCH_HAS_MMU__) - #define fork vfork - #endif - diff --git a/openembedded/packages/ipkg/files/uninclude-replace.patch b/openembedded/packages/ipkg/files/uninclude-replace.patch deleted file mode 100644 index a3ed2201f..000000000 --- a/openembedded/packages/ipkg/files/uninclude-replace.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- C/includes.h 2003-03-28 19:36:22.000000000 +0000 -+++ C/includes.h 2004-07-28 03:41:11.000000000 +0100 -@@ -48,6 +48,6 @@ - # include - #endif - --#include "replace/replace.h" -+//#include "replace/replace.h" - - #endif diff --git a/openembedded/packages/ipkg/ipkg-collateral.bb b/openembedded/packages/ipkg/ipkg-collateral.bb deleted file mode 100644 index a4f7bb7e3..000000000 --- a/openembedded/packages/ipkg/ipkg-collateral.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "ipkg configuration files" -SECTION = "base" -LICENSE = "MIT" -PR = "r2" - -SRC_URI = " \ -file://ipkg.conf.comments \ -file://lists \ -file://dest \ -file://src \ -" - -do_compile () { - cat ${WORKDIR}/ipkg.conf.comments >${WORKDIR}/ipkg.conf - cat ${WORKDIR}/src >>${WORKDIR}/ipkg.conf - cat ${WORKDIR}/dest >>${WORKDIR}/ipkg.conf - cat ${WORKDIR}/lists >>${WORKDIR}/ipkg.conf -} - -do_install () { - install -d ${D}${sysconfdir}/ - install -m 0644 ${WORKDIR}/ipkg.conf ${D}${sysconfdir}/ipkg.conf -} diff --git a/openembedded/packages/ipkg/ipkg-collateral/akita/dest b/openembedded/packages/ipkg/ipkg-collateral/akita/dest deleted file mode 100644 index 647490d30..000000000 --- a/openembedded/packages/ipkg/ipkg-collateral/akita/dest +++ /dev/null @@ -1,4 +0,0 @@ -dest root / -dest home /home/packages/ -dest cf /media/cf/packages/ -dest sd /media/card/packages/ diff --git a/openembedded/packages/ipkg/ipkg-collateral/akita/lists b/openembedded/packages/ipkg/ipkg-collateral/akita/lists deleted file mode 100644 index cc776c595..000000000 --- a/openembedded/packages/ipkg/ipkg-collateral/akita/lists +++ /dev/null @@ -1,4 +0,0 @@ - -# Uncomment to move ipkg server-data into RAM -# lists_dir ext /var/lib/ipkg - diff --git a/openembedded/packages/ipkg/ipkg-collateral/collie/dest b/openembedded/packages/ipkg/ipkg-collateral/collie/dest deleted file mode 100644 index c76101a5b..000000000 --- a/openembedded/packages/ipkg/ipkg-collateral/collie/dest +++ /dev/null @@ -1,4 +0,0 @@ -dest root / -dest cf /media/cf/packages/ -dest sd /media/card/packages/ -dest ram /media/ram/packages/ diff --git a/openembedded/packages/ipkg/ipkg-collateral/dest b/openembedded/packages/ipkg/ipkg-collateral/dest deleted file mode 100644 index 088ca403d..000000000 --- a/openembedded/packages/ipkg/ipkg-collateral/dest +++ /dev/null @@ -1 +0,0 @@ -dest root / diff --git a/openembedded/packages/ipkg/ipkg-collateral/ipkg.conf.comments b/openembedded/packages/ipkg/ipkg-collateral/ipkg.conf.comments deleted file mode 100644 index 51623f4d5..000000000 --- a/openembedded/packages/ipkg/ipkg-collateral/ipkg.conf.comments +++ /dev/null @@ -1,23 +0,0 @@ -# Must have one or more source entries of the form: -# -# src -# -# and one or more destination entries of the form: -# -# dest -# -# where and are identifiers that -# should match [a-zA-Z0-9._-]+, should be a -# URL that points to a directory containing a Familiar -# Packages file, and should be a directory -# that exists on the target system. - -# Proxy Support -#option http_proxy http://proxy.tld:3128 -#option ftp_proxy http://proxy.tld:3128 -#option proxy_username -#option proxy_password - -# Offline mode (for use in constructing flash images offline) -#option offline_root target - diff --git a/openembedded/packages/ipkg/ipkg-collateral/jornada56x/dest b/openembedded/packages/ipkg/ipkg-collateral/jornada56x/dest deleted file mode 100644 index 154ce5758..000000000 --- a/openembedded/packages/ipkg/ipkg-collateral/jornada56x/dest +++ /dev/null @@ -1,4 +0,0 @@ -dest root / -dest cf /mnt/cf/packages/ -dest sd /mnt/card/packages/ -dest ram /mnt/ram/packages/ diff --git a/openembedded/packages/ipkg/ipkg-collateral/lists b/openembedded/packages/ipkg/ipkg-collateral/lists deleted file mode 100644 index 3c524f8c7..000000000 --- a/openembedded/packages/ipkg/ipkg-collateral/lists +++ /dev/null @@ -1,2 +0,0 @@ -lists_dir ext /var/lib/ipkg - diff --git a/openembedded/packages/ipkg/ipkg-collateral/openmn/src b/openembedded/packages/ipkg/ipkg-collateral/openmn/src deleted file mode 100644 index 97cdd4741..000000000 --- a/openembedded/packages/ipkg/ipkg-collateral/openmn/src +++ /dev/null @@ -1 +0,0 @@ -src mnci54 http://www.mn-solutions.de/feed/mnci54/base diff --git a/openembedded/packages/ipkg/ipkg-collateral/poodle/dest b/openembedded/packages/ipkg/ipkg-collateral/poodle/dest deleted file mode 100644 index 9379964e5..000000000 --- a/openembedded/packages/ipkg/ipkg-collateral/poodle/dest +++ /dev/null @@ -1,4 +0,0 @@ -dest root / -dest cf /media/cf/packages/ -dest sd /media/card/packages/ -dest home /home/packages/ diff --git a/openembedded/packages/ipkg/ipkg-collateral/simpad/dest b/openembedded/packages/ipkg/ipkg-collateral/simpad/dest deleted file mode 100644 index 20d03ba82..000000000 --- a/openembedded/packages/ipkg/ipkg-collateral/simpad/dest +++ /dev/null @@ -1,3 +0,0 @@ -dest root / -dest cf /mnt/cf/packages/ -dest ram /mnt/ram/packages/ diff --git a/openembedded/packages/ipkg/ipkg-collateral/src b/openembedded/packages/ipkg/ipkg-collateral/src deleted file mode 100644 index e69de29bb..000000000 diff --git a/openembedded/packages/ipkg/ipkg-collateral/tosa/dest b/openembedded/packages/ipkg/ipkg-collateral/tosa/dest deleted file mode 100644 index c76101a5b..000000000 --- a/openembedded/packages/ipkg/ipkg-collateral/tosa/dest +++ /dev/null @@ -1,4 +0,0 @@ -dest root / -dest cf /media/cf/packages/ -dest sd /media/card/packages/ -dest ram /media/ram/packages/ diff --git a/openembedded/packages/ipkg/ipkg-native.inc b/openembedded/packages/ipkg/ipkg-native.inc deleted file mode 100644 index b52b7b5e2..000000000 --- a/openembedded/packages/ipkg/ipkg-native.inc +++ /dev/null @@ -1,12 +0,0 @@ -# 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 - -EXTRA_OECONF += "--with-ipkgdir=${target_libdir}/ipkg" - -DEPENDS = "libtool-native automake-native" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-${PV}" -PROVIDES = "" diff --git a/openembedded/packages/ipkg/ipkg-native_0.99.154.bb b/openembedded/packages/ipkg/ipkg-native_0.99.154.bb deleted file mode 100644 index d59eab3a6..000000000 --- a/openembedded/packages/ipkg/ipkg-native_0.99.154.bb +++ /dev/null @@ -1,2 +0,0 @@ -include ipkg_${PV}.bb -include ipkg-native.inc diff --git a/openembedded/packages/ipkg/ipkg.inc b/openembedded/packages/ipkg/ipkg.inc deleted file mode 100644 index 8fc6c9efe..000000000 --- a/openembedded/packages/ipkg/ipkg.inc +++ /dev/null @@ -1,56 +0,0 @@ -DESCRIPTION = "Itsy Package Manager" -DESCRIPTION_libipkg = "Itsy Package Manager Library" -SECTION = "base" -LICENSE = "GPL" -PROVIDES = "virtual/ipkg libipkg" - -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 - -# Define a variable to allow distros to run configure earlier. -# (for example, to enable loading of ethernet kernel modules before networking starts) -IPKG_INIT_POSITION = "98" -IPKG_INIT_POSITION_slugos = "41" - -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/S${IPKG_INIT_POSITION}configure - chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${IPKG_INIT_POSITION}configure -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 -# diff --git a/openembedded/packages/ipkg/ipkg_0.99.154.bb b/openembedded/packages/ipkg/ipkg_0.99.154.bb deleted file mode 100644 index de6af147b..000000000 --- a/openembedded/packages/ipkg/ipkg_0.99.154.bb +++ /dev/null @@ -1,2 +0,0 @@ -include ipkg.inc -PR = "r3" -- cgit v1.2.3