6 files changed, 22 insertions, 25 deletions

diff --git a/meta/packages/ipkg/ipkg-collateral.bb b/meta/packages/ipkg/ipkg-collateral.bb
deleted file mode 100644
index 3fd55507e2..0000000000
--- a/meta/packages/ipkg/ipkg-collateral.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "ipkg configuration files"
-SECTION = "base"
-LICENSE = "MIT"
-PR = "r7"
-
-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
-}
-
-CONFFILES_${PN} = "${sysconfdir}/ipkg.conf"
diff --git a/meta/packages/opkg/opkg-collateral.bb b/meta/packages/opkg/opkg-collateral.bb
new file mode 100644
index 0000000000..79c741d7be
--- /dev/null
+++ b/meta/packages/opkg/opkg-collateral.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "opkg configuration files"
+SECTION = "base"
+LICENSE = "MIT"
+
+SRC_URI = "file://opkg.conf.comments \
+           file://lists \
+           file://dest \
+           file://src "
+
+do_compile () {
+        cat ${WORKDIR}/opkg.conf.comments >${WORKDIR}/opkg.conf
+        cat ${WORKDIR}/src      >>${WORKDIR}/opkg.conf
+        cat ${WORKDIR}/dest     >>${WORKDIR}/opkg.conf
+        cat ${WORKDIR}/lists    >>${WORKDIR}/opkg.conf
+}
+
+do_install () {
+        install -d ${D}${sysconfdir}/
+        install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg.conf
+}
+
+CONFFILES_${PN} = "${sysconfdir}/opkg.conf"
diff --git a/meta/packages/ipkg/ipkg-collateral/dest b/meta/packages/opkg/opkg-collateral/dest
index 088ca403da..088ca403da 100644
--- a/meta/packages/ipkg/ipkg-collateral/dest
+++ b/meta/packages/opkg/opkg-collateral/dest
diff --git a/meta/packages/ipkg/ipkg-collateral/ipkg.conf.comments b/meta/packages/opkg/opkg-collateral/ipkg.conf.comments
index 51623f4d53..51623f4d53 100644
--- a/meta/packages/ipkg/ipkg-collateral/ipkg.conf.comments
+++ b/meta/packages/opkg/opkg-collateral/ipkg.conf.comments
diff --git a/meta/packages/ipkg/ipkg-collateral/lists b/meta/packages/opkg/opkg-collateral/lists
index 3c524f8c77..3c524f8c77 100644
--- a/meta/packages/ipkg/ipkg-collateral/lists
+++ b/meta/packages/opkg/opkg-collateral/lists
diff --git a/meta/packages/ipkg/ipkg-collateral/src b/meta/packages/opkg/opkg-collateral/src
index e69de29bb2..e69de29bb2 100644
--- a/meta/packages/ipkg/ipkg-collateral/src
+++ b/meta/packages/opkg/opkg-collateral/src