various: move over to opkg, as discussed on the mailinglist

* death to ipkg!

1 files changed, 9 insertions, 9 deletions

diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass
index 5237285e4c..c59c75e1e5 100644
--- a/classes/rootfs_deb.bbclass
+++ b/classes/rootfs_deb.bbclass
@@ -109,22 +109,22 @@ fakeroot rootfs_deb_do_rootfs () {
 
 	set -e
 
-	# Hacks to make dpkg/ipkg coexist for now
+	# Hacks to make dpkg/opkg coexist for now
 	mv ${IMAGE_ROOTFS}/var/dpkg ${IMAGE_ROOTFS}/usr/
 	if [ -e ${IMAGE_ROOTFS}/usr/dpkg/alternatives ]; then
 		rmdir ${IMAGE_ROOTFS}/usr/dpkg/alternatives
 	fi
-        if [ ! -e ${IMAGE_ROOTFS}${libdir}/ipkg ] ; then
-                mkdir -p ${IMAGE_ROOTFS}${libdir}/ipkg
+        if [ ! -e ${IMAGE_ROOTFS}${libdir}/opkg ] ; then
+                mkdir -p ${IMAGE_ROOTFS}${libdir}/opkg
         fi
 
-        if [ ! -e ${IMAGE_ROOTFS}${sysconfdir}/ipkg ] ; then
-                mkdir -p ${IMAGE_ROOTFS}${sysconfdir}/ipkg
+        if [ ! -e ${IMAGE_ROOTFS}${sysconfdir}/opkg ] ; then
+                mkdir -p ${IMAGE_ROOTFS}${sysconfdir}/opkg
         fi
  
-	ln -sf ${libdir}/ipkg/alternatives ${IMAGE_ROOTFS}/usr/dpkg/alternatives
-	ln -sf /usr/dpkg/info ${IMAGE_ROOTFS}${libdir}/ipkg/info
-	ln -sf /usr/dpkg/status ${IMAGE_ROOTFS}${libdir}/ipkg/status
+	ln -sf ${libdir}/opkg/alternatives ${IMAGE_ROOTFS}/usr/dpkg/alternatives
+	ln -sf /usr/dpkg/info ${IMAGE_ROOTFS}${libdir}/opkg/info
+	ln -sf /usr/dpkg/status ${IMAGE_ROOTFS}${libdir}/opkg/status
 
 	${ROOTFS_POSTPROCESS_COMMAND}
 
@@ -152,6 +152,6 @@ rootfs_deb_log_check() {
 }
 
 remove_packaging_data_files() {
-	rm -rf ${IMAGE_ROOTFS}${libdir}/ipkg/
+	rm -rf ${IMAGE_ROOTFS}${libdir}/opkg/
 	rm -rf ${IMAGE_ROOTFS}/usr/dpkg/
 }