3 files changed, 9 insertions, 4 deletions

diff --git a/meta/recipes-devtools/opkg/opkg-collateral.bb b/meta/recipes-devtools/opkg/opkg-collateral.bb
index e3e0b5f2ef..251c535438 100644
--- a/meta/recipes-devtools/opkg/opkg-collateral.bb
+++ b/meta/recipes-devtools/opkg/opkg-collateral.bb
@@ -2,6 +2,8 @@ DESCRIPTION = "opkg configuration files"
 SECTION = "base"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+PR = "r1"
+
 SRC_URI = "file://opkg.conf.comments \
            file://lists \
            file://dest \
@@ -15,8 +17,8 @@ do_compile () {
 }
 
 do_install () {
-        install -d ${D}${sysconfdir}/
-        install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg.conf
+        install -d ${D}${sysconfdir}/opkg
+        install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf
 }
 
-CONFFILES_${PN} = "${sysconfdir}/opkg.conf"
+CONFFILES_${PN} = "${sysconfdir}/opkg/opkg.conf"
diff --git a/meta/recipes-devtools/opkg/opkg-collateral/lists b/meta/recipes-devtools/opkg/opkg-collateral/lists
index 3c524f8c77..f8aecd8e15 100644
--- a/meta/recipes-devtools/opkg/opkg-collateral/lists
+++ b/meta/recipes-devtools/opkg/opkg-collateral/lists
@@ -1,2 +1,2 @@
-lists_dir ext /var/lib/ipkg
+lists_dir ext /var/lib/opkg
 
diff --git a/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf.comments b/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf.comments
index 51623f4d53..e1fdada9b5 100644
--- a/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf.comments
+++ b/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf.comments
@@ -18,6 +18,9 @@
 #option proxy_username <username>
 #option proxy_password <password>
 
+# Enable GPGME signature
+# option check_signature 1
+
 # Offline mode (for use in constructing flash images offline)
 #option offline_root target