All of lore.kernel.org
 help / color / mirror / Atom feed
* [RFC] move to opkg
@ 2008-03-18  8:55 Koen Kooi
  2008-03-18  9:55 ` Junqian Gordon Xu
                   ` (6 more replies)
  0 siblings, 7 replies; 38+ messages in thread
From: Koen Kooi @ 2008-03-18  8:55 UTC (permalink / raw)
  To: openembedded-devel


[-- Attachment #1.1: Type: text/plain, Size: 419 bytes --]

Hi,

Poky just switched to opkg and removed ipkg completely, which I think  
is a good thing, but here's a less drastic patch for OE.

Executive summary: you still get .ipk packages, just as before, only  
your rootfs ends up with opkg.  Things like sharprom-compat and wrt54g- 
oe will continue to work just as before.

I'd like to apply this ASAP if there are no serious complaints.

regards,

Koen



[-- Attachment #1.2: opkg.diff --]
[-- Type: application/octet-stream, Size: 5910 bytes --]

#
# old_revision [7a8e14a3c549cff8b48a1b55c75b9e7c77f0d6b3]
#
# patch "classes/package_ipk.bbclass"
#  from [29c2d1055840133cc3b8317a33dc52aeeb4cd9fc]
#    to [46fbc0933d2ee573d776b79edfa0654cedf36674]
# 
# patch "classes/rootfs_ipk.bbclass"
#  from [bf45905ffdc916560ffe662769f35387e731975b]
#    to [fe6a0f97185a32771d1a2a6f430e63a81fd09e73]
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [c5203ad6cf4154e5f329808d72d5564566bb46c7]
#    to [76dc1dbe68cefa065b665303acbbfc4083a771c0]
# 
# patch "packages/tasks/task-base.bb"
#  from [47914cc275060af9ade4a3f8bec2034b23a9e7c6]
#    to [3846bc90772f8374ce01dcb4d89aa7272466eee0]
#
============================================================
--- classes/package_ipk.bbclass	29c2d1055840133cc3b8317a33dc52aeeb4cd9fc
+++ classes/package_ipk.bbclass	46fbc0933d2ee573d776b79edfa0654cedf36674
@@ -1,17 +1,17 @@ IMAGE_PKGTYPE ?= "ipk"
 inherit package
 
 BOOTSTRAP_EXTRA_RDEPENDS += "ipkg-collateral ipkg"
 IMAGE_PKGTYPE ?= "ipk"
 
-IPKGCONF_TARGET = "${STAGING_ETCDIR_NATIVE}/ipkg.conf"
-IPKGCONF_SDK =  "${STAGING_ETCDIR_NATIVE}/ipkg-sdk.conf"
+IPKGCONF_TARGET = "${STAGING_ETCDIR_NATIVE}/opkg.conf"
+IPKGCONF_SDK =  "${STAGING_ETCDIR_NATIVE}/opkg-sdk.conf"
 
 python package_ipk_fn () {
 	from bb import data
 	bb.data.setVar('PKGFN', bb.data.getVar('PKG',d), d)
 }
 
-python package_ipk_install () {
+python package_ipk_install () { 
 	#
 	# Warning - this function is not multimachine safe (see stagingdir reference)!
 	#
@@ -60,8 +60,8 @@ python package_ipk_install () {
 		f = open(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"),"w")
 		f.close()
 
-	ret = os.system('ipkg-cl  -o %s -f %s update' % (rootfs, conffile))
-	ret = os.system('ipkg-cl  -o %s -f %s install %s' % (rootfs, conffile, pkgfn))
+	ret = os.system('opkg-cl  -o %s -f %s update' % (rootfs, conffile))
+	ret = os.system('opkg-cl  -o %s -f %s install %s' % (rootfs, conffile, pkgfn))
 	if (ret != 0 ):
 		raise bb.build.FuncFailed
 }
============================================================
--- classes/rootfs_ipk.bbclass	bf45905ffdc916560ffe662769f35387e731975b
+++ classes/rootfs_ipk.bbclass	fe6a0f97185a32771d1a2a6f430e63a81fd09e73
@@ -5,12 +5,12 @@
 # See image.bbclass for a usage of this.
 #
 
-do_rootfs[depends] += "ipkg-native:do_populate_staging ipkg-utils-native:do_populate_staging"
+do_rootfs[depends] += "opkg-native:do_populate_staging opkg-utils-native:do_populate_staging"
 do_rootfs[recrdeptask] += "do_package_write_ipk"
 
 IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS} ${@base_conditional("PACKAGE_INSTALL_NO_DEPS", "1", "-nodeps", "", d)}"
 
-DISTRO_EXTRA_RDEPENDS += " ipkg ipkg-collateral "
+DISTRO_EXTRA_RDEPENDS += " opkg opkg-collateral "
 PACKAGE_INSTALL_NO_DEPS ?= "0"
 
 fakeroot rootfs_ipk_do_rootfs () {
@@ -21,41 +21,43 @@ fakeroot rootfs_ipk_do_rootfs () {
 
 	mkdir -p ${T}
 
-	ipkg-cl ${IPKG_ARGS} update
+	opkg-cl ${IPKG_ARGS} update
 
 	# Uclibc builds don't provide this stuff...
 	if [ x${TARGET_OS} = "xlinux" ] || [ x${TARGET_OS} = "xlinux-gnueabi" ] ; then 
 		if [ ! -z "${LINGUAS_INSTALL}" ]; then
-			ipkg-cl ${IPKG_ARGS} install glibc-localedata-i18n
+			opkg-cl ${IPKG_ARGS} install glibc-localedata-i18n
 			for i in ${LINGUAS_INSTALL}; do
-				ipkg-cl ${IPKG_ARGS} install $i 
+				opkg-cl ${IPKG_ARGS} install $i 
 			done
 		fi
 	fi
 	if [ ! -z "${PACKAGE_INSTALL}" ]; then
-		ipkg-cl ${IPKG_ARGS} install ${PACKAGE_INSTALL}
+		opkg-cl ${IPKG_ARGS} install ${PACKAGE_INSTALL}
 	fi
 
 	export D=${IMAGE_ROOTFS}
 	export OFFLINE_ROOT=${IMAGE_ROOTFS}
 	export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
-	mkdir -p ${IMAGE_ROOTFS}${sysconfdir}/ipkg/
-	grep "^arch" ${IPKGCONF_TARGET} >${IMAGE_ROOTFS}${sysconfdir}/ipkg/arch.conf
+	mkdir -p ${IMAGE_ROOTFS}${sysconfdir}/opkg/
+	grep "^arch" ${IPKGCONF_TARGET} >${IMAGE_ROOTFS}${sysconfdir}/opkg/arch.conf
 
-	for i in ${IMAGE_ROOTFS}${libdir}/ipkg/info/*.preinst; do
+	for i in ${IMAGE_ROOTFS}${libdir}/opkg/info/*.preinst; do
 		if [ -f $i ] && ! sh $i; then
-			ipkg-cl ${IPKG_ARGS} flag unpacked `basename $i .preinst`
+			opkg-cl ${IPKG_ARGS} flag unpacked `basename $i .preinst`
 		fi
 	done
-	for i in ${IMAGE_ROOTFS}${libdir}/ipkg/info/*.postinst; do
+	for i in ${IMAGE_ROOTFS}${libdir}/opkg/info/*.postinst; do
 		if [ -f $i ] && ! sh $i configure; then
-			ipkg-cl ${IPKG_ARGS} flag unpacked `basename $i .postinst`
+			opkg-cl ${IPKG_ARGS} flag unpacked `basename $i .postinst`
 		fi
 	done
 
 	install -d ${IMAGE_ROOTFS}/${sysconfdir}
 	echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version
 
+	rm -f ${IMAGE_ROOTFS}${libdir}/opkg/lists/*
+	
 	${ROOTFS_POSTPROCESS_COMMAND}
 	
 	log_check rootfs 	
@@ -82,5 +84,5 @@ remove_packaging_data_files() {
 }
 
 remove_packaging_data_files() {
-	rm -rf ${IMAGE_ROOTFS}${libdir}/ipkg/
+	rm -rf ${IMAGE_ROOTFS}${libdir}/opkg/
 }
============================================================
--- conf/distro/angstrom-2008.1.conf	c5203ad6cf4154e5f329808d72d5564566bb46c7
+++ conf/distro/angstrom-2008.1.conf	76dc1dbe68cefa065b665303acbbfc4083a771c0
@@ -207,7 +207,7 @@ DISTRO_EXTRA_RDEPENDS += "\
     update-modules \
     ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \   
     angstrom-version \
-    opkg-ipkg-compat ${ANGSTROM_FEED_CONFIGS} \
+    opkg ${ANGSTROM_FEED_CONFIGS} \
     util-linux-mount util-linux-umount \
     ${DEBUG_APPS} \
     "
============================================================
--- packages/tasks/task-base.bb	47914cc275060af9ade4a3f8bec2034b23a9e7c6
+++ packages/tasks/task-base.bb	3846bc90772f8374ce01dcb4d89aa7272466eee0
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r63"
+PR = "r64"
 
 inherit task
 

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 193 bytes --]

^ permalink raw reply	[flat|nested] 38+ messages in thread

end of thread, other threads:[~2008-04-01  9:15 UTC | newest]

Thread overview: 38+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-18  8:55 [RFC] move to opkg Koen Kooi
2008-03-18  9:55 ` Junqian Gordon Xu
2008-03-19 15:33   ` WPkg Silvano Catinella
2008-03-25 17:23     ` WPkg Michael 'Mickey' Lauer
2008-03-25 23:42       ` WPkg Rod Whitby
2008-04-01  9:15         ` WPkg Silvano Catinella
2008-03-18  9:56 ` [RFC] move to opkg Marcin Juszkiewicz
2008-03-18 10:09   ` Koen Kooi
2008-03-18 10:42     ` Koen Kooi
2008-03-18 11:34       ` Jacob Thebault-Spieker
2008-03-18 11:42 ` Koen Kooi
2008-03-18 13:49 ` Geoffrey Wossum
2008-03-18 14:32   ` Koen Kooi
2008-03-18 16:48     ` Richard Purdie
2008-03-18 17:05       ` Koen Kooi
2008-03-23  0:38         ` Mike (mwester)
2008-03-23  5:17           ` Mike (mwester)
2008-03-23 10:43             ` Marcin Juszkiewicz
2008-03-23 11:02             ` Koen Kooi
2008-03-23 13:25               ` Mike (mwester)
2008-03-23 18:18               ` Tom Rini
2008-03-23 18:55                 ` Koen Kooi
2008-03-23 22:20                   ` Tom Rini
2008-03-23 23:10                     ` Rod Whitby
2008-03-23 23:06           ` Richard Purdie
2008-03-23 23:46             ` Rod Whitby
2008-03-24  4:30             ` Mike (mwester)
2008-03-24  7:55               ` Stelios Koroneos
2008-03-18 18:12     ` Tom Rini
2008-03-18 18:18       ` Mikhail Gusarov
2008-03-18 18:40         ` Koen Kooi
2008-03-19  9:06           ` Richard Purdie
2008-03-19  9:13             ` Marcin Juszkiewicz
2008-03-18 14:35   ` Marcin Juszkiewicz
2008-03-18 22:00 ` Koen Kooi
2008-03-19 17:52 ` [RFC] move to opkg / md5 error on big-endian machine Jeremy Lainé
2008-03-22 20:38   ` Jeremy Lainé
2008-03-23 10:59 ` [RFC] move to opkg Jeremy Lainé

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.