* [PATCH 1/2] opkg-utils: bump PV to 0.3.5
@ 2017-06-15 23:17 Alejandro del Castillo
2017-06-15 23:17 ` [PATCH 2/2] opkg: upgrade to v0.3.5 Alejandro del Castillo
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Alejandro del Castillo @ 2017-06-15 23:17 UTC (permalink / raw
To: openembedded-core
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
---
meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
index ed5980b..f72b7a4 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtual/update-alternatives', '', d)}"
SRCREV = "1a708fd73d10c2b7677dd4cc4e017746ebbb9166"
-PV = "0.3.4+git${SRCPV}"
+PV = "0.3.5+git${SRCPV}"
SRC_URI = "git://git.yoctoproject.org/opkg-utils \
file://0001-Switch-all-scripts-to-use-Python-3.x.patch \
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] opkg: upgrade to v0.3.5
2017-06-15 23:17 [PATCH 1/2] opkg-utils: bump PV to 0.3.5 Alejandro del Castillo
@ 2017-06-15 23:17 ` Alejandro del Castillo
2017-06-16 8:14 ` [PATCH 1/2] opkg-utils: bump PV to 0.3.5 Martin Jansa
2017-06-16 11:21 ` Burton, Ross
2 siblings, 0 replies; 6+ messages in thread
From: Alejandro del Castillo @ 2017-06-15 23:17 UTC (permalink / raw
To: openembedded-core
Drop status-conffile.patch, present in 0.3.5.
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
---
.../opkg/opkg/status-conffile.patch | 69 ----------------------
.../opkg/{opkg_0.3.4.bb => opkg_0.3.5.bb} | 5 +-
2 files changed, 2 insertions(+), 72 deletions(-)
delete mode 100644 meta/recipes-devtools/opkg/opkg/status-conffile.patch
rename meta/recipes-devtools/opkg/{opkg_0.3.4.bb => opkg_0.3.5.bb} (93%)
diff --git a/meta/recipes-devtools/opkg/opkg/status-conffile.patch b/meta/recipes-devtools/opkg/opkg/status-conffile.patch
deleted file mode 100644
index 6fc405b..0000000
--- a/meta/recipes-devtools/opkg/opkg/status-conffile.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Upstream-Status: Submitted
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From 086d5083dfe0102368cb7c8ce89b0c06b64ca773 Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@intel.com>
-Date: Tue, 10 Jan 2017 15:24:59 +0000
-Subject: [PATCH 1/2] opkg_cmd: only look at conffile status if we're going to
- output it
-
-The loop to compare the recorded conffile hash with their hash on disk is
-outputted at level INFO but the loop was executed at level NOTICE and higher.
-
-This means that if a conffile had been deleted the status operation would
-produce error messages for output it isn't displaying.
-
-Signed-off-by: Ross Burton <ross.burton@intel.com>
----
- libopkg/opkg_cmd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libopkg/opkg_cmd.c b/libopkg/opkg_cmd.c
-index ba57c6a..37416fd 100644
---- a/libopkg/opkg_cmd.c
-+++ b/libopkg/opkg_cmd.c
-@@ -638,7 +638,7 @@ static int opkg_info_status_cmd(int argc, char **argv, int installed_only)
-
- pkg_formatted_info(stdout, pkg);
-
-- if (opkg_config->verbosity >= NOTICE) {
-+ if (opkg_config->verbosity >= INFO) {
- conffile_list_elt_t *iter;
- for (iter = nv_pair_list_first(&pkg->conffiles); iter;
- iter = nv_pair_list_next(&pkg->conffiles, iter)) {
---
-2.8.1
-
-From 225e30e0f9fa7cfeaa3f89e2713e5147ab371def Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@intel.com>
-Date: Tue, 10 Jan 2017 15:28:47 +0000
-Subject: [PATCH 2/2] conffile: gracefully handle deleted conffiles in
- conffile_has_been_modified
-
-Handle conffiles that don't exist gracefully so that instead of showing an error
-message from file_md5sum_alloc() a notice that the file has been deleted is
-shown instead.
-
-Signed-off-by: Ross Burton <ross.burton@intel.com>
----
- libopkg/conffile.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/libopkg/conffile.c b/libopkg/conffile.c
-index b2f2469..7b4b87b 100644
---- a/libopkg/conffile.c
-+++ b/libopkg/conffile.c
-@@ -51,6 +51,11 @@ int conffile_has_been_modified(conffile_t * conffile)
- }
-
- root_filename = root_filename_alloc(filename);
-+ if (!file_exists(root_filename)) {
-+ opkg_msg(INFO, "Conffile %s deleted\n", conffile->name);
-+ free(root_filename);
-+ return 1;
-+ }
-
- md5sum = file_md5sum_alloc(root_filename);
-
---
-2.8.1
diff --git a/meta/recipes-devtools/opkg/opkg_0.3.4.bb b/meta/recipes-devtools/opkg/opkg_0.3.5.bb
similarity index 93%
rename from meta/recipes-devtools/opkg/opkg_0.3.4.bb
rename to meta/recipes-devtools/opkg/opkg_0.3.5.bb
index a21fde1..3e511b6 100644
--- a/meta/recipes-devtools/opkg/opkg_0.3.4.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.3.5.bb
@@ -15,11 +15,10 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz
file://opkg-configure.service \
file://opkg.conf \
file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \
- file://status-conffile.patch \
"
-SRC_URI[md5sum] = "6c52a065499056a196e0b45a27e392de"
-SRC_URI[sha256sum] = "750b900b53b62a9b280b601a196f02da81091eda2f3478c509512aa5a1ec93be"
+SRC_URI[md5sum] = "d202d09ea0932943071b842626cab13c"
+SRC_URI[sha256sum] = "734bc21dea11262113fa86b928d09812618b3966f352350cf916a6ae0d343f32"
inherit autotools pkgconfig systemd
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] opkg-utils: bump PV to 0.3.5
2017-06-15 23:17 [PATCH 1/2] opkg-utils: bump PV to 0.3.5 Alejandro del Castillo
2017-06-15 23:17 ` [PATCH 2/2] opkg: upgrade to v0.3.5 Alejandro del Castillo
@ 2017-06-16 8:14 ` Martin Jansa
2017-06-16 11:21 ` Burton, Ross
2 siblings, 0 replies; 6+ messages in thread
From: Martin Jansa @ 2017-06-16 8:14 UTC (permalink / raw
To: Alejandro del Castillo; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1297 bytes --]
Shouldn't you bump SRCREV as well?
On Fri, Jun 16, 2017 at 12:17 AM, Alejandro del Castillo <
alejandro.delcastillo@ni.com> wrote:
> Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
> ---
> meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> index ed5980b..f72b7a4 100644
> --- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=
> 94d55d512a9ba36caa9b7df079bae19f \
> PROVIDES += "${@bb.utils.contains('PACKAGECONFIG',
> 'update-alternatives', 'virtual/update-alternatives', '', d)}"
>
> SRCREV = "1a708fd73d10c2b7677dd4cc4e017746ebbb9166"
> -PV = "0.3.4+git${SRCPV}"
> +PV = "0.3.5+git${SRCPV}"
>
> SRC_URI = "git://git.yoctoproject.org/opkg-utils \
> file://0001-Switch-all-scripts-to-use-Python-3.x.patch \
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
[-- Attachment #2: Type: text/html, Size: 2552 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] opkg-utils: bump PV to 0.3.5
2017-06-15 23:17 [PATCH 1/2] opkg-utils: bump PV to 0.3.5 Alejandro del Castillo
2017-06-15 23:17 ` [PATCH 2/2] opkg: upgrade to v0.3.5 Alejandro del Castillo
2017-06-16 8:14 ` [PATCH 1/2] opkg-utils: bump PV to 0.3.5 Martin Jansa
@ 2017-06-16 11:21 ` Burton, Ross
2017-06-16 15:12 ` Alejandro del Castillo
2017-06-16 19:48 ` [PATCH v2] opkg-utils: rename recipe to follow versioned releases Alejandro del Castillo
2 siblings, 2 replies; 6+ messages in thread
From: Burton, Ross @ 2017-06-16 11:21 UTC (permalink / raw
To: Alejandro del Castillo; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 460 bytes --]
On 16 June 2017 at 00:17, Alejandro del Castillo <
alejandro.delcastillo@ni.com> wrote:
> SRCREV = "1a708fd73d10c2b7677dd4cc4e017746ebbb9166"
> -PV = "0.3.4+git${SRCPV}"
> +PV = "0.3.5+git${SRCPV}"
>
As Martin said you're missing a srcrev bump.
Also if you're just tracking the release SHA, then for simplicity you can
rename the recipe to opkg-utils_0.3.5 and just have the SRCREV set. No
need for a SHA in PV if it's the 0.3.5 tag.
Ross
[-- Attachment #2: Type: text/html, Size: 991 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] opkg-utils: bump PV to 0.3.5
2017-06-16 11:21 ` Burton, Ross
@ 2017-06-16 15:12 ` Alejandro del Castillo
2017-06-16 19:48 ` [PATCH v2] opkg-utils: rename recipe to follow versioned releases Alejandro del Castillo
1 sibling, 0 replies; 6+ messages in thread
From: Alejandro del Castillo @ 2017-06-16 15:12 UTC (permalink / raw
To: Burton, Ross; +Cc: OE-core
On 06/16/2017 06:21 AM, Burton, Ross wrote:
>
> On 16 June 2017 at 00:17, Alejandro del Castillo
> <alejandro.delcastillo@ni.com <mailto:alejandro.delcastillo@ni.com>> wrote:
>
> SRCREV = "1a708fd73d10c2b7677dd4cc4e017746ebbb9166"
> -PV = "0.3.4+git${SRCPV}"
> +PV = "0.3.5+git${SRCPV}"
>
>
> As Martin said you're missing a srcrev bump.
>
> Also if you're just tracking the release SHA, then for simplicity you
> can rename the recipe to opkg-utils_0.3.5 and just have the SRCREV set.
> No need for a SHA in PV if it's the 0.3.5 tag.
On commit d6b04e12127dd65b96ac7f4509b829510ef21071 the SRCREV was moved
to the rev that eventually became 0.3.5. In this change I am making the
PV match that, since I just tagged the 0.3.5 opkg-utils release.
But you are right...now that I am tagging releases I should probably
rename the recipe. I'll send a V2 with the rename.
--
Cheers,
Alejandro
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] opkg-utils: rename recipe to follow versioned releases
2017-06-16 11:21 ` Burton, Ross
2017-06-16 15:12 ` Alejandro del Castillo
@ 2017-06-16 19:48 ` Alejandro del Castillo
1 sibling, 0 replies; 6+ messages in thread
From: Alejandro del Castillo @ 2017-06-16 19:48 UTC (permalink / raw
To: openembedded-core
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
---
.../opkg-utils/{opkg-utils_git.bb => opkg-utils_0.3.5.bb} | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
rename meta/recipes-devtools/opkg-utils/{opkg-utils_git.bb => opkg-utils_0.3.5.bb} (91%)
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.5.bb
similarity index 91%
rename from meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
rename to meta/recipes-devtools/opkg-utils/opkg-utils_0.3.5.bb
index ed5980b..646cc8f 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.5.bb
@@ -7,15 +7,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://opkg.py;beginline=2;endline=18;md5=63ce9e6bcc445181cd9e4baf4b4ccc35"
PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtual/update-alternatives', '', d)}"
-SRCREV = "1a708fd73d10c2b7677dd4cc4e017746ebbb9166"
-PV = "0.3.4+git${SRCPV}"
-
-SRC_URI = "git://git.yoctoproject.org/opkg-utils \
+SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV}.tar.gz \
file://0001-Switch-all-scripts-to-use-Python-3.x.patch \
"
SRC_URI_append_class-native = " file://tar_ignore_error.patch"
-S = "${WORKDIR}/git"
+SRC_URI[md5sum] = "a19e09c79bf1152aac62e8a120d679ff"
+SRC_URI[sha256sum] = "7f4b08912e26a3f4f6f423f3b4e7157a73b1f3a7483fc59b216d1a80b50b0c38"
TARGET_CC_ARCH += "${LDFLAGS}"
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-06-16 19:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-15 23:17 [PATCH 1/2] opkg-utils: bump PV to 0.3.5 Alejandro del Castillo
2017-06-15 23:17 ` [PATCH 2/2] opkg: upgrade to v0.3.5 Alejandro del Castillo
2017-06-16 8:14 ` [PATCH 1/2] opkg-utils: bump PV to 0.3.5 Martin Jansa
2017-06-16 11:21 ` Burton, Ross
2017-06-16 15:12 ` Alejandro del Castillo
2017-06-16 19:48 ` [PATCH v2] opkg-utils: rename recipe to follow versioned releases Alejandro del Castillo
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.