From: Khem Raj <raj.khem@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [PATCH 9/9] Recipes: Replace ipkg-utils with opkg-utils
Date: Mon, 24 Jan 2011 22:25:45 -0800 [thread overview]
Message-ID: <1295936745-718-10-git-send-email-raj.khem@gmail.com> (raw)
In-Reply-To: <1295936745-718-1-git-send-email-raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../blueprobe/files/blueprobe-svn-Makefile.patch | 4 ++--
recipes/gpe-today/files/Makefile.dpkg_ipkg | 2 +-
recipes/gpe-today/files/Makefile.translation | 4 ++--
recipes/libxsettings/files/Makefile.dpkg_ipkg | 2 +-
recipes/libxsettings/files/Makefile.translation | 4 ++--
recipes/masqmail/masqmail_0.2.21.bb | 2 +-
recipes/meta/canadian-sdk.bb | 2 +-
recipes/meta/meta-toolchain.bb | 2 +-
recipes/meta/nylon-feed.bb | 2 +-
recipes/xserver-common/files/Makefile.dpkg_ipkg | 2 +-
recipes/xserver-common/files/Makefile.translation | 4 ++--
11 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/recipes/blueprobe/files/blueprobe-svn-Makefile.patch b/recipes/blueprobe/files/blueprobe-svn-Makefile.patch
index b51b465..a6d4f24 100644
--- a/recipes/blueprobe/files/blueprobe-svn-Makefile.patch
+++ b/recipes/blueprobe/files/blueprobe-svn-Makefile.patch
@@ -99,7 +99,7 @@ diff -Naur blueprobe.orig/Makefile.dpkg_ipkg blueprobe/Makefile.dpkg_ipkg
+ if test -e familiar/postrm; then install familiar/postrm familiar/dist/CONTROL; fi
+ $(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program
+ rm -rf familiar/dist.list
-+ ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list
++ opkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list
+ if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi
+ md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch
+ rm -rf familiar/dist familiar/dist.list
@@ -146,7 +146,7 @@ diff -Naur blueprobe.orig/Makefile.translation blueprobe/Makefile.translation
+CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi`
+
+# use ipkg-build or ipkg-deb-build
-+IPKG_BUILD := ipkg-build
++IPKG_BUILD := opkg-build
+
+TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint
+
diff --git a/recipes/gpe-today/files/Makefile.dpkg_ipkg b/recipes/gpe-today/files/Makefile.dpkg_ipkg
index 978b08d..ebf41fe 100644
--- a/recipes/gpe-today/files/Makefile.dpkg_ipkg
+++ b/recipes/gpe-today/files/Makefile.dpkg_ipkg
@@ -74,7 +74,7 @@ ipkg: check-source ipkg-prep clean
if test -e familiar/postrm; then install familiar/postrm familiar/dist/CONTROL; fi
$(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program
rm -rf familiar/dist.list
- ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list
+ opkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list
if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi
md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch
rm -rf familiar/dist familiar/dist.list
diff --git a/recipes/gpe-today/files/Makefile.translation b/recipes/gpe-today/files/Makefile.translation
index 1ca7d64..6ce30b4 100644
--- a/recipes/gpe-today/files/Makefile.translation
+++ b/recipes/gpe-today/files/Makefile.translation
@@ -2,8 +2,8 @@
CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi`
-# use ipkg-build or ipkg-deb-build
-IPKG_BUILD := ipkg-build
+# use opkg-build or opkg-deb-build
+IPKG_BUILD := opkg-build
TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint
diff --git a/recipes/libxsettings/files/Makefile.dpkg_ipkg b/recipes/libxsettings/files/Makefile.dpkg_ipkg
index 76c5321..771ed8b 100644
--- a/recipes/libxsettings/files/Makefile.dpkg_ipkg
+++ b/recipes/libxsettings/files/Makefile.dpkg_ipkg
@@ -74,7 +74,7 @@ ipkg: check-source ipkg-prep clean
if test -e familiar/postrm; then install familiar/postrm familiar/dist/CONTROL; fi
$(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program
rm -rf familiar/dist.list
- ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list
+ opkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list
if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi
md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch
rm -rf familiar/dist familiar/dist.list
diff --git a/recipes/libxsettings/files/Makefile.translation b/recipes/libxsettings/files/Makefile.translation
index 1ca7d64..6ce30b4 100644
--- a/recipes/libxsettings/files/Makefile.translation
+++ b/recipes/libxsettings/files/Makefile.translation
@@ -2,8 +2,8 @@
CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi`
-# use ipkg-build or ipkg-deb-build
-IPKG_BUILD := ipkg-build
+# use opkg-build or opkg-deb-build
+IPKG_BUILD := opkg-build
TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint
diff --git a/recipes/masqmail/masqmail_0.2.21.bb b/recipes/masqmail/masqmail_0.2.21.bb
index 94a742d..e632239 100644
--- a/recipes/masqmail/masqmail_0.2.21.bb
+++ b/recipes/masqmail/masqmail_0.2.21.bb
@@ -25,7 +25,7 @@ MAIL_GROUP ?= "mail"
EXTRA_OECONF += "--with-user=$(id -u)"
EXTRA_OECONF += "--with-group=$(id -g)"
-IPKGBUILDCMD = "ipkg-build -o ${MAIL_USER} -g ${MAIL_GROUP}"
+OPKGBUILDCMD = "opkg-build -o ${MAIL_USER} -g ${MAIL_GROUP}"
SRC_URI[md5sum] = "7e989a8b0562054aea22c654507f2cb5"
SRC_URI[sha256sum] = "2257099c760c12daf094744c6b2269d476e3bc6b523366168ad81bdd2ebd2445"
diff --git a/recipes/meta/canadian-sdk.bb b/recipes/meta/canadian-sdk.bb
index 93b80b2..0d914f7 100644
--- a/recipes/meta/canadian-sdk.bb
+++ b/recipes/meta/canadian-sdk.bb
@@ -91,7 +91,7 @@ do_populate_sdk() {
if [ -e $pkgnames ]; then
oenote "Found $pkgnames"
cp $pkgnames ${SDK_OUTPUT}/${prefix}/ipk/
- orig_pkg=`ipkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2`
+ orig_pkg=`opkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2`
pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}
mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime
cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/
diff --git a/recipes/meta/meta-toolchain.bb b/recipes/meta/meta-toolchain.bb
index b8ea037..3462b2c 100644
--- a/recipes/meta/meta-toolchain.bb
+++ b/recipes/meta/meta-toolchain.bb
@@ -96,7 +96,7 @@ do_populate_sdk() {
if [ -e $pkgnames ]; then
oenote "Found $pkgnames"
cp $pkgnames ${SDK_OUTPUT2}/${SDKPATH}/ipk/
- orig_pkg=`ipkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2`
+ orig_pkg=`opkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2`
pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}
mkdir -p ${SDK_OUTPUT2}/${SDKPATH}/pkgdata/$pkg_subdir/runtime
cp ${TMPDIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT2}/${SDKPATH}/pkgdata/$pkg_subdir/
diff --git a/recipes/meta/nylon-feed.bb b/recipes/meta/nylon-feed.bb
index d5759ae..d68f5f8 100644
--- a/recipes/meta/nylon-feed.bb
+++ b/recipes/meta/nylon-feed.bb
@@ -39,7 +39,7 @@ RDEPENDS = "${NYLON_FEED} \
do_index() {
touch ${DEPLOY_DIR_IPK}/Packages
- ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
+ opkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
}
addtask index before do_build after do_install
diff --git a/recipes/xserver-common/files/Makefile.dpkg_ipkg b/recipes/xserver-common/files/Makefile.dpkg_ipkg
index 76c5321..771ed8b 100644
--- a/recipes/xserver-common/files/Makefile.dpkg_ipkg
+++ b/recipes/xserver-common/files/Makefile.dpkg_ipkg
@@ -74,7 +74,7 @@ ipkg: check-source ipkg-prep clean
if test -e familiar/postrm; then install familiar/postrm familiar/dist/CONTROL; fi
$(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program
rm -rf familiar/dist.list
- ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list
+ opkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list
if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi
md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch
rm -rf familiar/dist familiar/dist.list
diff --git a/recipes/xserver-common/files/Makefile.translation b/recipes/xserver-common/files/Makefile.translation
index 1ca7d64..6ce30b4 100644
--- a/recipes/xserver-common/files/Makefile.translation
+++ b/recipes/xserver-common/files/Makefile.translation
@@ -2,8 +2,8 @@
CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi`
-# use ipkg-build or ipkg-deb-build
-IPKG_BUILD := ipkg-build
+# use opkg-build or opkg-deb-build
+IPKG_BUILD := opkg-build
TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint
--
1.7.0.4
next prev parent reply other threads:[~2011-01-25 6:27 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-25 6:25 [PATCH 0/9 v2] Replace ipkg-utils with opkg-utils Khem Raj
2011-01-25 6:25 ` [PATCH 1/9] classes/package_ipk.bbclass, classes/sourceipk.bbclass: Use opkg-utils-native instead of ipkg-utils-native Khem Raj
2011-01-25 6:25 ` [PATCH 2/9] recipes/meta recipes/tasks: Replace ipkg-utils with opkg-utils Khem Raj
2011-01-25 6:25 ` [PATCH 3/9] slugos.inc: Dont lock SRCDATE for ipkg, its not used anymore Khem Raj
2011-01-25 6:25 ` [PATCH 4/9] ipkg-utils: Remove the recipes Khem Raj
2011-01-25 6:25 ` [PATCH 5/9] classes: Replace ipkg-make-index with opkg-make-index Khem Raj
2011-01-25 6:25 ` [PATCH 6/9] bitbake.conf, nylon.conf, openwrt-sdk.conf: Use opkg-build instead of ipkg-build Khem Raj
2011-01-25 6:25 ` [PATCH 7/9] angstrom/personal-feed.sh, angstrom/sort.sh: Replace ipkg-make-index with opkg-make-index Khem Raj
2011-01-25 6:25 ` [PATCH 8/9] stage-manager: Use opkg utilities Khem Raj
2011-01-25 6:25 ` Khem Raj [this message]
2011-01-25 13:38 ` [PATCH 0/9 v2] Replace ipkg-utils with opkg-utils Koen Kooi
2011-01-25 23:29 ` Graham Gower
2011-01-26 1:21 ` Khem Raj
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1295936745-718-10-git-send-email-raj.khem@gmail.com \
--to=raj.khem@gmail.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.