diff options
| author | Chris Larson <kergoth@openedhand.com> | 2006-09-19 09:04:09 +0000 |
|---|---|---|
| committer | Chris Larson <kergoth@openedhand.com> | 2006-09-19 09:04:09 +0000 |
| commit | 4fa2d11bb1fdb58ff426114169583672fc3d65b8 (patch) | |
| tree | 0bd4952bbe057c3dc219be7e371a6a9d496c6535 /meta/packages/ipkg | |
| parent | 04f695333350e31fa87b7822c17a073af73fcd84 (diff) | |
| download | openembedded-core-4fa2d11bb1fdb58ff426114169583672fc3d65b8.tar.gz openembedded-core-4fa2d11bb1fdb58ff426114169583672fc3d65b8.tar.bz2 openembedded-core-4fa2d11bb1fdb58ff426114169583672fc3d65b8.tar.xz openembedded-core-4fa2d11bb1fdb58ff426114169583672fc3d65b8.zip | |
Sync up.. all the deb/dpkg changes which I have locally are now in svn.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@728 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/ipkg')
| -rw-r--r-- | meta/packages/ipkg/files/noupdalt.patch | 15 | ||||
| -rw-r--r-- | meta/packages/ipkg/ipkg-native.inc | 2 | ||||
| -rw-r--r-- | meta/packages/ipkg/ipkg.inc | 4 | ||||
| -rw-r--r-- | meta/packages/ipkg/ipkg_0.99.154.bb | 2 |
4 files changed, 20 insertions, 3 deletions
diff --git a/meta/packages/ipkg/files/noupdalt.patch b/meta/packages/ipkg/files/noupdalt.patch new file mode 100644 index 000000000..f668e82f6 --- /dev/null +++ b/meta/packages/ipkg/files/noupdalt.patch @@ -0,0 +1,15 @@ +--- + Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +--- C.orig/Makefile.am ++++ C/Makefile.am +@@ -10,8 +10,6 @@ bin_PROGRAMS = ipkg-cl + + lib_LTLIBRARIES = libipkg.la + +-bin_SCRIPTS = update-alternatives +- + # ipkg_LDADD = libbb/libbb.a replace/libreplace.a + + #ipkg_cl_LDADD = libipkg.la libbb/libbb.la replace/libreplace.a diff --git a/meta/packages/ipkg/ipkg-native.inc b/meta/packages/ipkg/ipkg-native.inc index b52b7b5e2..070086a63 100644 --- a/meta/packages/ipkg/ipkg-native.inc +++ b/meta/packages/ipkg/ipkg-native.inc @@ -7,6 +7,6 @@ inherit native EXTRA_OECONF += "--with-ipkgdir=${target_libdir}/ipkg" -DEPENDS = "libtool-native automake-native" +DEPENDS = "libtool-native automake-native virtual/update-alternatives" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-${PV}" PROVIDES = "" diff --git a/meta/packages/ipkg/ipkg.inc b/meta/packages/ipkg/ipkg.inc index 49bdd22c0..e72ece633 100644 --- a/meta/packages/ipkg/ipkg.inc +++ b/meta/packages/ipkg/ipkg.inc @@ -5,13 +5,15 @@ LICENSE = "GPL" PROVIDES = "virtual/ipkg libipkg" PACKAGES =+ "libipkg-dev libipkg" +RDEPENDS_${PN} += "update-alternatives" 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://fix_tar_extension.patch;patch=1 \ - file://terse.patch;patch=1" + file://terse.patch;patch=1 \ + file://noupdalt.patch;patch=1" S = "${WORKDIR}/ipkg/C" diff --git a/meta/packages/ipkg/ipkg_0.99.154.bb b/meta/packages/ipkg/ipkg_0.99.154.bb index 20a199665..eb36fa67c 100644 --- a/meta/packages/ipkg/ipkg_0.99.154.bb +++ b/meta/packages/ipkg/ipkg_0.99.154.bb @@ -1,2 +1,2 @@ require ipkg.inc -PR = "r4" +PR = "r5" |