Re: [Angstrom-devel] [meta-angstrom][PATCH 2/2] fs-perms-angstrom.txt: backport patches from openembedded-core
Ping.
Max
2016-07-18 21:45 GMT+02:00 Max Krummenacher <max.oss...@gmail.com>:
> Since the split from openembedded-core there has been a number of patches
> to fs-perms.txt. Backport them here.
>
> Signed-off-by: Max Krummenacher <max.krummenac...@toradex.com>
> ---
> files/fs-perms-angstrom.txt | 16 +---
> 1 file changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/files/fs-perms-angstrom.txt b/files/fs-perms-angstrom.txt
> index 58066b3..098a739 100644
> --- a/files/fs-perms-angstrom.txt
> +++ b/files/fs-perms-angstrom.txt
> @@ -47,17 +47,19 @@ ${oldincludedir}0755rootroottrue0644
> rootroot
> # Links
> ${localstatedir}/run link/run
>
> +/home 0755rootrootfalse - - -
> +${prefix}/src 0755rootrootfalse - - -
> +${localstatedir}/local 0755rootrootfalse - - -
> +
> # Special permissions from base-files
> # Set 1777
> /tmp 01777 rootrootfalse - - -
>
> -# Set 2775
> -/home 02755 rootrootfalse - - -
> -${prefix}/src 02755 rootrootfalse - - -
> -${localstatedir}/local 02755 rootrootfalse - - -
> +# Set 0700
> +${ROOT_HOME} 0700rootrootfalse - - -
>
> -# Set 3755
> +# Set 755-lsb
> /srv 0755rootrootfalse - - -
>
> -# Set 4775
> -/var/mail 02755 rootrootfalse - - -
> +# Set 2775-lsb
> +/var/mail 02775 rootmailfalse - - -
> --
> 2.6.6
>
___
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
Re: [Angstrom-devel] [meta-angstrom][PATCH 1/2] angstrom-core-tweaks.inc: actually use fs-perms-angstrom.txt
Ping. Max 2016-07-29 15:47 GMT+02:00 Max Krummenacher <max.oss...@gmail.com>: > Hi Andreas > > Am Freitag, den 29.07.2016, 13:09 +0200 schrieb Andreas Müller: >> On Mon, Jul 18, 2016 at 9:45 PM, Max Krummenacher < >> max.oss...@gmail.com> wrote: >> > FILESYSTEM_PERMS_TABLES must be set with the relative path from one >> > of the >> > BBPATH paths. >> > >> > Without this patch the setting of FILESYSTEM_PERMS_TABLES disables >> > the use >> > of openembedded-core/meta/files/fs-perms.txt but, as the file in >> > meta-angstrom/files/fs-perms-angstrom.txt is not found, that file >> > is not >> > used for the fixup-perms task. >> > >> > With fs-perms-angstrom.txt active files deployed from >> > copydebugsources no >> > longer trigger these warnings: >> > > WARNING: helloworld-1.0-r0 do_package_qa: QA Issue: helloworld: >> > > .../src/main.c >> > > is owned by uid 1000, which is the same as the user running >> > > bitbake. This may >> > > be due to host contamination [host-user-contaminated] >> > >> > Signed-off-by: Max Krummenacher <max.krummenac...@toradex.com> >> > --- >> > conf/distro/include/angstrom-core-tweaks.inc | 2 +- >> > 1 file changed, 1 insertion(+), 1 deletion(-) >> > >> > diff --git a/conf/distro/include/angstrom-core-tweaks.inc >> > b/conf/distro/include/angstrom-core-tweaks.inc >> > index 33aaaef..1a3af9d 100644 >> > --- a/conf/distro/include/angstrom-core-tweaks.inc >> > +++ b/conf/distro/include/angstrom-core-tweaks.inc >> > @@ -62,7 +62,7 @@ PACKAGE_CLASSES = "package_ipk" >> > # Image.bbclass stuff: >> > >> > # Override default fs-perms.txt that messes with our /var setup: >> > -FILESYSTEM_PERMS_TABLES = "fs-perms-angstrom.txt" >> > +FILESYSTEM_PERMS_TABLES = "files/fs-perms-angstrom.txt" >> > >> > # >> > # udev, devfsd, busybox-mdev (from busybox) or none >> > -- >> > 2.6.6 >> > >> Do we need fs-perms / for special /var setup - see also base-files? >> Note that /var/lock configuration is broken causing very ugly effects >> [1]. >> >> [1] https://github.com/schnitzeltony/meta-angstrom/commit/937fb6a41f5 >> 5132982aba1308aed4fe3f9b82be0 >> >> Andreas > > My goal is to have the host-user-contaminated warnings go away. They > occur because the source files are hard linked in do_package and pseudo > then set them to root:root. > > In poky this is fixed with the fs-perms mechanism and the configuration > file from meta/files/fs-perms.txt. > > I then found that Koen's original patch to provide an angstrom fs-perms > configuration file did in fact disable the use of meta/files/fs > -perms.txt but did not make available what is in meta-angstrom/files/fs > -perms-angstrom.txt. > > And as there has been some fixes in oe-core since splitting of the fs > -perms.txt file I tried to backport those which looked not to interfere > with Koen's intentions with the commit > 6d518574c11bca1a56ec9b83afd18196a82fbfb0 'angstrom: use custom fs > -perms.txt that doesn't destroy our /var setup'. > > The only symlink created with meta-angstrom/files/fs-perms-angstrom.txt > is the one Khem added '/var/run -> /run'. > But that one somehow magically appears also without my patch. Seems > like base_files does create it already in do_install. > > So would you like me to send a v2 of the patch which removes the > '/var/run -> /run' symlink creation? > > Max > ___ Angstrom-distro-devel mailing list Angstrom-distro-devel@linuxtogo.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
[Angstrom-devel] [meta-angstrom][PATCH] angstrom.inc: set arm instruction set with existing machine overrides
_armv4t, _armv5te are not (no longer?) set as MACHINEOVERRIDES if an armv4t
or armv5te tune is set.
Thus the default ARM_INSTRUCTION_SET ??= "thumb" kicks in.
Set the override to _armv4, _armv5 to get the expected ARM_INSTRUCTION_SET.
While at it cleanup comment to keep up with changes.
Build tested with a build for a _armv5te machine.
Signed-off-by: Max Krummenacher <max.krummenac...@toradex.com>
---
conf/distro/include/angstrom.inc | 19 +--
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 778ab10..09f6121 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -46,16 +46,6 @@ require conf/distro/include/angstrom-${TCLIBC}.inc
require conf/distro/include/angstrom-java.inc
require conf/distro/include/angstrom-jalimo.conf
-# ARM920T and up can use thumb mode to decrease binary size at the expense of
speed
-# (the complete story is a bit more nuanced due to cache starvation)
-# Angstrom turns on thumb for armv4t machine according to this RFC:
-#
http://lists.linuxtogo.org/pipermail/angstrom-distro-devel/2008-October/002714.html
-
-ARM_INSTRUCTION_SET ??= "thumb"
-ARM_INSTRUCTION_SET_armv4t ?= "arm"
-ARM_INSTRUCTION_SET_armv5te ?= "arm"
-ARM_INSTRUCTION_SET_armv6 ?= "arm"
-
# "arm" "thumb"
#The instruction set the compiler should use when generating application
#code. The kernel is always compiled with arm code at present. arm code
@@ -63,6 +53,15 @@ ARM_INSTRUCTION_SET_armv6 ?= "arm"
#encoded RISC sub-set. Thumb code is smaller (maybe 70% of the ARM size)
#but requires more instructions (140% for 70% smaller code) so may be
#slower.
+#thumb 2 is an evolution of the original thumb instruction set which
strives
+#to keep the code size advantages without the performance penality.
+#When setting thumb the compiler will use thumb or thumb2 depending on what
+#the selected arm architecture.
+
+ARM_INSTRUCTION_SET ??= "thumb"
+ARM_INSTRUCTION_SET_armv4 ?= "arm"
+ARM_INSTRUCTION_SET_armv5 ?= "arm"
+ARM_INSTRUCTION_SET_armv6 ?= "arm"
#Use this variable in feeds and other parts that need a URI
ANGSTROM_URI ?= "http://feeds.angstrom-distribution.org;
--
2.5.5
___
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
[Angstrom-devel] [meta-angstrom][PATCH 2/2] fs-perms-angstrom.txt: backport patches from openembedded-core
Since the split from openembedded-core there has been a number of patches
to fs-perms.txt. Backport them here.
Signed-off-by: Max Krummenacher <max.krummenac...@toradex.com>
---
files/fs-perms-angstrom.txt | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/files/fs-perms-angstrom.txt b/files/fs-perms-angstrom.txt
index 58066b3..098a739 100644
--- a/files/fs-perms-angstrom.txt
+++ b/files/fs-perms-angstrom.txt
@@ -47,17 +47,19 @@ ${oldincludedir}0755rootroottrue0644
rootroot
# Links
${localstatedir}/run link/run
+/home 0755rootrootfalse - - -
+${prefix}/src 0755rootrootfalse - - -
+${localstatedir}/local 0755rootrootfalse - - -
+
# Special permissions from base-files
# Set 1777
/tmp 01777 rootrootfalse - - -
-# Set 2775
-/home 02755 rootrootfalse - - -
-${prefix}/src 02755 rootrootfalse - - -
-${localstatedir}/local 02755 rootrootfalse - - -
+# Set 0700
+${ROOT_HOME} 0700rootrootfalse - - -
-# Set 3755
+# Set 755-lsb
/srv 0755rootrootfalse - - -
-# Set 4775
-/var/mail 02755 rootrootfalse - - -
+# Set 2775-lsb
+/var/mail 02775 rootmailfalse - - -
--
2.6.6
___
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
[Angstrom-devel] [meta-angstrom][PATCH 1/2] angstrom-core-tweaks.inc: actually use fs-perms-angstrom.txt
FILESYSTEM_PERMS_TABLES must be set with the relative path from one of the BBPATH paths. Without this patch the setting of FILESYSTEM_PERMS_TABLES disables the use of openembedded-core/meta/files/fs-perms.txt but, as the file in meta-angstrom/files/fs-perms-angstrom.txt is not found, that file is not used for the fixup-perms task. With fs-perms-angstrom.txt active files deployed from copydebugsources no longer trigger these warnings: | WARNING: helloworld-1.0-r0 do_package_qa: QA Issue: helloworld: .../src/main.c | is owned by uid 1000, which is the same as the user running bitbake. This may | be due to host contamination [host-user-contaminated] Signed-off-by: Max Krummenacher <max.krummenac...@toradex.com> --- conf/distro/include/angstrom-core-tweaks.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/angstrom-core-tweaks.inc b/conf/distro/include/angstrom-core-tweaks.inc index 33aaaef..1a3af9d 100644 --- a/conf/distro/include/angstrom-core-tweaks.inc +++ b/conf/distro/include/angstrom-core-tweaks.inc @@ -62,7 +62,7 @@ PACKAGE_CLASSES = "package_ipk" # Image.bbclass stuff: # Override default fs-perms.txt that messes with our /var setup: -FILESYSTEM_PERMS_TABLES = "fs-perms-angstrom.txt" +FILESYSTEM_PERMS_TABLES = "files/fs-perms-angstrom.txt" # # udev, devfsd, busybox-mdev (from busybox) or none -- 2.6.6 ___ Angstrom-distro-devel mailing list Angstrom-distro-devel@linuxtogo.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
[Angstrom-devel] [meta-angstrom][PATCH 1/5] angstrom.conf: stop using base_contains
The base_contains function is deprecated and we ought to use
bb.utils.contains instead.
Signed-off-by: Max Krummenacher <max.krummenac...@toradex.com>
---
conf/distro/angstrom.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf
index df96641..e97aaff 100644
--- a/conf/distro/angstrom.conf
+++ b/conf/distro/angstrom.conf
@@ -90,7 +90,7 @@ PNBLACKLIST[gconf-dbus]= "gconf-dbus has been merged
back into main GCon
PNBLACKLIST[gconf-dbus-native] = "gconf-dbus has been merged back into main
GConf"
# Define splash before it gets set to empty in angstrom-core-tweaks.inc:
-SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "dietsplash",
"",d)}'
+SPLASH ?= ' ${@bb.utils.contains("MACHINE_FEATURES", "screen", "dietsplash",
"",d)}'
require conf/distro/include/angstrom.inc
# Prefer openssh over dropbear
--
2.6.6
___
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
[Angstrom-devel] [meta-angstrom][PATCH 3/5] angstrom-gpe-packagegroup-apps.bb: stop using base_contains
The base_contains function is deprecated and we ought to use
bb.utils.contains instead.
Signed-off-by: Max Krummenacher <max.krummenac...@toradex.com>
---
recipes-angstrom/angstrom/angstrom-gpe-packagegroup-apps.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes-angstrom/angstrom/angstrom-gpe-packagegroup-apps.bb
b/recipes-angstrom/angstrom/angstrom-gpe-packagegroup-apps.bb
index dbed9b7..c295b3c 100644
--- a/recipes-angstrom/angstrom/angstrom-gpe-packagegroup-apps.bb
+++ b/recipes-angstrom/angstrom/angstrom-gpe-packagegroup-apps.bb
@@ -18,9 +18,9 @@ RDEPENDS_${PN} = "\
gpe-watch \
gpe-what \
matchbox-panel-hacks \
-${@base_contains("COMBINED_FEATURES", "wifi", "gpe-aerial", "",d)} \
+${@bb.utils.contains("COMBINED_FEATURES", "wifi", "gpe-aerial", "",d)} \
gpe-soundbite \
-${@base_contains("MACHINE_FEATURES", "touchscreen", "rosetta", "",d)} \
+${@bb.utils.contains("MACHINE_FEATURES", "touchscreen", "rosetta", "",d)} \
gpe-scap \
gpe-windowlist"
--
2.6.6
___
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
[Angstrom-devel] [meta-angstrom][PATCH 2/5] angstrom-feed-configs.bb: stop using base_contains
The base_contains function is deprecated and we ought to use
bb.utils.contains instead.
Signed-off-by: Max Krummenacher <max.krummenac...@toradex.com>
---
recipes-angstrom/angstrom/angstrom-feed-configs.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-angstrom/angstrom/angstrom-feed-configs.bb
b/recipes-angstrom/angstrom/angstrom-feed-configs.bb
index 68c1eef..8a1f7ee 100644
--- a/recipes-angstrom/angstrom/angstrom-feed-configs.bb
+++ b/recipes-angstrom/angstrom/angstrom-feed-configs.bb
@@ -8,7 +8,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
FEED_BASEPATH ?= "unstable/feed/"
-IWMMXT_FEED = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', 'iwmmxt', '',d)}"
+IWMMXT_FEED = "${@bb.utils.contains('MACHINE_FEATURES', 'iwmmxt', 'iwmmxt',
'',d)}"
do_compile() {
mkdir -p ${S}/${sysconfdir}/opkg
--
2.6.6
___
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
[Angstrom-devel] [meta-angstrom][PATCH 5/5] systemd-qt5-image.bb: stop using base_contains
The base_contains function is deprecated and we ought to use
bb.utils.contains instead.
Signed-off-by: Max Krummenacher <max.krummenac...@toradex.com>
---
recipes-images/angstrom/systemd-qt5-image.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-images/angstrom/systemd-qt5-image.bb
b/recipes-images/angstrom/systemd-qt5-image.bb
index bda2682..4b85560 100644
--- a/recipes-images/angstrom/systemd-qt5-image.bb
+++ b/recipes-images/angstrom/systemd-qt5-image.bb
@@ -12,7 +12,7 @@ IMAGE_INSTALL += " \
packagegroup-qt5-qtcreator-debug \
packagegroup-qt5 \
packagegroup-qt5-apps \
- ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland-plugins', '',
d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-plugins',
'', d)} \
systemd-analyze \
weston \
weston-init \
--
2.6.6
___
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
[Angstrom-devel] [meta-angstrom][PATCH 4/5] angstrom-gpe-task-base.bb: stop using base_contains
The base_contains function is deprecated and we ought to use
bb.utils.contains instead.
Signed-off-by: Max Krummenacher <max.krummenac...@toradex.com>
---
recipes-angstrom/angstrom/angstrom-gpe-task-base.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes-angstrom/angstrom/angstrom-gpe-task-base.bb
b/recipes-angstrom/angstrom/angstrom-gpe-task-base.bb
index 5bdb763..392ca4d 100644
--- a/recipes-angstrom/angstrom/angstrom-gpe-task-base.bb
+++ b/recipes-angstrom/angstrom/angstrom-gpe-task-base.bb
@@ -28,7 +28,7 @@ RDEPENDS_${PN} = "\
gpe-icons \
gpe-confd \
gpe-autostarter \
-${@base_contains("MACHINE_FEATURES", "touchscreen", "libgtkstylus", "",d)}
\
+${@bb.utils.contains("MACHINE_FEATURES", "touchscreen", "libgtkstylus",
"",d)} \
suspend-desktop \
teleport \
xauth \
@@ -37,7 +37,7 @@ RDEPENDS_${PN} = "\
gdk-pixbuf-loader-jpeg \
pango-module-basic-x \
pango-module-basic-fc \
-${@base_contains("COMBINED_FEATURES", "bluetooth", "gnome-bluetooth",
"",d)} \
+${@bb.utils.contains("COMBINED_FEATURES", "bluetooth", "gnome-bluetooth",
"",d)} \
"
RRECOMMENDS_${PN} = " \
--
2.6.6
___
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
[Angstrom-devel] [meta-angstrom][master][jethro][fido][PATCH] timestamp-service: use new format in /etc/timestamp
The following commit changed the format of /etc/timestamp to include
additionally seconds when initially created. e.g. the file now contains
20160223174913
https://github.com/Angstrom-distribution/meta-angstrom/commit/8228b2d56ef2415c8b96d1463fb38816279d4c74
Follow that change for the systemd implementation of the poor man's RTC.
Signed-off-by: Max Krummenacher <max.krummenac...@toradex.com>
---
The change in oe-core is present since the fido release.
Thus it makes sense to apply the fix for fido/jethro/master
Cheers
Max
recipes-core/systemd/timestamp-service/load-timestamp.sh | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/recipes-core/systemd/timestamp-service/load-timestamp.sh
b/recipes-core/systemd/timestamp-service/load-timestamp.sh
index 9ad0e94..6902d1d 100644
--- a/recipes-core/systemd/timestamp-service/load-timestamp.sh
+++ b/recipes-core/systemd/timestamp-service/load-timestamp.sh
@@ -3,19 +3,19 @@
if [ "$1" != "--save" ] ; then
# Set the system clock from timestamp file
-# if the timestamp is 1 minute or more recent
+# if the timestamp is 1 second or more recent
# than the current systemtime.
-SYSTEMDATE=$(/bin/date -u "+%4Y%2m%2d%2H%2M")
+SYSTEMDATE=$(/bin/date -u "+%4Y%2m%2d%2H%2M%2S")
TIMESTAMP=$(/bin/cat /etc/timestamp 2>/dev/null)
if [ $SYSTEMDATE -lt $TIMESTAMP ] 2>/dev/null ; then
echo "Update systemtime from /etc/timestamp"
- /bin/date -u ${TIMESTAMP#}${TIMESTAMP%}
+ /bin/date -u ${TIMESTAMP:4:8}${TIMESTAMP:0:4}.${TIMESTAMP:(-2)}
fi
else
# Store the current systemtime in /etc/timestamp
- /bin/date -u +%4Y%2m%2d%2H%2M > /etc/timestamp
+ /bin/date -u +%4Y%2m%2d%2H%2M%2S > /etc/timestamp
fi
--
1.9.3
___
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
[Angstrom-devel] [meta-angstrom][PATCH][master][angstrom-v2015.12-yocto2.0] angstrom.conf: arm: use compatible glibc and glibc-locale
oe-core moved to glibc and cross-localedef-native based on version 2.22. Angstrom currently uses linaro glibc in version 2.20 for arm. This leads to incompatible locales. They cause exeptions or hangs. e.g.: root@colibri-imx6:~# sh -c "LANG=en_US" sh: loadlocale.c:130: _nl_intern_locale_data: Assertion `cnt < (sizeof (_nl_value_type_LC_COLLATE) / sizeof (_nl_value_type_LC_COLLATE[0]))' failed. Aborted root@colibri-imx6:~# localectl status ^C Signed-off-by: Max Krummenacher <max.oss...@gmail.com> --- conf/distro/angstrom.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf index 330aebd..680bbd1 100644 --- a/conf/distro/angstrom.conf +++ b/conf/distro/angstrom.conf @@ -58,12 +58,10 @@ ANGSTROM_GDB_VERSION ?= "7.9%" #use Linaro tools for ARM ANGSTROM_GCC_VERSION_arm ?= "linaro-4.9%" ANGSTROM_BINUTILS_VERSION_arm?= "linaro-%" -GLIBCVERSION_arm ?= "linaro-2.2%" ANGSTROM_GDB_VERSION_arm ?= "linaro-%" ANGSTROM_GCC_VERSION_aarch64 ?= "linaro-4.9%" ANGSTROM_BINUTILS_VERSION_aarch64?= "linaro-%" ANGSTROM_GDB_VERSION_aarch64 ?= "linaro-%" -GLIBCVERSION_aarch64 ?= "linaro-2.2%" PREFERRED_VERSION_cross-localedef-native ?= "2.2%" ANGSTROM_QEMU_VERSION?= "2%" -- 1.8.4.5 ___ Angstrom-distro-devel mailing list Angstrom-distro-devel@linuxtogo.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
Re: [Angstrom-devel] [meta-angstrom][RFC 0/1] angstrom.conf: arm: use compatible glibc and glibc-locale
Hi everyone Ping. Any comments, thoughts on how to go on with this? Max 2015-09-29 23:02 GMT+02:00 Max Krummenacher <max.oss...@gmail.com>: > Hi > > For arm angstrom master uses glibc linaro 2.20 while oe-core master uses > glibc 2.22. > The locale generation uses the oe-core 2.22 version. So the resulting > glibc and locales do not match in version with runtime issues in the > image. > The following post fosters that clain: > https://lists.gnu.org/archive/html/guix-devel/2015-08/msg00737.html > > One solution would be to drop linaro 2.20 in favour of the oe-core glibc as > shown in the attached patch until a linaro 2.22 release is available. > Another would be to port the oe-core locale generation to also use the > linaro 2.20 glibc sources. > > Any comments? > > Regards > Max > > Max Krummenacher (1): > angstrom.conf: arm: use compatible glibc and glibc-locale > > conf/distro/angstrom.conf | 2 -- > 1 file changed, 2 deletions(-) > > -- > 1.8.4.5 > ___ Angstrom-distro-devel mailing list Angstrom-distro-devel@linuxtogo.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
[Angstrom-devel] [meta-angstrom][PATCH] angstrom-feed-configs.bb: don't replace opkg-collateral
opkg-collateral no longer exists in oe-core but the opkg recipe now
provides opkg.conf and RCONFLICTS, RREPLACES, RPROVIDES opkg-collateral.
http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-devtools/opkg?id=e8879cd1ec8914815c7a78f1d9b296b0e2b30fcf
When angstrom-feed-configs also RCONFLICTS, RREPLACES, RPROVIDES
opkg-collateral this results in the opkg package being removed during
do_rootfs.
With the missing opkg run_postinstall then fails to run postinstall scripts.
Signed-off-by: Max Krummenacher <max.oss...@gmail.com>
---
recipes-angstrom/angstrom/angstrom-feed-configs.bb | 5 -
1 file changed, 5 deletions(-)
diff --git a/recipes-angstrom/angstrom/angstrom-feed-configs.bb
b/recipes-angstrom/angstrom/angstrom-feed-configs.bb
index 6c92e31..5fb8972 100644
--- a/recipes-angstrom/angstrom/angstrom-feed-configs.bb
+++ b/recipes-angstrom/angstrom/angstrom-feed-configs.bb
@@ -59,11 +59,6 @@ CONFFILES_${PN} += "${sysconfdir}/opkg/base-feed.conf \
${sysconfdir}/opkg/sdk-feed.conf \
"
-# Get rid of opkg-collateral
-RCONFLICTS_${PN} = "opkg-collateral"
-RREPLACES_${PN} = "opkg-collateral"
-RPROVIDES_${PN} = "opkg-collateral"
-
RRECOMMENDS_${PN} += "opkg"
python populate_packages_prepend () {
--
1.8.4.5
___
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
[Angstrom-devel] [meta-angstrom][RFC 1/1] angstrom.conf: arm: use compatible glibc and glibc-locale
oe-core moved to glibc and cross-localedef-native based on version 2.22. Angstrom currently uses linaro glibc in version 2.20 for arm. This leads to incompatible locales. They cause exeptions or hangs. e.g.: root@colibri-imx6:~# sh -c "LANG=en_US" sh: loadlocale.c:130: _nl_intern_locale_data: Assertion `cnt < (sizeof (_nl_value_type_LC_COLLATE) / sizeof (_nl_value_type_LC_COLLATE[0]))' failed. Aborted root@colibri-imx6:~# localectl status ^C Signed-off-by: Max Krummenacher <max.oss...@gmail.com> --- conf/distro/angstrom.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf index 330aebd..680bbd1 100644 --- a/conf/distro/angstrom.conf +++ b/conf/distro/angstrom.conf @@ -58,12 +58,10 @@ ANGSTROM_GDB_VERSION ?= "7.9%" #use Linaro tools for ARM ANGSTROM_GCC_VERSION_arm ?= "linaro-4.9%" ANGSTROM_BINUTILS_VERSION_arm?= "linaro-%" -GLIBCVERSION_arm ?= "linaro-2.2%" ANGSTROM_GDB_VERSION_arm ?= "linaro-%" ANGSTROM_GCC_VERSION_aarch64 ?= "linaro-4.9%" ANGSTROM_BINUTILS_VERSION_aarch64?= "linaro-%" ANGSTROM_GDB_VERSION_aarch64 ?= "linaro-%" -GLIBCVERSION_aarch64 ?= "linaro-2.2%" PREFERRED_VERSION_cross-localedef-native ?= "2.2%" ANGSTROM_QEMU_VERSION?= "2%" -- 1.8.4.5 ___ Angstrom-distro-devel mailing list Angstrom-distro-devel@linuxtogo.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
[Angstrom-devel] [meta-angstrom][RFC 0/1] angstrom.conf: arm: use compatible glibc and glibc-locale
Hi For arm angstrom master uses glibc linaro 2.20 while oe-core master uses glibc 2.22. The locale generation uses the oe-core 2.22 version. So the resulting glibc and locales do not match in version with runtime issues in the image. The following post fosters that clain: https://lists.gnu.org/archive/html/guix-devel/2015-08/msg00737.html One solution would be to drop linaro 2.20 in favour of the oe-core glibc as shown in the attached patch until a linaro 2.22 release is available. Another would be to port the oe-core locale generation to also use the linaro 2.20 glibc sources. Any comments? Regards Max Max Krummenacher (1): angstrom.conf: arm: use compatible glibc and glibc-locale conf/distro/angstrom.conf | 2 -- 1 file changed, 2 deletions(-) -- 1.8.4.5 ___ Angstrom-distro-devel mailing list Angstrom-distro-devel@linuxtogo.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
[Angstrom-devel] [meta-angstrom][dizzy][PATCH 1/5] timestamp-service: use new format also for writing
https://github.com/Angstrom-distribution/meta-angstrom/commit/8228b2d56ef2415c8b96d1463fb38816279d4c74
changes the time format written to /etc/timestamp
When the system time is set from the content of /etc/timestamp,
one has to use the new format also.
While at it
- remove the now unneeded cut and concatenation as the string is already
correctly ordered.
- consistently use absolute pathnames to programs
- don't print warnings when /etc/timestamp does not exist
Signed-off-by: Koen Kooi k...@dominion.thruhere.net
(cherry picked from commit 7776d287c3ad3789ac0fc706a12b079c1dc7)
Signed-off-by: Max Krummenacher max.oss...@gmail.com
---
recipes-core/systemd/timestamp-service/load-timestamp.sh | 11 +++
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/recipes-core/systemd/timestamp-service/load-timestamp.sh
b/recipes-core/systemd/timestamp-service/load-timestamp.sh
index f1c9723..d65c729 100755
--- a/recipes-core/systemd/timestamp-service/load-timestamp.sh
+++ b/recipes-core/systemd/timestamp-service/load-timestamp.sh
@@ -5,16 +5,11 @@
# use the timestamp instead.
SYSTEMDATE=$(/bin/date -u +%4Y%2m%2d%2H%2M)
-YEAR=$(cat /etc/timestamp | cut -b 1-4)
-MONTH=$(cat /etc/timestamp | cut -b 5-6)
-DAY=$(cat /etc/timestamp | cut -b 7-8)
-TIME=$(cat /etc/timestamp | cut -b 9-12)
+TIMESTAMP=$(/bin/cat /etc/timestamp 2/dev/null)
-TIMESTAMP=$YEAR$MONTH$DAY$TIME
-
-if [ $SYSTEMDATE -lt $TIMESTAMP ]; then
+if [ $SYSTEMDATE -lt $TIMESTAMP ] 2/dev/null ; then
echo Update systemtime from /etc/timestamp
- date -u $(cat /etc/timestamp)
+ /bin/date -u ${TIMESTAMP#}${TIMESTAMP%}
fi
if [ $1 = --save ] ; then
--
1.9.3
___
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
[Angstrom-devel] [meta-angstrom][master][PATCH 3/5] timestamp-service: use new format also for writing
https://github.com/Angstrom-distribution/meta-angstrom/commit/8228b2d56ef2415c8b96d1463fb38816279d4c74
changes the time format written to /etc/timestamp
When the system time is set from the content of /etc/timestamp,
one has to use the new format also.
While at it
- remove the now unneeded cut and concatenation as the string is already
correctly ordered.
- consistently use absolute pathnames to programs
- don't print warnings when /etc/timestamp does not exist
Signed-off-by: Koen Kooi k...@dominion.thruhere.net
(cherry picked from commit 7776d287c3ad3789ac0fc706a12b079c1dc7)
Signed-off-by: Max Krummenacher max.oss...@gmail.com
---
recipes-core/systemd/timestamp-service/load-timestamp.sh | 11 +++
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/recipes-core/systemd/timestamp-service/load-timestamp.sh
b/recipes-core/systemd/timestamp-service/load-timestamp.sh
index f1c9723..d65c729 100755
--- a/recipes-core/systemd/timestamp-service/load-timestamp.sh
+++ b/recipes-core/systemd/timestamp-service/load-timestamp.sh
@@ -5,16 +5,11 @@
# use the timestamp instead.
SYSTEMDATE=$(/bin/date -u +%4Y%2m%2d%2H%2M)
-YEAR=$(cat /etc/timestamp | cut -b 1-4)
-MONTH=$(cat /etc/timestamp | cut -b 5-6)
-DAY=$(cat /etc/timestamp | cut -b 7-8)
-TIME=$(cat /etc/timestamp | cut -b 9-12)
+TIMESTAMP=$(/bin/cat /etc/timestamp 2/dev/null)
-TIMESTAMP=$YEAR$MONTH$DAY$TIME
-
-if [ $SYSTEMDATE -lt $TIMESTAMP ]; then
+if [ $SYSTEMDATE -lt $TIMESTAMP ] 2/dev/null ; then
echo Update systemtime from /etc/timestamp
- date -u $(cat /etc/timestamp)
+ /bin/date -u ${TIMESTAMP#}${TIMESTAMP%}
fi
if [ $1 = --save ] ; then
--
1.9.3
___
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
[Angstrom-devel] [meta-angstrom][daisy][PATCH 5/5] timestamp-service: don't restore time on shutdown
load-timestamp.sh --save should only save the current systemtime and not
evaluate /etc/timestamp and change the systemtime.
If the systemtime has been changed to something in the past of /etc/timestamp
then that change should be accepted without further checks.
While at it correct the comment. The RTC/hwclock is not touched by the
timestamp service. This is a copy paste error from the init.d implementation
in openembedded-core/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
Signed-off-by: Max Krummenacher max.oss...@gmail.com
---
recipes-core/systemd/timestamp-service/load-timestamp.sh | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
mode change 100755 = 100644
recipes-core/systemd/timestamp-service/load-timestamp.sh
diff --git a/recipes-core/systemd/timestamp-service/load-timestamp.sh
b/recipes-core/systemd/timestamp-service/load-timestamp.sh
old mode 100755
new mode 100644
index d65c729..9ad0e94
--- a/recipes-core/systemd/timestamp-service/load-timestamp.sh
+++ b/recipes-core/systemd/timestamp-service/load-timestamp.sh
@@ -1,8 +1,11 @@
#!/bin/sh
-# Set the system clock from hardware clock
-# If the timestamp is 1 day or more recent than the current time,
-# use the timestamp instead.
+if [ $1 != --save ] ; then
+
+# Set the system clock from timestamp file
+# if the timestamp is 1 minute or more recent
+# than the current systemtime.
+
SYSTEMDATE=$(/bin/date -u +%4Y%2m%2d%2H%2M)
TIMESTAMP=$(/bin/cat /etc/timestamp 2/dev/null)
@@ -12,7 +15,7 @@ if [ $SYSTEMDATE -lt $TIMESTAMP ] 2/dev/null ; then
/bin/date -u ${TIMESTAMP#}${TIMESTAMP%}
fi
-if [ $1 = --save ] ; then
+else
+# Store the current systemtime in /etc/timestamp
/bin/date -u +%4Y%2m%2d%2H%2M /etc/timestamp
fi
-
--
1.9.3
___
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
[Angstrom-devel] [meta-angstrom][PATCH 0/5] timestamp-service: use new format don't restore time on shutdown
Hi all The timestamp-service does change the systemtime when the timestamp is newer than the timestamp not only during boot but also on shutdown. This prevents users from changing the time backwards beyond what the current timestamp is. For master/angstrom-v2014.06-yocto1.7 the following fix from angstrom-v2014.06-yocto1.6 is not yet applied so I add it to the patchset. 7776d28 timestamp-service: use new format also for writing Max Krummenacher (2): timestamp-service: use new format also for writing timestamp-service: don't restore time on shutdown .../systemd/timestamp-service/load-timestamp.sh| 24 ++ 1 file changed, 11 insertions(+), 13 deletions(-) mode change 100755 = 100644 recipes-core/systemd/timestamp-service/load-timestamp.sh -- 1.9.3 ___ Angstrom-distro-devel mailing list Angstrom-distro-devel@linuxtogo.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
[Angstrom-devel] [meta-angstrom][dizzy][PATCH 2/5] timestamp-service: don't restore time on shutdown
load-timestamp.sh --save should only save the current systemtime and not
evaluate /etc/timestamp and change the systemtime.
If the systemtime has been changed to something in the past of /etc/timestamp
then that change should be accepted without further checks.
While at it correct the comment. The RTC/hwclock is not touched by the
timestamp service. This is a copy paste error from the init.d implementation
in openembedded-core/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
Signed-off-by: Max Krummenacher max.oss...@gmail.com
---
recipes-core/systemd/timestamp-service/load-timestamp.sh | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
mode change 100755 = 100644
recipes-core/systemd/timestamp-service/load-timestamp.sh
diff --git a/recipes-core/systemd/timestamp-service/load-timestamp.sh
b/recipes-core/systemd/timestamp-service/load-timestamp.sh
old mode 100755
new mode 100644
index d65c729..9ad0e94
--- a/recipes-core/systemd/timestamp-service/load-timestamp.sh
+++ b/recipes-core/systemd/timestamp-service/load-timestamp.sh
@@ -1,8 +1,11 @@
#!/bin/sh
-# Set the system clock from hardware clock
-# If the timestamp is 1 day or more recent than the current time,
-# use the timestamp instead.
+if [ $1 != --save ] ; then
+
+# Set the system clock from timestamp file
+# if the timestamp is 1 minute or more recent
+# than the current systemtime.
+
SYSTEMDATE=$(/bin/date -u +%4Y%2m%2d%2H%2M)
TIMESTAMP=$(/bin/cat /etc/timestamp 2/dev/null)
@@ -12,7 +15,7 @@ if [ $SYSTEMDATE -lt $TIMESTAMP ] 2/dev/null ; then
/bin/date -u ${TIMESTAMP#}${TIMESTAMP%}
fi
-if [ $1 = --save ] ; then
+else
+# Store the current systemtime in /etc/timestamp
/bin/date -u +%4Y%2m%2d%2H%2M /etc/timestamp
fi
-
--
1.9.3
___
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
[Angstrom-devel] [meta-angstrom][master][PATCH 4/5] timestamp-service: don't restore time on shutdown
load-timestamp.sh --save should only save the current systemtime and not
evaluate /etc/timestamp and change the systemtime.
If the systemtime has been changed to something in the past of /etc/timestamp
then that change should be accepted without further checks.
While at it correct the comment. The RTC/hwclock is not touched by the
timestamp service. This is a copy paste error from the init.d implementation
in openembedded-core/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
Signed-off-by: Max Krummenacher max.oss...@gmail.com
---
recipes-core/systemd/timestamp-service/load-timestamp.sh | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
mode change 100755 = 100644
recipes-core/systemd/timestamp-service/load-timestamp.sh
diff --git a/recipes-core/systemd/timestamp-service/load-timestamp.sh
b/recipes-core/systemd/timestamp-service/load-timestamp.sh
old mode 100755
new mode 100644
index d65c729..9ad0e94
--- a/recipes-core/systemd/timestamp-service/load-timestamp.sh
+++ b/recipes-core/systemd/timestamp-service/load-timestamp.sh
@@ -1,8 +1,11 @@
#!/bin/sh
-# Set the system clock from hardware clock
-# If the timestamp is 1 day or more recent than the current time,
-# use the timestamp instead.
+if [ $1 != --save ] ; then
+
+# Set the system clock from timestamp file
+# if the timestamp is 1 minute or more recent
+# than the current systemtime.
+
SYSTEMDATE=$(/bin/date -u +%4Y%2m%2d%2H%2M)
TIMESTAMP=$(/bin/cat /etc/timestamp 2/dev/null)
@@ -12,7 +15,7 @@ if [ $SYSTEMDATE -lt $TIMESTAMP ] 2/dev/null ; then
/bin/date -u ${TIMESTAMP#}${TIMESTAMP%}
fi
-if [ $1 = --save ] ; then
+else
+# Store the current systemtime in /etc/timestamp
/bin/date -u +%4Y%2m%2d%2H%2M /etc/timestamp
fi
-
--
1.9.3
___
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
[Angstrom-devel] [meta-angstrom][v2014.06] update-alternatives: use package created by opkg-utils
In daisy update-alternatives has been moved from opkg to the opkg-utils recipe.
opkg-utils now creates an additional package update-alternatives-opkg.
Without this patch the opkg-utils recipe is built and the opkg-utils package is
installed for VIRTUAL-RUNTIME_update-alternatives.
---
conf/distro/include/angstrom-package-ipk.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/conf/distro/include/angstrom-package-ipk.inc
b/conf/distro/include/angstrom-package-ipk.inc
index 7e0c68c..8a9894c 100644
--- a/conf/distro/include/angstrom-package-ipk.inc
+++ b/conf/distro/include/angstrom-package-ipk.inc
@@ -4,12 +4,12 @@ ANGSTROM_FEED_CONFIGS ?= angstrom-feed-configs
EXTRAOPKGCONFIG = opkg-config-base ${ANGSTROM_FEED_CONFIGS}
-ANGSTROM_IPK_UPDATE_ALTERNATIVES ?= opkg-utils
+ANGSTROM_IPK_UPDATE_ALTERNATIVES ?= update-alternatives-opkg
DISTRO_UPDATE_ALTERNATIVES = ${ANGSTROM_IPK_UPDATE_ALTERNATIVES}
# we need the same provider for opkg and u-a
PREFERRED_PROVIDER_virtual/update-alternatives-native ?= opkg-utils-native
-PREFERRED_PROVIDER_virtual/update-alternatives =
${ANGSTROM_IPK_UPDATE_ALTERNATIVES}
+PREFERRED_PROVIDER_virtual/update-alternatives = opkg-utils
VIRTUAL-RUNTIME_update-alternatives = ${ANGSTROM_IPK_UPDATE_ALTERNATIVES}
--
1.8.4.5
___
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
[Angstrom-devel] [meta-angstrom] [PATCH 1/1] timestamp-service: use new format also for writing
https://github.com/Angstrom-distribution/meta-angstrom/commit/8228b2d56ef2415c8b96d1463fb38816279d4c74
changes the time format written to /etc/timestamp
When the system time is set from the content of /etc/timestamp,
one has to use the new format also.
While at it
- remove the now unneeded cut and concatenation as the string is already
correctly ordered.
- consistently use absolute pathnames to programs
- don't print warnings when /etc/timestamp does not exist
---
recipes-core/systemd/timestamp-service/load-timestamp.sh | 11 +++
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/recipes-core/systemd/timestamp-service/load-timestamp.sh
b/recipes-core/systemd/timestamp-service/load-timestamp.sh
index f1c9723..d65c729 100755
--- a/recipes-core/systemd/timestamp-service/load-timestamp.sh
+++ b/recipes-core/systemd/timestamp-service/load-timestamp.sh
@@ -5,16 +5,11 @@
# use the timestamp instead.
SYSTEMDATE=$(/bin/date -u +%4Y%2m%2d%2H%2M)
-YEAR=$(cat /etc/timestamp | cut -b 1-4)
-MONTH=$(cat /etc/timestamp | cut -b 5-6)
-DAY=$(cat /etc/timestamp | cut -b 7-8)
-TIME=$(cat /etc/timestamp | cut -b 9-12)
+TIMESTAMP=$(/bin/cat /etc/timestamp 2/dev/null)
-TIMESTAMP=$YEAR$MONTH$DAY$TIME
-
-if [ $SYSTEMDATE -lt $TIMESTAMP ]; then
+if [ $SYSTEMDATE -lt $TIMESTAMP ] 2/dev/null ; then
echo Update systemtime from /etc/timestamp
- date -u $(cat /etc/timestamp)
+ /bin/date -u ${TIMESTAMP#}${TIMESTAMP%}
fi
if [ $1 = --save ] ; then
--
1.8.4.5
___
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
