* [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187
@ 2012-07-31 18:56 Khem Raj
2012-07-31 18:56 ` [meta-systemd][PATCH V2 2/7] busybox: stopping systemd-kmsg-syslogd is not needed Khem Raj
` (6 more replies)
0 siblings, 7 replies; 38+ messages in thread
From: Khem Raj @ 2012-07-31 18:56 UTC (permalink / raw)
To: openembedded-devel
Dont inherit vala and gitpkgv not needed anymore
Along with upgrade use the release tarballs instead of git
Fix build for ppc64
Consider /lib64 and /usr/lib64
Some 64bit architectures chose lib64 instead of lib
for default library dirnames. So we dig this from metadata
vars base_libdir and libdir instead of hardcoding 'lib'
ppc64 in OE uses lib64 for default libdir
and this leaves lot of udev/systemd
files unpackaged since 'lib' was hardcoded
Additionally use --split-usr option since
in OE-Core now we want to treat /usr mounted
sepatately.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta-systemd/classes/systemd.bbclass | 5 +-
.../systemd/systemd/use-rootlibdir.patch | 94 ++++++++
meta-systemd/recipes-core/systemd/systemd_187.bb | 220 +++++++++++++++++++
meta-systemd/recipes-core/systemd/systemd_git.bb | 224 --------------------
4 files changed, 318 insertions(+), 225 deletions(-)
create mode 100644 meta-systemd/recipes-core/systemd/systemd/use-rootlibdir.patch
create mode 100644 meta-systemd/recipes-core/systemd/systemd_187.bb
delete mode 100644 meta-systemd/recipes-core/systemd/systemd_git.bb
diff --git a/meta-systemd/classes/systemd.bbclass b/meta-systemd/classes/systemd.bbclass
index dd9f326..4036f91 100644
--- a/meta-systemd/classes/systemd.bbclass
+++ b/meta-systemd/classes/systemd.bbclass
@@ -154,7 +154,10 @@ python populate_packages_prepend () {
# check service-files and call systemd_add_files_and_parse for each entry
def systemd_check_services():
- searchpaths = '/etc/systemd/system/ /lib/systemd/system/ /usr/lib/systemd/system/'
+ base_libdir = d.getVar('base_libdir', 1)
+ searchpaths = '/etc/systemd/system/' + ' '
+ searchpaths += d.getVar('base_libdir', 1) + '/systemd/system/' + ' '
+ searchpaths += d.getVar('libdir', 1) + '/systemd/system/' + ' '
systemd_packages = d.getVar('SYSTEMD_PACKAGES', 1)
has_exactly_one_service = len(systemd_packages.split()) == 1
if has_exactly_one_service:
diff --git a/meta-systemd/recipes-core/systemd/systemd/use-rootlibdir.patch b/meta-systemd/recipes-core/systemd/systemd/use-rootlibdir.patch
new file mode 100644
index 0000000..2167216
--- /dev/null
+++ b/meta-systemd/recipes-core/systemd/systemd/use-rootlibdir.patch
@@ -0,0 +1,94 @@
+Upstream-Status: Undecided
+
+This patch removes some of hardcoded references to /lib
+and /usr/lib since on some architectures it should be
+/lib64 and /usr/lib64 atleast in OE
+
+I am not sure about the intention of hardcoded values
+thats why status is undecided
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: git/Makefile.am
+===================================================================
+--- git.orig/Makefile.am 2012-07-22 16:20:38.424405916 -0700
++++ git/Makefile.am 2012-07-22 16:23:21.232406621 -0700
+@@ -61,23 +61,23 @@
+
+ # Our own, non-special dirs
+ pkgsysconfdir=$(sysconfdir)/systemd
+-userunitdir=$(prefix)/lib/systemd/user
+-tmpfilesdir=$(prefix)/lib/tmpfiles.d
+-sysctldir=$(prefix)/lib/sysctl.d
+-usergeneratordir=$(prefix)/lib/systemd/user-generators
++userunitdir=$(prefix)/$(rootlibdir)/systemd/user
++tmpfilesdir=$(prefix)/$(rootlibdir)/tmpfiles.d
++sysctldir=$(prefix)/$(rootlibdir)/sysctl.d
++usergeneratordir=$(prefix)/$(rootlibdir)/systemd/user-generators
+ pkgincludedir=$(includedir)/systemd
+ systemgeneratordir=$(rootlibexecdir)/system-generators
+ systemshutdowndir=$(rootlibexecdir)/system-shutdown
+ systemsleepdir=$(rootlibexecdir)/system-sleep
+-systemunitdir=$(rootprefix)/lib/systemd/system
+-udevlibexecdir=$(rootprefix)/lib/udev
++systemunitdir=$(rootprefix)/$(rootlibdir)/systemd/system
++udevlibexecdir=$(rootprefix)/$(rootlibdir)/udev
+ udevhomedir = $(udevlibexecdir)
+ udevrulesdir = $(udevlibexecdir)/rules.d
+
+ # And these are the special ones for /
+ rootprefix=@rootprefix@
+ rootbindir=$(rootprefix)/bin
+-rootlibexecdir=$(rootprefix)/lib/systemd
++rootlibexecdir=$(rootprefix)/$(rootlibdir)/systemd
+
+ CLEANFILES =
+ EXTRA_DIST =
+@@ -126,7 +126,7 @@
+ -DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
+ -DROOTPREFIX=\"$(rootprefix)\" \
+ -DRUNTIME_DIR=\"/run\" \
+- -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
++ -DRANDOM_SEED=\"$(localstatedir)/$(rootlibdir)/random-seed\" \
+ -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
+ -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
+ -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
+@@ -2535,7 +2535,7 @@
+
+ binfmt-install-data-hook:
+ $(MKDIR_P) -m 0755 \
+- $(DESTDIR)$(prefix)/lib/binfmt.d \
++ $(DESTDIR)$(prefix)/$(rootlibdir)/binfmt.d \
+ $(DESTDIR)$(sysconfdir)/binfmt.d \
+ $(DESTDIR)$(systemunitdir)/sysinit.target.wants
+ ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+@@ -3165,7 +3165,7 @@
+ logind-install-data-hook:
+ $(MKDIR_P) -m 0755 \
+ $(DESTDIR)$(systemunitdir)/multi-user.target.wants \
+- $(DESTDIR)$(localstatedir)/lib/systemd
++ $(DESTDIR)$(localstatedir)/$(rootlibdir)/systemd
+ ( cd $(DESTDIR)$(systemunitdir) && \
+ rm -f dbus-org.freedesktop.login1.service && \
+ $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
+@@ -3284,7 +3284,7 @@
+ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
+ -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
+ -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
+- -e 's,@RANDOM_SEED\@,$(localstatedir)/lib/random-seed,g' \
++ -e 's,@RANDOM_SEED\@,$(localstatedir)/$(rootlibdir)/random-seed,g' \
+ -e 's,@prefix\@,$(prefix),g' \
+ -e 's,@exec_prefix\@,$(exec_prefix),g' \
+ -e 's,@libdir\@,$(libdir),g' \
+@@ -3407,9 +3407,9 @@
+ $(MKDIR_P) -m 0755 \
+ $(DESTDIR)$(tmpfilesdir) \
+ $(DESTDIR)$(sysconfdir)/tmpfiles.d \
+- $(DESTDIR)$(prefix)/lib/modules-load.d \
++ $(DESTDIR)$(prefix)/$(rootlibdir)/modules-load.d \
+ $(DESTDIR)$(sysconfdir)/modules-load.d \
+- $(DESTDIR)$(prefix)/lib/sysctl.d \
++ $(DESTDIR)$(prefix)/$(rootlibdir)/sysctl.d \
+ $(DESTDIR)$(sysconfdir)/sysctl.d \
+ $(DESTDIR)$(systemshutdowndir) \
+ $(DESTDIR)$(systemsleepdir) \
diff --git a/meta-systemd/recipes-core/systemd/systemd_187.bb b/meta-systemd/recipes-core/systemd/systemd_187.bb
new file mode 100644
index 0000000..a6f6281
--- /dev/null
+++ b/meta-systemd/recipes-core/systemd/systemd_187.bb
@@ -0,0 +1,220 @@
+DESCRIPTION = "Systemd a init replacement"
+HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE = "GPLv2 & LGPLv2.1 & MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
+ file://LICENSE.LGPL2.1;md5=fb919cc88dbe06ec0b0bd50e001ccf1f \
+ file://LICENSE.MIT;md5=544799d0b492f119fa04641d1b8868ed"
+
+PROVIDES = "udev"
+
+DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers usbutils glib-2.0"
+DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
+
+SERIAL_CONSOLE ?= "115200 /dev/ttyS0"
+
+SECTION = "base/shell"
+
+inherit useradd pkgconfig autotools perlnative
+
+SRC_URI = "http://www.freedesktop.org/software/systemd/${P}.tar.xz \
+ file://use-rootlibdir.patch \
+ file://gtk-doc.make \
+ file://touchscreen.rules \
+ file://modprobe.rules \
+ file://var-run.conf \
+ "
+
+SRC_URI[md5sum] = "26606e3c84448800ef0b3ffd57e6e8b6"
+SRC_URI[sha256sum] = "1a3b338f00cc1ec8b1dcdafe6ce7928f016f70403190db72960df38731fbeed4"
+
+LDFLAGS_libc-uclibc_append = " -lrt"
+
+SYSTEMDDISTRO ?= "debian"
+SYSTEMDDISTRO_angstrom = "angstrom"
+
+CACHED_CONFIGUREVARS = "ac_cv_file__usr_share_pci_ids=no \
+ ac_cv_file__usr_share_hwdata_pci_ids=no \
+ ac_cv_file__usr_share_misc_pci_ids=yes"
+# The gtk+ tools should get built as a separate recipe e.g. systemd-tools
+EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \
+ --with-rootprefix=${base_prefix} \
+ --with-rootlibdir=${base_libdir} \
+ --sbindir=${base_sbindir} \
+ --libexecdir=${base_libdir} \
+ ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \
+ --enable-xz \
+ --disable-manpages \
+ --disable-coredump \
+ --disable-introspection \
+ --with-pci-ids-path=/usr/share/misc \
+ --disable-gtk-doc-html \
+ --disable-tcpwrap \
+ --enable-split-usr \
+ "
+
+# There's no docbook-xsl-native, so for the xsltproc check to false
+do_configure_prepend() {
+ sed -i /xsltproc/d configure.ac
+
+ cp ${WORKDIR}/gtk-doc.make ${S}/docs/
+
+ # we only have /home/root, not /root
+ sed -i -e 's:=/root:=/home/root:g' units/*.service*
+}
+
+do_install() {
+ autotools_do_install
+ # provided by a seperate recipe
+ rm ${D}${systemd_unitdir}/system/serial-getty* -f
+
+ # provide support for initramfs
+ ln -s ${systemd_unitdir}/systemd ${D}/init
+
+ # create dir for journal
+ install -d ${D}${localstatedir}/log/journal
+
+ # create machine-id
+ # 20:12 < mezcalero> koen: you have three options: a) run systemd-machine-id-setup at install time, b) have / read-only and an empty file there (for stateless) and c) boot with / writable
+ touch ${D}${sysconfdir}/machine-id
+
+ install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/
+
+ install -m 0644 ${WORKDIR}/var-run.conf ${D}${sysconfdir}/tmpfiles.d/
+}
+
+python populate_packages_prepend (){
+ systemdlibdir = d.getVar("base_libdir", True)
+ do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True)
+}
+
+PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze"
+
+USERADD_PACKAGES = "${PN}"
+GROUPADD_PARAM_${PN} = "-r lock"
+
+FILES_${PN}-analyze = "${bindir}/systemd-analyze"
+RDEPENDS_${PN}-analyze = "python-dbus"
+RRECOMMENDS_${PN}-analyze = "python-pycairo"
+
+FILES_${PN}-initramfs = "/init"
+RDEPENDS_${PN}-initramfs = "${PN}"
+
+FILES_${PN}-gui = "${bindir}/systemadm"
+
+FILES_${PN}-vconsole-setup = "${systemd_unitdir}/systemd-vconsole-setup \
+ ${systemd_unitdir}/system/systemd-vconsole-setup.service \
+ ${systemd_unitdir}/system/sysinit.target.wants/systemd-vconsole-setup.service"
+
+RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts"
+
+FILES_${PN} = " ${base_bindir}/* \
+ ${datadir}/dbus-1/services \
+ ${datadir}/dbus-1/system-services \
+ ${datadir}/polkit-1 \
+ ${datadir}/${PN} \
+ ${sysconfdir}/bash_completion.d/ \
+ ${sysconfdir}/binfmt.d/ \
+ ${sysconfdir}/dbus-1/ \
+ ${sysconfdir}/machine-id \
+ ${sysconfdir}/modules-load.d/ \
+ ${sysconfdir}/sysctl.d/ \
+ ${sysconfdir}/systemd/ \
+ ${sysconfdir}/tmpfiles.d/ \
+ ${sysconfdir}/xdg/ \
+ ${systemd_unitdir}/* \
+ ${systemd_unitdir}/system/* \
+ ${base_libdir}/udev/rules.d/99-systemd.rules \
+ ${base_libdir}/security/*.so \
+ /cgroup \
+ ${bindir}/systemd* \
+ ${libdir}/tmpfiles.d/*.conf \
+ ${libdir}/systemd \
+ ${libdir}/binfmt.d \
+ ${libdir}/modules-load.d \
+ ${libdir}/sysctl.d \
+ ${localstatedir} \
+ ${libexecdir} \
+ ${base_libdir}/udev/rules.d/70-uaccess.rules \
+ ${base_libdir}/udev/rules.d/71-seat.rules \
+ ${base_libdir}/udev/rules.d/73-seat-late.rules \
+ ${base_libdir}/udev/rules.d/99-systemd.rules \
+ "
+
+FILES_${PN}-dbg += "${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/"
+FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd"
+
+RDEPENDS_${PN} += "dbus-systemd udev-systemd"
+
+# kbd -> loadkeys,setfont
+# systemd calls 'modprobe -sab --', which busybox doesn't support due to lack
+# of blacklist support, so use proper modprobe from module-init-tools
+# And pull in the kernel modules mentioned in INSTALL
+# swapon -p is also not supported by busybox
+# busybox mount is broken
+RRECOMMENDS_${PN} += "systemd-serialgetty \
+ util-linux-agetty \
+ util-linux-swaponoff \
+ util-linux-fsck e2fsprogs-e2fsck \
+ module-init-tools \
+ util-linux-mount util-linux-umount \
+ kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \
+"
+
+PACKAGES =+ "udev-dbg udev udev-consolekit udev-utils udev-systemd"
+
+FILES_udev-dbg += "${base_libdir}/udev/.debug"
+
+RDEPENDS_udev += "udev-utils"
+RPROVIDES_udev = "hotplug"
+
+FILES_udev += "${base_libdir}/udev/udevd \
+ ${base_libdir}/systemd/systemd-udevd \
+ ${base_libdir}/udev/accelerometer \
+ ${base_libdir}/udev/ata_id \
+ ${base_libdir}/udev/cdrom_id \
+ ${base_libdir}/udev/collect \
+ ${base_libdir}/udev/findkeyboards \
+ ${base_libdir}/udev/keyboard-force-release.sh \
+ ${base_libdir}/udev/keymap \
+ ${base_libdir}/udev/mtd_probe \
+ ${base_libdir}/udev/scsi_id \
+ ${base_libdir}/udev/v4l_id \
+ ${base_libdir}/udev/keymaps \
+ ${base_libdir}/udev/rules.d/4*.rules \
+ ${base_libdir}/udev/rules.d/5*.rules \
+ ${base_libdir}/udev/rules.d/6*.rules \
+ ${base_libdir}/udev/rules.d/70-power-switch.rules \
+ ${base_libdir}/udev/rules.d/75*.rules \
+ ${base_libdir}/udev/rules.d/78*.rules \
+ ${base_libdir}/udev/rules.d/8*.rules \
+ ${base_libdir}/udev/rules.d/95*.rules \
+ ${sysconfdir}/udev \
+ "
+
+FILES_udev-consolekit += "${libdir}/ConsoleKit"
+RDEPENDS_udev-consolekit += "${@base_contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}"
+
+FILES_udev-utils = "${bindir}/udevadm"
+
+FILES_udev-systemd = "${base_libdir}/systemd/system/*udev* ${base_libdir}/systemd/system/*.wants/*udev*"
+RDEPENDS_udev-systemd = "udev"
+
+# TODO:
+# u-a for runlevel and telinit
+
+pkg_postinst_systemd () {
+update-alternatives --install ${base_sbindir}/init init ${systemd_unitdir}/systemd 300
+update-alternatives --install ${base_sbindir}/halt halt ${base_bindir}/systemctl 300
+update-alternatives --install ${base_sbindir}/reboot reboot ${base_bindir}/systemctl 300
+update-alternatives --install ${base_sbindir}/shutdown shutdown ${base_bindir}/systemctl 300
+update-alternatives --install ${base_sbindir}/poweroff poweroff ${base_bindir}/systemctl 300
+}
+
+pkg_prerm_systemd () {
+update-alternatives --remove init ${systemd_unitdir}/systemd
+update-alternatives --remove halt ${base_bindir}/systemctl
+update-alternatives --remove reboot ${base_bindir}/systemctl
+update-alternatives --remove shutdown ${base_bindir}/systemctl
+update-alternatives --remove poweroff ${base_bindir}/systemctl
+}
diff --git a/meta-systemd/recipes-core/systemd/systemd_git.bb b/meta-systemd/recipes-core/systemd/systemd_git.bb
deleted file mode 100644
index 39b883a..0000000
--- a/meta-systemd/recipes-core/systemd/systemd_git.bb
+++ /dev/null
@@ -1,224 +0,0 @@
-DESCRIPTION = "Systemd a init replacement"
-HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE = "GPLv2 & LGPLv2.1 & MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
- file://LICENSE.LGPL2.1;md5=fb919cc88dbe06ec0b0bd50e001ccf1f \
- file://LICENSE.MIT;md5=544799d0b492f119fa04641d1b8868ed"
-
-PROVIDES = "udev"
-
-DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers usbutils glib-2.0"
-DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
-
-SERIAL_CONSOLE ?= "115200 /dev/ttyS0"
-
-SECTION = "base/shell"
-
-inherit gitpkgv
-PKGV = "v${GITPKGVTAG}"
-
-PV = "git"
-PR = "r4"
-
-inherit useradd pkgconfig autotools vala perlnative
-
-SRCREV = "cd96b3b86abb4a88cac2722bdfb6e5d4413f6831"
-
-SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;protocol=git \
- file://gtk-doc.make \
- file://touchscreen.rules \
- file://modprobe.rules \
- file://var-run.conf \
- "
-LDFLAGS_libc-uclibc_append = " -lrt"
-
-S = "${WORKDIR}/git"
-
-SYSTEMDDISTRO ?= "debian"
-SYSTEMDDISTRO_angstrom = "angstrom"
-
-# The gtk+ tools should get built as a separate recipe e.g. systemd-tools
-EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \
- --with-rootprefix=${base_prefix} \
- --with-rootlibdir=${base_libdir} \
- --sbindir=${base_sbindir} \
- --libexecdir=${base_libdir} \
- ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \
- --enable-xz \
- --disable-manpages \
- --disable-coredump \
- --disable-introspection \
- --with-pci-ids-path=/usr/share/misc \
- ac_cv_file__usr_share_pci_ids=no \
- ac_cv_file__usr_share_hwdata_pci_ids=no \
- ac_cv_file__usr_share_misc_pci_ids=yes \
- --disable-gtk-doc-html \
- --disable-tcpwrap \
- "
-
-# There's no docbook-xsl-native, so for the xsltproc check to false
-do_configure_prepend() {
- sed -i /xsltproc/d configure.ac
-
- cp ${WORKDIR}/gtk-doc.make ${S}/docs/
-
- # we only have /home/root, not /root
- sed -i -e 's:=/root:=/home/root:g' units/*.service*
-}
-
-do_install() {
- autotools_do_install
- # provided by a seperate recipe
- rm ${D}${systemd_unitdir}/system/serial-getty* -f
-
- # provide support for initramfs
- ln -s ${systemd_unitdir}/systemd ${D}/init
-
- # create dir for journal
- install -d ${D}${localstatedir}/log/journal
-
- # create machine-id
- # 20:12 < mezcalero> koen: you have three options: a) run systemd-machine-id-setup at install time, b) have / read-only and an empty file there (for stateless) and c) boot with / writable
- touch ${D}${sysconfdir}/machine-id
-
- install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/
-
- install -m 0644 ${WORKDIR}/var-run.conf ${D}${sysconfdir}/tmpfiles.d/
-}
-
-python populate_packages_prepend (){
- systemdlibdir = d.getVar("base_libdir", True)
- do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True)
-}
-
-PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze"
-
-USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM_${PN} = "-r lock"
-
-FILES_${PN}-analyze = "${bindir}/systemd-analyze"
-RDEPENDS_${PN}-analyze = "python-dbus"
-RRECOMMENDS_${PN}-analyze = "python-pycairo"
-
-FILES_${PN}-initramfs = "/init"
-RDEPENDS_${PN}-initramfs = "${PN}"
-
-FILES_${PN}-gui = "${bindir}/systemadm"
-
-FILES_${PN}-vconsole-setup = "${systemd_unitdir}/systemd-vconsole-setup \
- ${systemd_unitdir}/system/systemd-vconsole-setup.service \
- ${systemd_unitdir}/system/sysinit.target.wants/systemd-vconsole-setup.service"
-
-RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts"
-
-FILES_${PN} = " ${base_bindir}/* \
- ${datadir}/dbus-1/services \
- ${datadir}/dbus-1/system-services \
- ${datadir}/polkit-1 \
- ${datadir}/${PN} \
- ${sysconfdir}/bash_completion.d/ \
- ${sysconfdir}/binfmt.d/ \
- ${sysconfdir}/dbus-1/ \
- ${sysconfdir}/machine-id \
- ${sysconfdir}/modules-load.d/ \
- ${sysconfdir}/sysctl.d/ \
- ${sysconfdir}/systemd/ \
- ${sysconfdir}/tmpfiles.d/ \
- ${sysconfdir}/xdg/ \
- ${systemd_unitdir}/* \
- ${systemd_unitdir}/system/* \
- ${base_libdir}/udev/rules.d/99-systemd.rules \
- ${base_libdir}/security/*.so \
- /cgroup \
- ${bindir}/systemd* \
- ${libdir}/tmpfiles.d/*.conf \
- ${libdir}/systemd \
- ${libdir}/binfmt.d \
- ${libdir}/modules-load.d \
- ${libdir}/sysctl.d \
- ${localstatedir} \
- ${libexecdir} \
- ${base_libdir}/udev/rules.d/70-uaccess.rules \
- ${base_libdir}/udev/rules.d/71-seat.rules \
- ${base_libdir}/udev/rules.d/73-seat-late.rules \
- ${base_libdir}/udev/rules.d/99-systemd.rules \
- "
-
-FILES_${PN}-dbg += "${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/"
-FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd"
-
-RDEPENDS_${PN} += "dbus-systemd udev-systemd"
-
-# kbd -> loadkeys,setfont
-# systemd calls 'modprobe -sab --', which busybox doesn't support due to lack
-# of blacklist support, so use proper modprobe from module-init-tools
-# And pull in the kernel modules mentioned in INSTALL
-# swapon -p is also not supported by busybox
-# busybox mount is broken
-RRECOMMENDS_${PN} += "systemd-serialgetty \
- util-linux-agetty \
- util-linux-swaponoff \
- util-linux-fsck e2fsprogs-e2fsck \
- module-init-tools \
- util-linux-mount util-linux-umount \
- kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \
-"
-
-PACKAGES =+ "udev-dbg udev udev-consolekit udev-utils udev-systemd"
-
-FILES_udev-dbg += "${base_libdir}/udev/.debug"
-
-RDEPENDS_udev += "udev-utils"
-RPROVIDES_udev = "hotplug"
-
-FILES_udev += "${base_libdir}/udev/udevd \
- ${base_libdir}/systemd/systemd-udevd \
- ${base_libdir}/udev/accelerometer \
- ${base_libdir}/udev/ata_id \
- ${base_libdir}/udev/cdrom_id \
- ${base_libdir}/udev/collect \
- ${base_libdir}/udev/findkeyboards \
- ${base_libdir}/udev/keyboard-force-release.sh \
- ${base_libdir}/udev/keymap \
- ${base_libdir}/udev/mtd_probe \
- ${base_libdir}/udev/scsi_id \
- ${base_libdir}/udev/v4l_id \
- ${base_libdir}/udev/keymaps \
- ${base_libdir}/udev/rules.d/4*.rules \
- ${base_libdir}/udev/rules.d/5*.rules \
- ${base_libdir}/udev/rules.d/6*.rules \
- ${base_libdir}/udev/rules.d/70-power-switch.rules \
- ${base_libdir}/udev/rules.d/75*.rules \
- ${base_libdir}/udev/rules.d/78*.rules \
- ${base_libdir}/udev/rules.d/8*.rules \
- ${base_libdir}/udev/rules.d/95*.rules \
- ${sysconfdir}/udev \
- "
-
-FILES_udev-consolekit += "${libdir}/ConsoleKit"
-RDEPENDS_udev-consolekit += "${@base_contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}"
-
-FILES_udev-utils = "${bindir}/udevadm"
-
-FILES_udev-systemd = "${base_libdir}/systemd/system/*udev* ${base_libdir}/systemd/system/*.wants/*udev*"
-RDEPENDS_udev-systemd = "udev"
-
-# TODO:
-# u-a for runlevel and telinit
-
-pkg_postinst_systemd () {
-update-alternatives --install ${base_sbindir}/init init ${systemd_unitdir}/systemd 300
-update-alternatives --install ${base_sbindir}/halt halt ${base_bindir}/systemctl 300
-update-alternatives --install ${base_sbindir}/reboot reboot ${base_bindir}/systemctl 300
-update-alternatives --install ${base_sbindir}/shutdown shutdown ${base_bindir}/systemctl 300
-update-alternatives --install ${base_sbindir}/poweroff poweroff ${base_bindir}/systemctl 300
-}
-
-pkg_prerm_systemd () {
-update-alternatives --remove init ${systemd_unitdir}/systemd
-update-alternatives --remove halt ${base_bindir}/systemctl
-update-alternatives --remove reboot ${base_bindir}/systemctl
-update-alternatives --remove shutdown ${base_bindir}/systemctl
-update-alternatives --remove poweroff ${base_bindir}/systemctl
-}
--
1.7.5.4
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [meta-systemd][PATCH V2 2/7] busybox: stopping systemd-kmsg-syslogd is not needed
2012-07-31 18:56 [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187 Khem Raj
@ 2012-07-31 18:56 ` Khem Raj
2012-07-31 18:56 ` [meta-systemd][PATCH V2 3/7] busybox-syslog.service.in: Create alias for syslog.service Khem Raj
` (5 subsequent siblings)
6 siblings, 0 replies; 38+ messages in thread
From: Khem Raj @ 2012-07-31 18:56 UTC (permalink / raw)
To: openembedded-devel
systemd-kmsg-syslogd.service is discontinued in systemd so
there is no need to stop it.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../busybox/busybox/busybox-syslog.service.in | 1 -
.../recipes-core/busybox/busybox_1.19.4.bbappend | 2 +-
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in b/meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in
index 27b9831..c6c625e 100644
--- a/meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in
+++ b/meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in
@@ -3,7 +3,6 @@ Description=System Logging Service
Wants=busybox-klogd.service
[Service]
-ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service
EnvironmentFile=-/etc/default/busybox-syslog
ExecStart=@base_sbindir@/syslogd -n $OPTIONS
Sockets=syslog.socket
diff --git a/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend b/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
index a0ae2ce..915a50e 100644
--- a/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
+++ b/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
@@ -1,6 +1,6 @@
inherit systemd
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"
# look for files in the layer first
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [meta-systemd][PATCH V2 3/7] busybox-syslog.service.in: Create alias for syslog.service
2012-07-31 18:56 [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187 Khem Raj
2012-07-31 18:56 ` [meta-systemd][PATCH V2 2/7] busybox: stopping systemd-kmsg-syslogd is not needed Khem Raj
@ 2012-07-31 18:56 ` Khem Raj
2012-07-31 18:56 ` [meta-systemd][PATCH V2 4/7] systemd: Use cross cpp Khem Raj
` (4 subsequent siblings)
6 siblings, 0 replies; 38+ messages in thread
From: Khem Raj @ 2012-07-31 18:56 UTC (permalink / raw)
To: openembedded-devel
The default syslog implementation should make syslog.service a
symlink to itself, so that this socket activates the right actual
syslog service.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../busybox/busybox/busybox-syslog.service.in | 1 +
.../recipes-core/busybox/busybox_1.19.4.bbappend | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in b/meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in
index c6c625e..2e04321 100644
--- a/meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in
+++ b/meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in
@@ -10,3 +10,4 @@ Sockets=syslog.socket
[Install]
WantedBy=multi-user.target
Also=busybox-klogd.service
+Alias=syslog.service
diff --git a/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend b/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
index 915a50e..bb11550 100644
--- a/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
+++ b/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
@@ -1,6 +1,6 @@
inherit systemd
-PRINC := "${@int(PRINC) + 2}"
+PRINC := "${@int(PRINC) + 3}"
# look for files in the layer first
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [meta-systemd][PATCH V2 4/7] systemd: Use cross cpp
2012-07-31 18:56 [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187 Khem Raj
2012-07-31 18:56 ` [meta-systemd][PATCH V2 2/7] busybox: stopping systemd-kmsg-syslogd is not needed Khem Raj
2012-07-31 18:56 ` [meta-systemd][PATCH V2 3/7] busybox-syslog.service.in: Create alias for syslog.service Khem Raj
@ 2012-07-31 18:56 ` Khem Raj
2012-07-31 18:56 ` [meta-oe][PATCH V2 5/7] testlab.bbclass: Delete Khem Raj
` (3 subsequent siblings)
6 siblings, 0 replies; 38+ messages in thread
From: Khem Raj @ 2012-07-31 18:56 UTC (permalink / raw)
To: openembedded-devel
While building for non x86 arch (ppc) found that build
was using host's cpp which was not generating exact
syscall list for ppc since it was using the include files
from host
With this patch will use $(CPP) instead of hardcoding
cpp in makefile.am and then set CPP properly in recipe
Fixes build failures on cross builds
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../systemd/systemd/use-cross-cpp.patch | 30 ++++++++++++++++++++
meta-systemd/recipes-core/systemd/systemd_187.bb | 5 +++
2 files changed, 35 insertions(+), 0 deletions(-)
create mode 100644 meta-systemd/recipes-core/systemd/systemd/use-cross-cpp.patch
diff --git a/meta-systemd/recipes-core/systemd/systemd/use-cross-cpp.patch b/meta-systemd/recipes-core/systemd/systemd/use-cross-cpp.patch
new file mode 100644
index 0000000..8a4371e
--- /dev/null
+++ b/meta-systemd/recipes-core/systemd/systemd/use-cross-cpp.patch
@@ -0,0 +1,30 @@
+hardcoding cpp does not work when cross compiling systemd.
+since it will use the include headers from host system and
+syscalls are different for different architectures.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+
+Index: systemd-187/Makefile.am
+===================================================================
+--- systemd-187.orig/Makefile.am 2012-07-29 16:39:57.628405921 -0700
++++ systemd-187/Makefile.am 2012-07-29 16:40:37.248405921 -0700
+@@ -1026,7 +1026,7 @@
+ src/core/syscall-to-name.h
+
+ src/core/syscall-list.txt: Makefile
+- $(AM_V_GEN)cpp $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9]/ { sub(/__NR_/, "", $$2); print $$2; }' > $@
++ $(AM_V_GEN)$(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9]/ { sub(/__NR_/, "", $$2); print $$2; }' > $@
+
+ src/core/syscall-from-name.gperf: src/core/syscall-list.txt Makefile
+ $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct syscall_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, __NR_%s\n", $$1, $$1 }' < $< > $@
+@@ -2199,7 +2199,7 @@
+
+ src/udev/keymap/keys.txt: Makefile
+ $(AM_V_at)mkdir -p src/udev/keymap
+- $(AM_V_GEN)cpp $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
++ $(AM_V_GEN)$(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
+
+ src/udev/keymap/keys-from-name.gperf: src/udev/keymap/keys.txt Makefile
+ $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@
diff --git a/meta-systemd/recipes-core/systemd/systemd_187.bb b/meta-systemd/recipes-core/systemd/systemd_187.bb
index a6f6281..a52e5a8 100644
--- a/meta-systemd/recipes-core/systemd/systemd_187.bb
+++ b/meta-systemd/recipes-core/systemd/systemd_187.bb
@@ -15,10 +15,14 @@ SERIAL_CONSOLE ?= "115200 /dev/ttyS0"
SECTION = "base/shell"
+PR = "r1"
+
+
inherit useradd pkgconfig autotools perlnative
SRC_URI = "http://www.freedesktop.org/software/systemd/${P}.tar.xz \
file://use-rootlibdir.patch \
+ file://use-cross-cpp.patch \
file://gtk-doc.make \
file://touchscreen.rules \
file://modprobe.rules \
@@ -55,6 +59,7 @@ EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \
# There's no docbook-xsl-native, so for the xsltproc check to false
do_configure_prepend() {
+ export CPP="${HOST_PREFIX}cpp ${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}"
sed -i /xsltproc/d configure.ac
cp ${WORKDIR}/gtk-doc.make ${S}/docs/
--
1.7.5.4
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [meta-oe][PATCH V2 5/7] testlab.bbclass: Delete
2012-07-31 18:56 [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187 Khem Raj
` (2 preceding siblings ...)
2012-07-31 18:56 ` [meta-systemd][PATCH V2 4/7] systemd: Use cross cpp Khem Raj
@ 2012-07-31 18:56 ` Khem Raj
2012-07-31 18:56 ` [meta-oe][PATCH V2 6/7] blacklist.bbclass: Move to meta-angstrom Khem Raj
` (2 subsequent siblings)
6 siblings, 0 replies; 38+ messages in thread
From: Khem Raj @ 2012-07-31 18:56 UTC (permalink / raw)
To: openembedded-devel
This functionality is now provided by buildhistory as well.
so lets remove it in favor of that
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta-oe/classes/testlab.bbclass | 114 ---------------------------------------
1 files changed, 0 insertions(+), 114 deletions(-)
delete mode 100644 meta-oe/classes/testlab.bbclass
diff --git a/meta-oe/classes/testlab.bbclass b/meta-oe/classes/testlab.bbclass
deleted file mode 100644
index c097e9e..0000000
--- a/meta-oe/classes/testlab.bbclass
+++ /dev/null
@@ -1,114 +0,0 @@
-#
-# Performs various tests and analysises on images
-#
-# Copyright (C) 2007, 2008 Koen Kooi <koen@openembedded.org>
-
-# The current features are:
-# 1) dump a list of installed packages
-# 2) dump a list of sizes of installed packages
-# 3) dependency graphs of installed packages
-
-# See
-# * http://dominion.thruhere.net/koen/cms/the-testlab-strikes-again
-# * http://dominion.thruhere.net/koen/cms/package-relations-inside-images
-# for use cases
-
-# TODO:
-# * log information to a server for safekeeping
-# * use git notes to record this info into the scm
-# * add test suite to run on the target device
-
-
-# Needs 'dot', 'opkg-cl'
-
-do_testlab() {
-if [ -e ${IMAGE_ROOTFS}/etc/opkg ] && [ "${ONLINE_PACKAGE_MANAGEMENT}" = "full" ] ; then
-
- IPKG_TMP_DIR="${IMAGE_ROOTFS}-tmp"
- IPKG_ARGS="-f ${STAGING_ETCDIR_NATIVE}/opkg.conf -o ${IMAGE_ROOTFS} -t ${IPKG_TMP_DIR}"
-
- TESTLAB_DIR="${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-testlab"
- mkdir -p ${TESTLAB_DIR}/
- mkdir -p ${IPKG_TMP_DIR}/
- ls -laR ${IMAGE_ROOTFS} > ${TESTLAB_DIR}/files-in-image.txt
-
- echo > ${TESTLAB_DIR}/installed-packages.txt
- echo -e "digraph depends {\n node [shape=plaintext]" > ${TESTLAB_DIR}/depends.dot
-
- for pkg in $(opkg-cl ${IPKG_ARGS} list_installed | awk '{print $1}') ; do
- name=`opkg-cl ${IPKG_ARGS} info $pkg | grep -B 7 -A 7 "^Status.* \(\(installed\)\|\(unpacked\)\)" | awk '/^Package/ {printf $2"_"}'`
- name=$name`opkg-cl ${IPKG_ARGS} info $pkg | grep -B 7 -A 7 "^Status.* \(\(installed\)\|\(unpacked\)\)" | awk -F: '/^Version/ {printf $NF"_"}' | sed 's/^\s*//g'`
- name=$name`opkg-cl ${IPKG_ARGS} info $pkg | grep -B 7 -A 7 "^Status.* \(\(installed\)\|\(unpacked\)\)" | awk '/^Archi/ {print $2".ipk"}'`
- echo $name >>${TESTLAB_DIR}/installed-packages.txt
-
- for depends in $(opkg-cl ${IPKG_ARGS} info $pkg | grep ^Depends) ; do
- echo "$pkg OPP $depends;" | grep -v "(" | grep -v ")" | grep -v "$pkg OPP Depends" | sed -e 's:,::g' -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' |sed 's:OPP:->:g' >> ${TESTLAB_DIR}/depends.dot
- done
-
- for recommends in $(opkg-cl ${IPKG_ARGS} info $pkg | grep ^Recom) ; do
- echo "$pkg OPP $recommends [style=dotted];" | grep -v "(" | grep -v ")" | grep -v "$pkg OPP Recom" | sed -e 's:,::g' -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' |sed 's:OPP:->:g' >> ${TESTLAB_DIR}/depends.dot
- done
- done
-
- echo "}" >> ${TESTLAB_DIR}/depends.dot
- rm -rf ${IPKG_TMP_DIR}
-
- grep -v kernel_2 ${TESTLAB_DIR}/depends.dot | grep -v kernel_image > ${TESTLAB_DIR}/depends-nokernel.dot
- grep -v libc6 ${TESTLAB_DIR}/depends-nokernel.dot | grep -v libgcc > ${TESTLAB_DIR}/depends-nokernel-nolibc.dot
- grep -v update_ ${TESTLAB_DIR}/depends-nokernel-nolibc.dot > ${TESTLAB_DIR}/depends-nokernel-nolibc-noupdate.dot
- grep -v kernel_module ${TESTLAB_DIR}/depends-nokernel-nolibc-noupdate.dot > ${TESTLAB_DIR}/depends-nokernel-nolibc-noupdate-nomodules.dot
-
- #dot has some library troubles when run under fakeroot, uncomment at your own risk
- #dot -Tpng -o ${TESTLAB_DIR}/image-dependencies.png ${TESTLAB_DIR}/depends.dot
- #dot -Tpng -o ${TESTLAB_DIR}/image-dependencies-nokernel-nolibc.png ${TESTLAB_DIR}/depends-nokernel-nolibc.dot
- #dot -Tpng -o ${TESTLAB_DIR}/image-dependencies-nokernel-nolibc-noupdate.png ${TESTLAB_DIR}/depends-nokernel-nolibc-noupdate.dot
- #dot -Tpng -o ${TESTLAB_DIR}/image-dependencies-nokernel-nolibc-noupdate-nomodules.png ${TESTLAB_DIR}/depends-nokernel-nolibc-noupdate-nomodules.dot
-
- for file in $(cat ${TESTLAB_DIR}/installed-packages.txt) ; do
- du -k $(find ${DEPLOY_DIR_IPK} -name "$file") | head -n1
- done | grep "\.ipk" | sed -e s:${DEPLOY_DIR_IPK}::g | sort -n -r | awk '{print $1 "\tKiB " $2}' > ${TESTLAB_DIR}/installed-package-sizes.txt
-
- for file in $(cat ${TESTLAB_DIR}/installed-packages.txt) ; do
- echo "`find ${DEPLOY_DIR_IPK} -name "$file" | xargs opkg-list-fields | grep ^License | sed -e 's/^.*:[ \t]*//g'`" '=' $(echo $file | awk -F_ '{print $1}')
- done | awk -F= '{printf("%50s:%s\n", $1, $2)}' > ${TESTLAB_DIR}/installed-package-licenses.txt
- # Log results to a git controlled directory structure than can be pushed to a remote location
- if [ "${TESTLABLOG}" = "remote" ] && [ -n "${TESTLABREMOTEDIR}" ] ; then
- TESTLABLOGDIR="${MACHINE_ARCH}/${TCLIBC}/${IMAGE_BASENAME}"
- mkdir -p ${TESTLABREMOTEDIR}/${TESTLABLOGDIR}
- cp ${TESTLAB_DIR}/*package* ${TESTLAB_DIR}/depends.dot ${TESTLABREMOTEDIR}/${TESTLABLOGDIR}
- # force change to record builds where the testlab contents didn't change, but other things (e.g. git rev) did
- echo "${MACHINE}: ${IMAGE_BASENAME} configured for ${DISTRO} ${DISTRO_VERSION}" > ${TESTLABREMOTEDIR}/${TESTLABLOGDIR}/build-id
- echo "${@testlab_get_layers(bb, d)}" >> ${TESTLABREMOTEDIR}/${TESTLABLOGDIR}/build-id
- # This runs inside fakeroot, so the git author is listed as root (or whatever root configured it to be) :(
- ( cd ${TESTLABREMOTEDIR}/
- git add ${TESTLABLOGDIR}/*
- git commit ${TESTLABLOGDIR}/ -m "${MACHINE}: ${IMAGE_BASENAME} configured for ${DISTRO} ${DISTRO_VERSION} using branch ${METADATA_BRANCH} and revision ${METADATA_REVISION}" --author "testlab <testlab@${DISTRO}>" || true)
- fi
-fi
-}
-
-IMAGE_POSTPROCESS_COMMAND += " do_testlab ;"
-
-def testlab_get_layers(bb, d):
- layers = (bb.data.getVar("BBLAYERS", d, 1) or "").split()
- layers_branch_rev = ["%-17s = \"%s:%s\"" % (os.path.basename(i), \
- base_get_metadata_git_branch(i, None).strip().strip('()'), \
- base_get_metadata_git_revision(i, None)) \
- for i in layers]
- i = len(layers_branch_rev)-1
- p1 = layers_branch_rev[i].find("=")
- s1= layers_branch_rev[i][p1:]
- while i > 0:
- p2 = layers_branch_rev[i-1].find("=")
- s2= layers_branch_rev[i-1][p2:]
- if s1 == s2:
- layers_branch_rev[i-1] = layers_branch_rev[i-1][0:p2]
- i -= 1
- else:
- i -= 1
- p1 = layers_branch_rev[i].find("=")
- s1= layers_branch_rev[i][p1:]
-
- layertext = "Configured Openembedded layers:\n%s\n" % '\n'.join(layers_branch_rev)
- return layertext
-
--
1.7.5.4
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [meta-oe][PATCH V2 6/7] blacklist.bbclass: Move to meta-angstrom
2012-07-31 18:56 [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187 Khem Raj
` (3 preceding siblings ...)
2012-07-31 18:56 ` [meta-oe][PATCH V2 5/7] testlab.bbclass: Delete Khem Raj
@ 2012-07-31 18:56 ` Khem Raj
2012-07-31 19:07 ` Koen Kooi
2012-08-04 20:36 ` Koen Kooi
2012-07-31 18:56 ` [meta-oe][PATCH V2 7/7] kernel.bbclass: Rename to machine_kernel_pr.bbclass which provides added functionality Khem Raj
2012-08-01 15:11 ` [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187 Koen Kooi
6 siblings, 2 replies; 38+ messages in thread
From: Khem Raj @ 2012-07-31 18:56 UTC (permalink / raw)
To: openembedded-devel
This class is angstrom specific so lets move it to more
appropriate layer
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta-oe/classes/blacklist.bbclass | 20 --------------------
1 files changed, 0 insertions(+), 20 deletions(-)
delete mode 100644 meta-oe/classes/blacklist.bbclass
diff --git a/meta-oe/classes/blacklist.bbclass b/meta-oe/classes/blacklist.bbclass
deleted file mode 100644
index 7bf4a73..0000000
--- a/meta-oe/classes/blacklist.bbclass
+++ /dev/null
@@ -1,20 +0,0 @@
-# anonymous support class from angstrom
-#
-# Features:
-#
-# * blacklist handling, set ANGSTROM_BLACKLIST_pn-blah = "message"
-#
-
-python () {
- import bb
-
- blacklist = bb.data.getVar("ANGSTROM_BLACKLIST", d, 1)
- pkgnm = bb.data.getVar("PN", d, 1)
- distro = bb.data.getVar("DISTRO", d, 1)
-
- if blacklist:
- bb.note("%s DOES NOT support %s because %s" % (distro,pkgnm, blacklist))
- raise bb.parse.SkipPackage("%s DOES NOT support %s because %s" % (distro,pkgnm, blacklist))
-
-}
-
--
1.7.5.4
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [meta-oe][PATCH V2 7/7] kernel.bbclass: Rename to machine_kernel_pr.bbclass which provides added functionality
2012-07-31 18:56 [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187 Khem Raj
` (4 preceding siblings ...)
2012-07-31 18:56 ` [meta-oe][PATCH V2 6/7] blacklist.bbclass: Move to meta-angstrom Khem Raj
@ 2012-07-31 18:56 ` Khem Raj
2012-08-01 17:38 ` Otavio Salvador
2012-08-01 15:11 ` [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187 Koen Kooi
6 siblings, 1 reply; 38+ messages in thread
From: Khem Raj @ 2012-07-31 18:56 UTC (permalink / raw)
To: openembedded-devel
Diffing with the OE-Core's kernel.bbclass only difference is setting of
machine kernel pr. So lets convert it to a separate class which provides
the added functionality and let everyone use kernel.bbclass from kernel
It needs the dependent layers to inherit this class in addition to
kernel.bbclass
It leaves up with one less conflict with OE-Core
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta-oe/classes/kernel.bbclass | 556 -----------------------------
meta-oe/classes/machine_kernel_pr.bbclass | 8 +
2 files changed, 8 insertions(+), 556 deletions(-)
delete mode 100644 meta-oe/classes/kernel.bbclass
create mode 100644 meta-oe/classes/machine_kernel_pr.bbclass
diff --git a/meta-oe/classes/kernel.bbclass b/meta-oe/classes/kernel.bbclass
deleted file mode 100644
index 2bb1b5b..0000000
--- a/meta-oe/classes/kernel.bbclass
+++ /dev/null
@@ -1,556 +0,0 @@
-inherit linux-kernel-base module_strip
-
-PROVIDES += "virtual/kernel"
-DEPENDS += "virtual/${TARGET_PREFIX}gcc kmod-native virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules"
-
-# we include gcc above, we dont need virtual/libc
-INHIBIT_DEFAULT_DEPS = "1"
-
-KERNEL_IMAGETYPE ?= "zImage"
-INITRAMFS_IMAGE ?= ""
-INITRAMFS_TASK ?= ""
-
-python __anonymous () {
- kerneltype = d.getVar('KERNEL_IMAGETYPE', True) or ''
- if kerneltype == 'uImage':
- depends = d.getVar("DEPENDS", True)
- depends = "%s u-boot-mkimage-native" % depends
- d.setVar("DEPENDS", depends)
-
- image = d.getVar('INITRAMFS_IMAGE', True)
- if image:
- d.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs')
-
- machine_kernel_pr = d.getVar('MACHINE_KERNEL_PR', True)
-
- if machine_kernel_pr:
- d.setVar('PR', machine_kernel_pr)
-}
-
-inherit kernel-arch deploy
-
-PACKAGES_DYNAMIC += "kernel-module-*"
-PACKAGES_DYNAMIC += "kernel-image-*"
-PACKAGES_DYNAMIC += "kernel-firmware-*"
-
-export OS = "${TARGET_OS}"
-export CROSS_COMPILE = "${TARGET_PREFIX}"
-
-KERNEL_PRIORITY ?= "${@int(d.getVar('PV',1).split('-')[0].split('+')[0].split('.')[0]) * 10000 + \
- int(d.getVar('PV',1).split('-')[0].split('+')[0].split('.')[1]) * 100 + \
- int(d.getVar('PV',1).split('-')[0].split('+')[0].split('.')[-1])}"
-
-KERNEL_RELEASE ?= "${KERNEL_VERSION}"
-
-KERNEL_CCSUFFIX ?= ""
-KERNEL_LDSUFFIX ?= ""
-
-# Set TARGET_??_KERNEL_ARCH in the machine .conf to set architecture
-# specific options necessary for building the kernel and modules.
-#FIXME: should be this: TARGET_CC_KERNEL_ARCH ?= "${TARGET_CC_ARCH}"
-TARGET_CC_KERNEL_ARCH ?= ""
-HOST_CC_KERNEL_ARCH ?= "${TARGET_CC_KERNEL_ARCH}"
-TARGET_LD_KERNEL_ARCH ?= ""
-HOST_LD_KERNEL_ARCH ?= "${TARGET_LD_KERNEL_ARCH}"
-
-KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc${KERNEL_CCSUFFIX} ${HOST_CC_KERNEL_ARCH}${TOOLCHAIN_OPTIONS}"
-KERNEL_LD = "${HOST_PREFIX}ld${KERNEL_LDSUFFIX} ${HOST_LD_KERNEL_ARCH}${TOOLCHAIN_OPTIONS}"
-
-# Where built kernel lies in the kernel tree
-KERNEL_OUTPUT ?= "arch/${ARCH}/boot/${KERNEL_IMAGETYPE}"
-KERNEL_IMAGEDEST = "boot"
-
-#
-# configuration
-#
-export CMDLINE_CONSOLE = "console=${@d.getVar("KERNEL_CONSOLE",1) or "ttyS0"}"
-
-KERNEL_VERSION = "${@get_kernelversion('${B}')}"
-
-KERNEL_LOCALVERSION ?= ""
-
-# kernels are generally machine specific
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-# U-Boot support
-UBOOT_ENTRYPOINT ?= "20008000"
-UBOOT_LOADADDRESS ?= "${UBOOT_ENTRYPOINT}"
-
-# For the kernel, we don't want the '-e MAKEFLAGS=' in EXTRA_OEMAKE.
-# We don't want to override kernel Makefile variables from the environment
-EXTRA_OEMAKE = ""
-
-KERNEL_ALT_IMAGETYPE ??= ""
-
-# Define where the kernel headers are installed on the target as well as where
-# they are staged.
-KERNEL_SRC_PATH = "/usr/src/kernel"
-
-KERNEL_IMAGETYPE_FOR_MAKE = "${@(lambda s: s[:-3] if s[-3:] == ".gz" else s)(d.getVar('KERNEL_IMAGETYPE', True))}"
-
-kernel_do_compile() {
- unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
- oe_runmake include/linux/version.h CC="${KERNEL_CC}" LD="${KERNEL_LD}"
- oe_runmake ${KERNEL_IMAGETYPE_FOR_MAKE} ${KERNEL_ALT_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}"
- if test "${KERNEL_IMAGETYPE_FOR_MAKE}.gz" = "${KERNEL_IMAGETYPE}"; then
- gzip -9c < "${KERNEL_IMAGETYPE_FOR_MAKE}" > "${KERNEL_OUTPUT}"
- fi
-}
-
-do_compile_kernelmodules() {
- unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
- if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
- oe_runmake ${PARALLEL_MAKE} modules CC="${KERNEL_CC}" LD="${KERNEL_LD}"
- else
- bbnote "no modules to compile"
- fi
-}
-addtask compile_kernelmodules after do_compile before do_install
-
-kernel_do_install() {
- #
- # First install the modules
- #
- unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
- if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
- oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install
- rm -f "${D}/lib/modules/${KERNEL_VERSION}/modules.order"
- rm -f "${D}/lib/modules/${KERNEL_VERSION}/modules.builtin"
- rm "${D}/lib/modules/${KERNEL_VERSION}/build"
- rm "${D}/lib/modules/${KERNEL_VERSION}/source"
- else
- bbnote "no modules to install"
- fi
-
- #
- # Install various kernel output (zImage, map file, config, module support files)
- #
- install -d ${D}/${KERNEL_IMAGEDEST}
- install -d ${D}/boot
- install -m 0644 ${KERNEL_OUTPUT} ${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION}
- install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION}
- install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION}
- install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION}
- [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION}
- install -d ${D}/etc/modules-load.d
- install -d ${D}/etc/modprobe.d
-
- #
- # Support for external module building - create a minimal copy of the
- # kernel source tree.
- #
- kerneldir=${D}${KERNEL_SRC_PATH}
- install -d $kerneldir
-
- #
- # Store the kernel version in sysroots for module-base.bbclass
- #
-
- echo "${KERNEL_VERSION}" > $kerneldir/kernel-abiversion
-
- #
- # Store kernel image name to allow use during image generation
- #
-
- echo "${KERNEL_IMAGE_BASE_NAME}" >$kerneldir/kernel-image-name
-
- #
- # Copy the entire source tree. In case an external build directory is
- # used, copy the build directory over first, then copy over the source
- # dir. This ensures the original Makefiles are used and not the
- # redirecting Makefiles in the build directory.
- #
- # work and sysroots can be on different partitions, so we can't rely on
- # hardlinking, unfortunately.
- #
- cp -fR * $kerneldir
- cp .config $kerneldir
- if [ "${S}" != "${B}" ]; then
- cp -fR ${S}/* $kerneldir
- fi
- install -m 0644 ${KERNEL_OUTPUT} $kerneldir/${KERNEL_IMAGETYPE}
- install -m 0644 System.map $kerneldir/System.map-${KERNEL_VERSION}
-
- #
- # Clean and remove files not needed for building modules.
- # Some distributions go through a lot more trouble to strip out
- # unecessary headers, for now, we just prune the obvious bits.
- #
- # We don't want to leave host-arch binaries in /sysroots, so
- # we clean the scripts dir while leaving the generated config
- # and include files.
- #
- oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean
- make -C $kerneldir _mrproper_scripts
- find $kerneldir -path $kerneldir/lib -prune -o -path $kerneldir/tools -prune -o -path $kerneldir/scripts -prune -o -name "*.[csS]" -exec rm '{}' \;
- find $kerneldir/Documentation -name "*.txt" -exec rm '{}' \;
-
- # As of Linux kernel version 3.0.1, the clean target removes
- # arch/powerpc/lib/crtsavres.o which is present in
- # KBUILD_LDFLAGS_MODULE, making it required to build external modules.
- if [ ${ARCH} = "powerpc" ]; then
- cp arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o
- fi
-
- # Necessary for building modules like compat-wireless.
- cp include/generated/bounds.h $kerneldir/include/generated/bounds.h
-
- # Remove the following binaries which cause strip or arch QA errors
- # during do_package for cross-compiled platforms
- bin_files="arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \
- arch/powerpc/boot/mktree scripts/kconfig/zconf.tab.o \
- scripts/kconfig/conf.o scripts/kconfig/kxgettext.o"
- for entry in $bin_files; do
- rm -f $kerneldir/$entry
- done
-}
-
-sysroot_stage_all_append() {
- sysroot_stage_dir ${D}${KERNEL_SRC_PATH} ${SYSROOT_DESTDIR}${KERNEL_SRC_PATH}
-}
-
-kernel_do_configure() {
- # fixes extra + in /lib/modules/2.6.37+
- # $ scripts/setlocalversion . => +
- # $ make kernelversion => 2.6.37
- # $ make kernelrelease => 2.6.37+
- touch ${B}/.scmversion ${S}/.scmversion
-
- # Copy defconfig to .config if .config does not exist. This allows
- # recipes to manage the .config themselves in do_configure_prepend().
- if [ -f "${WORKDIR}/defconfig" ] && [ ! -f "${B}/.config" ]; then
- cp "${WORKDIR}/defconfig" "${B}/.config"
- fi
- yes '' | oe_runmake oldconfig
-
- if [ ! -z "${INITRAMFS_IMAGE}" ]; then
- for img in cpio.gz cpio.lzo cpio.lzma cpio.xz; do
- if [ -e "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" ]; then
- cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" initramfs.$img
- fi
- done
- fi
-}
-
-do_configure[depends] += "${INITRAMFS_TASK}"
-
-do_savedefconfig() {
- oe_runmake savedefconfig
-}
-do_savedefconfig[nostamp] = "1"
-addtask savedefconfig after do_configure
-
-pkg_postinst_kernel-base () {
- cd /${KERNEL_IMAGEDEST}; update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
-}
-
-pkg_postrm_kernel-base () {
- cd /${KERNEL_IMAGEDEST}; update-alternatives --remove ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} || true
-}
-
-inherit cml1
-
-EXPORT_FUNCTIONS do_compile do_install do_configure
-
-# kernel-base becomes kernel-${KERNEL_VERSION}
-# kernel-image becomes kernel-image-${KERNEL_VERISON}
-PACKAGES = "kernel kernel-base kernel-vmlinux kernel-image kernel-dev"
-FILES = ""
-FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
-FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config* ${KERNEL_SRC_PATH}"
-FILES_kernel-vmlinux = "/boot/vmlinux*"
-RDEPENDS_kernel = "kernel-base"
-# Allow machines to override this dependency if kernel image files are
-# not wanted in images as standard
-RDEPENDS_kernel-base ?= "kernel-image"
-PKG_kernel-image = "kernel-image-${@legitimize_package_name('${KERNEL_VERSION}')}"
-PKG_kernel-base = "kernel-${@legitimize_package_name('${KERNEL_VERSION}')}"
-RPROVIDES_kernel-base += "kernel-${KERNEL_VERSION}"
-ALLOW_EMPTY_kernel = "1"
-ALLOW_EMPTY_kernel-base = "1"
-ALLOW_EMPTY_kernel-image = "1"
-
-pkg_postinst_kernel-image () {
-if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
- mkdir -p $D/lib/modules/${KERNEL_VERSION}
-fi
-if [ -n "$D" ]; then
- depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
-else
- depmod -a ${KERNEL_VERSION}
-fi
-}
-
-pkg_postinst_modules () {
-if [ -z "$D" ]; then
- depmod -a ${KERNEL_VERSION}
- update-modules || true
-fi
-}
-
-pkg_postrm_modules () {
-update-modules || true
-}
-
-autoload_postinst_fragment() {
-if [ x"$D" = "x" ]; then
- modprobe %s || true
-fi
-}
-
-# autoload defaults (alphabetically sorted)
-module_autoload_hidp = "hidp"
-module_autoload_ipv6 = "ipv6"
-module_autoload_ipsec = "ipsec"
-module_autoload_ircomm-tty = "ircomm-tty"
-module_autoload_rfcomm = "rfcomm"
-module_autoload_sa1100-rtc = "sa1100-rtc"
-# sa1100-rtc was renamed in 2.6.23 onwards
-module_autoload_rtc-sa1100 = "rtc-sa1100"
-
-# alias defaults (alphabetically sorted)
-module_conf_af_packet = "alias net-pf-17 af_packet"
-module_conf_bluez = "alias net-pf-31 bluez"
-module_conf_bnep = "alias bt-proto-4 bnep"
-module_conf_hci_uart = "alias tty-ldisc-15 hci_uart"
-module_conf_l2cap = "alias bt-proto-0 l2cap"
-module_conf_sco = "alias bt-proto-2 sco"
-module_conf_rfcomm = "alias bt-proto-3 rfcomm"
-
-python populate_packages_prepend () {
- def extract_modinfo(file):
- import tempfile, re, subprocess
- tempfile.tempdir = d.getVar("WORKDIR", True)
- tf = tempfile.mkstemp()
- tmpfile = tf[1]
- cmd = "PATH=\"%s\" %sobjcopy -j .modinfo -O binary %s %s" % (d.getVar("PATH", True), d.getVar("HOST_PREFIX", True) or "", file, tmpfile)
- subprocess.call(cmd, shell=True)
- f = open(tmpfile)
- l = f.read().split("\000")
- f.close()
- os.close(tf[0])
- os.unlink(tmpfile)
- exp = re.compile("([^=]+)=(.*)")
- vals = {}
- for i in l:
- m = exp.match(i)
- if not m:
- continue
- vals[m.group(1)] = m.group(2)
- return vals
-
- def parse_depmod():
- import re
-
- dvar = d.getVar('PKGD', True)
- if not dvar:
- bb.error("PKGD not defined")
- return
-
- kernelver = d.getVar('KERNEL_VERSION', True)
- kernelver_stripped = kernelver
- m = re.match('^(.*-hh.*)[\.\+].*$', kernelver)
- if m:
- kernelver_stripped = m.group(1)
- path = d.getVar("PATH", True)
-
- cmd = "PATH=\"%s\" depmod -n -a -b %s -F %s/boot/System.map-%s %s" % (path, dvar, dvar, kernelver, kernelver_stripped)
- f = os.popen(cmd, 'r')
-
- deps = {}
- pattern0 = "^(.*\.k?o):..*$"
- pattern1 = "^(.*\.k?o):\s*(.*\.k?o)\s*$"
- pattern2 = "^(.*\.k?o):\s*(.*\.k?o)\s*\\\$"
- pattern3 = "^\t(.*\.k?o)\s*\\\$"
- pattern4 = "^\t(.*\.k?o)\s*$"
-
- line = f.readline()
- while line:
- if not re.match(pattern0, line):
- line = f.readline()
- continue
- m1 = re.match(pattern1, line)
- if m1:
- deps[m1.group(1)] = m1.group(2).split()
- else:
- m2 = re.match(pattern2, line)
- if m2:
- deps[m2.group(1)] = m2.group(2).split()
- line = f.readline()
- m3 = re.match(pattern3, line)
- while m3:
- deps[m2.group(1)].extend(m3.group(1).split())
- line = f.readline()
- m3 = re.match(pattern3, line)
- m4 = re.match(pattern4, line)
- deps[m2.group(1)].extend(m4.group(1).split())
- line = f.readline()
- f.close()
- return deps
-
- def get_dependencies(file, pattern, format):
- # file no longer includes PKGD
- file = file.replace(d.getVar('PKGD', True) or '', '', 1)
- # instead is prefixed with /lib/modules/${KERNEL_VERSION}
- file = file.replace("/lib/modules/%s/" % d.getVar('KERNEL_VERSION', True) or '', '', 1)
-
- if module_deps.has_key(file):
- import re
- dependencies = []
- for i in module_deps[file]:
- m = re.match(pattern, os.path.basename(i))
- if not m:
- continue
- on = legitimize_package_name(m.group(1))
- dependency_pkg = format % on
- dependencies.append(dependency_pkg)
- return dependencies
- return []
-
- def frob_metadata(file, pkg, pattern, format, basename):
- import re
- vals = extract_modinfo(file)
-
- dvar = d.getVar('PKGD', True)
-
- # If autoloading is requested, output /etc/modules-load.d/<name>.conf and append
- # appropriate modprobe commands to the postinst
- autoload = d.getVar('module_autoload_%s' % basename, True)
- if autoload:
- name = '%s/etc/modules-load.d/%s.conf' % (dvar, basename)
- f = open(name, 'w')
- for m in autoload.split():
- f.write('%s\n' % m)
- f.close()
- postinst = d.getVar('pkg_postinst_%s' % pkg, True)
- if not postinst:
- bb.fatal("pkg_postinst_%s not defined" % pkg)
- postinst += d.getVar('autoload_postinst_fragment', True) % autoload
- d.setVar('pkg_postinst_%s' % pkg, postinst)
-
- # Write out any modconf fragment
- modconf = d.getVar('module_conf_%s' % basename, True)
- if modconf:
- name = '%s/etc/modprobe.d/%s.conf' % (dvar, basename)
- f = open(name, 'w')
- f.write("%s\n" % modconf)
- f.close()
-
- files = d.getVar('FILES_%s' % pkg, True)
- files = "%s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf" % (files, basename, basename)
- d.setVar('FILES_%s' % pkg, files)
-
- if vals.has_key("description"):
- old_desc = d.getVar('DESCRIPTION_' + pkg, True) or ""
- d.setVar('DESCRIPTION_' + pkg, old_desc + "; " + vals["description"])
-
- rdepends_str = d.getVar('RDEPENDS_' + pkg, True)
- if rdepends_str:
- rdepends = rdepends_str.split()
- else:
- rdepends = []
- rdepends.extend(get_dependencies(file, pattern, format))
- d.setVar('RDEPENDS_' + pkg, ' '.join(rdepends))
-
- module_deps = parse_depmod()
- module_regex = '^(.*)\.k?o$'
- module_pattern = 'kernel-module-%s'
-
- postinst = d.getVar('pkg_postinst_modules', True)
- postrm = d.getVar('pkg_postrm_modules', True)
- do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.bin$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
- do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.fw$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
- do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.cis$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
- do_split_packages(d, root='/lib/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='update-modules kernel-%s' % d.getVar("KERNEL_VERSION", True))
-
- # If modules-load.d and modprobe.d are empty at this point, remove them to
- # avoid warnings. removedirs only raises an OSError if an empty
- # directory cannot be removed.
- dvar = d.getVar('PKGD', True)
- for dir in ["%s/etc/modprobe.d" % (dvar), "%s/etc/modules-load.d" % (dvar), "%s/etc" % (dvar)]:
- if len(os.listdir(dir)) == 0:
- os.rmdir(dir)
-
- import re
- metapkg = "kernel-modules"
- d.setVar('ALLOW_EMPTY_' + metapkg, "1")
- d.setVar('FILES_' + metapkg, "")
- blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux' ]
- for l in module_deps.values():
- for i in l:
- pkg = module_pattern % legitimize_package_name(re.match(module_regex, os.path.basename(i)).group(1))
- blacklist.append(pkg)
- metapkg_rdepends = []
- packages = d.getVar('PACKAGES', True).split()
- for pkg in packages[1:]:
- if not pkg in blacklist and not pkg in metapkg_rdepends:
- metapkg_rdepends.append(pkg)
- d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends))
- d.setVar('DESCRIPTION_' + metapkg, 'Kernel modules meta package')
- packages.append(metapkg)
- d.setVar('PACKAGES', ' '.join(packages))
-}
-
-# Support checking the kernel size since some kernels need to reside in partitions
-# with a fixed length or there is a limit in transferring the kernel to memory
-do_sizecheck() {
- if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then
- size=`ls -l ${KERNEL_OUTPUT} | awk '{ print $5}'`
- if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
- rm ${KERNEL_OUTPUT}
- die "This kernel (size=$size > ${KERNEL_IMAGE_MAXSIZE}) is too big for your device. Please reduce the size of the kernel by making more of it modular."
- fi
- fi
-}
-
-addtask sizecheck before do_install after do_compile
-
-KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
-# Don't include the DATETIME variable in the sstate package signatures
-KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
-KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
-
-do_uboot_mkimage() {
- if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then
- if test "x${KEEPUIMAGE}" = "x" ; then
- ENTRYPOINT=${UBOOT_ENTRYPOINT}
- if test -n "${UBOOT_ENTRYSYMBOL}"; then
- ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
- awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'`
- fi
- if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
- ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
- uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage
- rm -f linux.bin
- else
- ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
- rm -f linux.bin.gz
- gzip -9 linux.bin
- uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage
- rm -f linux.bin.gz
- fi
- fi
- fi
-}
-
-addtask uboot_mkimage before do_install after do_compile
-
-kernel_do_deploy() {
- install -m 0644 ${KERNEL_OUTPUT} ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
- if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
- tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib
- fi
-
- cd ${DEPLOYDIR}
- rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
- ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin
- ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGETYPE}
-
- cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOYDIR}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt
-}
-do_deploy[dirs] = "${DEPLOYDIR} ${B}"
-
-addtask deploy before do_build after do_install
-
-EXPORT_FUNCTIONS do_deploy
-
diff --git a/meta-oe/classes/machine_kernel_pr.bbclass b/meta-oe/classes/machine_kernel_pr.bbclass
new file mode 100644
index 0000000..463b64d
--- /dev/null
+++ b/meta-oe/classes/machine_kernel_pr.bbclass
@@ -0,0 +1,8 @@
+python __anonymous () {
+
+ machine_kernel_pr = d.getVar('MACHINE_KERNEL_PR', True)
+
+ if machine_kernel_pr:
+ d.setVar('PR', machine_kernel_pr)
+}
+
--
1.7.5.4
^ permalink raw reply related [flat|nested] 38+ messages in thread
* Re: [meta-oe][PATCH V2 6/7] blacklist.bbclass: Move to meta-angstrom
2012-07-31 18:56 ` [meta-oe][PATCH V2 6/7] blacklist.bbclass: Move to meta-angstrom Khem Raj
@ 2012-07-31 19:07 ` Koen Kooi
2012-07-31 19:24 ` Chris Larson
2012-07-31 19:43 ` Martin Jansa
2012-08-04 20:36 ` Koen Kooi
1 sibling, 2 replies; 38+ messages in thread
From: Koen Kooi @ 2012-07-31 19:07 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 31-07-12 20:56, Khem Raj schreef:
> This class is angstrom specific so lets move it to more appropriate
> layer
Ehm, it was put in meta-oe on request so other distros could use it.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFQGCzxMkyGM64RGpERAu0zAJ0bciMt4Kasz75bkgLimir+dy3vJACfRut3
oxcvlVptcA34vNfJjK8jwmo=
=RLeD
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-oe][PATCH V2 6/7] blacklist.bbclass: Move to meta-angstrom
2012-07-31 19:07 ` Koen Kooi
@ 2012-07-31 19:24 ` Chris Larson
2012-07-31 19:43 ` Martin Jansa
1 sibling, 0 replies; 38+ messages in thread
From: Chris Larson @ 2012-07-31 19:24 UTC (permalink / raw)
To: openembedded-devel
On Tue, Jul 31, 2012 at 12:07 PM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> Op 31-07-12 20:56, Khem Raj schreef:
>> This class is angstrom specific so lets move it to more appropriate
>> layer
>
> Ehm, it was put in meta-oe on request so other distros could use it.
A version of this with a different control interface is already in
oe-core. See oe-core/meta/classes/blacklist.bbclass.
--
Christopher Larson
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-oe][PATCH V2 6/7] blacklist.bbclass: Move to meta-angstrom
2012-07-31 19:07 ` Koen Kooi
2012-07-31 19:24 ` Chris Larson
@ 2012-07-31 19:43 ` Martin Jansa
2012-07-31 20:46 ` Khem Raj
1 sibling, 1 reply; 38+ messages in thread
From: Martin Jansa @ 2012-07-31 19:43 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 444 bytes --]
On Tue, Jul 31, 2012 at 09:07:29PM +0200, Koen Kooi wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Op 31-07-12 20:56, Khem Raj schreef:
> > This class is angstrom specific so lets move it to more appropriate
> > layer
>
> Ehm, it was put in meta-oe on request so other distros could use it.
SHR is now compatible with oe-core copy too, so fine with me.
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-oe][PATCH V2 6/7] blacklist.bbclass: Move to meta-angstrom
2012-07-31 19:43 ` Martin Jansa
@ 2012-07-31 20:46 ` Khem Raj
0 siblings, 0 replies; 38+ messages in thread
From: Khem Raj @ 2012-07-31 20:46 UTC (permalink / raw)
To: openembedded-devel
yes I think SHR was one besides angstrom and it has removed that
dependency. We can keep it in meta-oe just rename it to something
else.
On 7/31/12, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Tue, Jul 31, 2012 at 09:07:29PM +0200, Koen Kooi wrote:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> Op 31-07-12 20:56, Khem Raj schreef:
>> > This class is angstrom specific so lets move it to more appropriate
>> > layer
>>
>> Ehm, it was put in meta-oe on request so other distros could use it.
>
> SHR is now compatible with oe-core copy too, so fine with me.
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
>
--
-Khem
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187
2012-07-31 18:56 [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187 Khem Raj
` (5 preceding siblings ...)
2012-07-31 18:56 ` [meta-oe][PATCH V2 7/7] kernel.bbclass: Rename to machine_kernel_pr.bbclass which provides added functionality Khem Raj
@ 2012-08-01 15:11 ` Koen Kooi
2012-08-01 22:56 ` Khem Raj
6 siblings, 1 reply; 38+ messages in thread
From: Koen Kooi @ 2012-08-01 15:11 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 31-07-12 20:56, Khem Raj schreef:
> Dont inherit vala and gitpkgv not needed anymore
>
> Along with upgrade use the release tarballs instead of git
For an update we need to pull in some patches from master, so a git recipe
is still the preferred way.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFQGUc1MkyGM64RGpERArReAJ93fwNc/vyBp0l0r3BUegfsZ7f9cgCeIL5F
5n7y+QcXp8vO9Mj8n/5idgM=
=4sUO
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-oe][PATCH V2 7/7] kernel.bbclass: Rename to machine_kernel_pr.bbclass which provides added functionality
2012-07-31 18:56 ` [meta-oe][PATCH V2 7/7] kernel.bbclass: Rename to machine_kernel_pr.bbclass which provides added functionality Khem Raj
@ 2012-08-01 17:38 ` Otavio Salvador
2012-08-01 22:31 ` Khem Raj
0 siblings, 1 reply; 38+ messages in thread
From: Otavio Salvador @ 2012-08-01 17:38 UTC (permalink / raw)
To: openembedded-devel
On Tue, Jul 31, 2012 at 3:56 PM, Khem Raj <raj.khem@gmail.com> wrote:
> Diffing with the OE-Core's kernel.bbclass only difference is setting of
> machine kernel pr. So lets convert it to a separate class which provides
> the added functionality and let everyone use kernel.bbclass from kernel
^ from OE-Core?
> It needs the dependent layers to inherit this class in addition to
> kernel.bbclass
>
> It leaves up with one less conflict with OE-Core
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> meta-oe/classes/kernel.bbclass | 556 -----------------------------
> meta-oe/classes/machine_kernel_pr.bbclass | 8 +
> 2 files changed, 8 insertions(+), 556 deletions(-)
> delete mode 100644 meta-oe/classes/kernel.bbclass
> create mode 100644 meta-oe/classes/machine_kernel_pr.bbclass
>
> diff --git a/meta-oe/classes/kernel.bbclass b/meta-oe/classes/kernel.bbclass
> deleted file mode 100644
> index 2bb1b5b..0000000
> --- a/meta-oe/classes/kernel.bbclass
> +++ /dev/null
> @@ -1,556 +0,0 @@
> -inherit linux-kernel-base module_strip
> -
> -PROVIDES += "virtual/kernel"
> -DEPENDS += "virtual/${TARGET_PREFIX}gcc kmod-native virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules"
> -
> -# we include gcc above, we dont need virtual/libc
> -INHIBIT_DEFAULT_DEPS = "1"
> -
> -KERNEL_IMAGETYPE ?= "zImage"
> -INITRAMFS_IMAGE ?= ""
> -INITRAMFS_TASK ?= ""
> -
> -python __anonymous () {
> - kerneltype = d.getVar('KERNEL_IMAGETYPE', True) or ''
> - if kerneltype == 'uImage':
> - depends = d.getVar("DEPENDS", True)
> - depends = "%s u-boot-mkimage-native" % depends
> - d.setVar("DEPENDS", depends)
> -
> - image = d.getVar('INITRAMFS_IMAGE', True)
> - if image:
> - d.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs')
> -
> - machine_kernel_pr = d.getVar('MACHINE_KERNEL_PR', True)
> -
> - if machine_kernel_pr:
> - d.setVar('PR', machine_kernel_pr)
> -}
> -
> -inherit kernel-arch deploy
> -
> -PACKAGES_DYNAMIC += "kernel-module-*"
> -PACKAGES_DYNAMIC += "kernel-image-*"
> -PACKAGES_DYNAMIC += "kernel-firmware-*"
> -
> -export OS = "${TARGET_OS}"
> -export CROSS_COMPILE = "${TARGET_PREFIX}"
> -
> -KERNEL_PRIORITY ?= "${@int(d.getVar('PV',1).split('-')[0].split('+')[0].split('.')[0]) * 10000 + \
> - int(d.getVar('PV',1).split('-')[0].split('+')[0].split('.')[1]) * 100 + \
> - int(d.getVar('PV',1).split('-')[0].split('+')[0].split('.')[-1])}"
> -
> -KERNEL_RELEASE ?= "${KERNEL_VERSION}"
> -
> -KERNEL_CCSUFFIX ?= ""
> -KERNEL_LDSUFFIX ?= ""
> -
> -# Set TARGET_??_KERNEL_ARCH in the machine .conf to set architecture
> -# specific options necessary for building the kernel and modules.
> -#FIXME: should be this: TARGET_CC_KERNEL_ARCH ?= "${TARGET_CC_ARCH}"
> -TARGET_CC_KERNEL_ARCH ?= ""
> -HOST_CC_KERNEL_ARCH ?= "${TARGET_CC_KERNEL_ARCH}"
> -TARGET_LD_KERNEL_ARCH ?= ""
> -HOST_LD_KERNEL_ARCH ?= "${TARGET_LD_KERNEL_ARCH}"
> -
> -KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc${KERNEL_CCSUFFIX} ${HOST_CC_KERNEL_ARCH}${TOOLCHAIN_OPTIONS}"
> -KERNEL_LD = "${HOST_PREFIX}ld${KERNEL_LDSUFFIX} ${HOST_LD_KERNEL_ARCH}${TOOLCHAIN_OPTIONS}"
> -
> -# Where built kernel lies in the kernel tree
> -KERNEL_OUTPUT ?= "arch/${ARCH}/boot/${KERNEL_IMAGETYPE}"
> -KERNEL_IMAGEDEST = "boot"
> -
> -#
> -# configuration
> -#
> -export CMDLINE_CONSOLE = "console=${@d.getVar("KERNEL_CONSOLE",1) or "ttyS0"}"
> -
> -KERNEL_VERSION = "${@get_kernelversion('${B}')}"
> -
> -KERNEL_LOCALVERSION ?= ""
> -
> -# kernels are generally machine specific
> -PACKAGE_ARCH = "${MACHINE_ARCH}"
> -
> -# U-Boot support
> -UBOOT_ENTRYPOINT ?= "20008000"
> -UBOOT_LOADADDRESS ?= "${UBOOT_ENTRYPOINT}"
> -
> -# For the kernel, we don't want the '-e MAKEFLAGS=' in EXTRA_OEMAKE.
> -# We don't want to override kernel Makefile variables from the environment
> -EXTRA_OEMAKE = ""
> -
> -KERNEL_ALT_IMAGETYPE ??= ""
> -
> -# Define where the kernel headers are installed on the target as well as where
> -# they are staged.
> -KERNEL_SRC_PATH = "/usr/src/kernel"
> -
> -KERNEL_IMAGETYPE_FOR_MAKE = "${@(lambda s: s[:-3] if s[-3:] == ".gz" else s)(d.getVar('KERNEL_IMAGETYPE', True))}"
> -
> -kernel_do_compile() {
> - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
> - oe_runmake include/linux/version.h CC="${KERNEL_CC}" LD="${KERNEL_LD}"
> - oe_runmake ${KERNEL_IMAGETYPE_FOR_MAKE} ${KERNEL_ALT_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}"
> - if test "${KERNEL_IMAGETYPE_FOR_MAKE}.gz" = "${KERNEL_IMAGETYPE}"; then
> - gzip -9c < "${KERNEL_IMAGETYPE_FOR_MAKE}" > "${KERNEL_OUTPUT}"
> - fi
> -}
> -
> -do_compile_kernelmodules() {
> - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
> - if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
> - oe_runmake ${PARALLEL_MAKE} modules CC="${KERNEL_CC}" LD="${KERNEL_LD}"
> - else
> - bbnote "no modules to compile"
> - fi
> -}
> -addtask compile_kernelmodules after do_compile before do_install
> -
> -kernel_do_install() {
> - #
> - # First install the modules
> - #
> - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
> - if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
> - oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install
> - rm -f "${D}/lib/modules/${KERNEL_VERSION}/modules.order"
> - rm -f "${D}/lib/modules/${KERNEL_VERSION}/modules.builtin"
> - rm "${D}/lib/modules/${KERNEL_VERSION}/build"
> - rm "${D}/lib/modules/${KERNEL_VERSION}/source"
> - else
> - bbnote "no modules to install"
> - fi
> -
> - #
> - # Install various kernel output (zImage, map file, config, module support files)
> - #
> - install -d ${D}/${KERNEL_IMAGEDEST}
> - install -d ${D}/boot
> - install -m 0644 ${KERNEL_OUTPUT} ${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION}
> - install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION}
> - install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION}
> - install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION}
> - [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION}
> - install -d ${D}/etc/modules-load.d
> - install -d ${D}/etc/modprobe.d
> -
> - #
> - # Support for external module building - create a minimal copy of the
> - # kernel source tree.
> - #
> - kerneldir=${D}${KERNEL_SRC_PATH}
> - install -d $kerneldir
> -
> - #
> - # Store the kernel version in sysroots for module-base.bbclass
> - #
> -
> - echo "${KERNEL_VERSION}" > $kerneldir/kernel-abiversion
> -
> - #
> - # Store kernel image name to allow use during image generation
> - #
> -
> - echo "${KERNEL_IMAGE_BASE_NAME}" >$kerneldir/kernel-image-name
> -
> - #
> - # Copy the entire source tree. In case an external build directory is
> - # used, copy the build directory over first, then copy over the source
> - # dir. This ensures the original Makefiles are used and not the
> - # redirecting Makefiles in the build directory.
> - #
> - # work and sysroots can be on different partitions, so we can't rely on
> - # hardlinking, unfortunately.
> - #
> - cp -fR * $kerneldir
> - cp .config $kerneldir
> - if [ "${S}" != "${B}" ]; then
> - cp -fR ${S}/* $kerneldir
> - fi
> - install -m 0644 ${KERNEL_OUTPUT} $kerneldir/${KERNEL_IMAGETYPE}
> - install -m 0644 System.map $kerneldir/System.map-${KERNEL_VERSION}
> -
> - #
> - # Clean and remove files not needed for building modules.
> - # Some distributions go through a lot more trouble to strip out
> - # unecessary headers, for now, we just prune the obvious bits.
> - #
> - # We don't want to leave host-arch binaries in /sysroots, so
> - # we clean the scripts dir while leaving the generated config
> - # and include files.
> - #
> - oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean
> - make -C $kerneldir _mrproper_scripts
> - find $kerneldir -path $kerneldir/lib -prune -o -path $kerneldir/tools -prune -o -path $kerneldir/scripts -prune -o -name "*.[csS]" -exec rm '{}' \;
> - find $kerneldir/Documentation -name "*.txt" -exec rm '{}' \;
> -
> - # As of Linux kernel version 3.0.1, the clean target removes
> - # arch/powerpc/lib/crtsavres.o which is present in
> - # KBUILD_LDFLAGS_MODULE, making it required to build external modules.
> - if [ ${ARCH} = "powerpc" ]; then
> - cp arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o
> - fi
> -
> - # Necessary for building modules like compat-wireless.
> - cp include/generated/bounds.h $kerneldir/include/generated/bounds.h
> -
> - # Remove the following binaries which cause strip or arch QA errors
> - # during do_package for cross-compiled platforms
> - bin_files="arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \
> - arch/powerpc/boot/mktree scripts/kconfig/zconf.tab.o \
> - scripts/kconfig/conf.o scripts/kconfig/kxgettext.o"
> - for entry in $bin_files; do
> - rm -f $kerneldir/$entry
> - done
> -}
> -
> -sysroot_stage_all_append() {
> - sysroot_stage_dir ${D}${KERNEL_SRC_PATH} ${SYSROOT_DESTDIR}${KERNEL_SRC_PATH}
> -}
> -
> -kernel_do_configure() {
> - # fixes extra + in /lib/modules/2.6.37+
> - # $ scripts/setlocalversion . => +
> - # $ make kernelversion => 2.6.37
> - # $ make kernelrelease => 2.6.37+
> - touch ${B}/.scmversion ${S}/.scmversion
> -
> - # Copy defconfig to .config if .config does not exist. This allows
> - # recipes to manage the .config themselves in do_configure_prepend().
> - if [ -f "${WORKDIR}/defconfig" ] && [ ! -f "${B}/.config" ]; then
> - cp "${WORKDIR}/defconfig" "${B}/.config"
> - fi
> - yes '' | oe_runmake oldconfig
> -
> - if [ ! -z "${INITRAMFS_IMAGE}" ]; then
> - for img in cpio.gz cpio.lzo cpio.lzma cpio.xz; do
> - if [ -e "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" ]; then
> - cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" initramfs.$img
> - fi
> - done
> - fi
> -}
> -
> -do_configure[depends] += "${INITRAMFS_TASK}"
> -
> -do_savedefconfig() {
> - oe_runmake savedefconfig
> -}
> -do_savedefconfig[nostamp] = "1"
> -addtask savedefconfig after do_configure
> -
> -pkg_postinst_kernel-base () {
> - cd /${KERNEL_IMAGEDEST}; update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
> -}
> -
> -pkg_postrm_kernel-base () {
> - cd /${KERNEL_IMAGEDEST}; update-alternatives --remove ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} || true
> -}
> -
> -inherit cml1
> -
> -EXPORT_FUNCTIONS do_compile do_install do_configure
> -
> -# kernel-base becomes kernel-${KERNEL_VERSION}
> -# kernel-image becomes kernel-image-${KERNEL_VERISON}
> -PACKAGES = "kernel kernel-base kernel-vmlinux kernel-image kernel-dev"
> -FILES = ""
> -FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
> -FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config* ${KERNEL_SRC_PATH}"
> -FILES_kernel-vmlinux = "/boot/vmlinux*"
> -RDEPENDS_kernel = "kernel-base"
> -# Allow machines to override this dependency if kernel image files are
> -# not wanted in images as standard
> -RDEPENDS_kernel-base ?= "kernel-image"
> -PKG_kernel-image = "kernel-image-${@legitimize_package_name('${KERNEL_VERSION}')}"
> -PKG_kernel-base = "kernel-${@legitimize_package_name('${KERNEL_VERSION}')}"
> -RPROVIDES_kernel-base += "kernel-${KERNEL_VERSION}"
> -ALLOW_EMPTY_kernel = "1"
> -ALLOW_EMPTY_kernel-base = "1"
> -ALLOW_EMPTY_kernel-image = "1"
> -
> -pkg_postinst_kernel-image () {
> -if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
> - mkdir -p $D/lib/modules/${KERNEL_VERSION}
> -fi
> -if [ -n "$D" ]; then
> - depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
> -else
> - depmod -a ${KERNEL_VERSION}
> -fi
> -}
> -
> -pkg_postinst_modules () {
> -if [ -z "$D" ]; then
> - depmod -a ${KERNEL_VERSION}
> - update-modules || true
> -fi
> -}
> -
> -pkg_postrm_modules () {
> -update-modules || true
> -}
> -
> -autoload_postinst_fragment() {
> -if [ x"$D" = "x" ]; then
> - modprobe %s || true
> -fi
> -}
> -
> -# autoload defaults (alphabetically sorted)
> -module_autoload_hidp = "hidp"
> -module_autoload_ipv6 = "ipv6"
> -module_autoload_ipsec = "ipsec"
> -module_autoload_ircomm-tty = "ircomm-tty"
> -module_autoload_rfcomm = "rfcomm"
> -module_autoload_sa1100-rtc = "sa1100-rtc"
> -# sa1100-rtc was renamed in 2.6.23 onwards
> -module_autoload_rtc-sa1100 = "rtc-sa1100"
> -
> -# alias defaults (alphabetically sorted)
> -module_conf_af_packet = "alias net-pf-17 af_packet"
> -module_conf_bluez = "alias net-pf-31 bluez"
> -module_conf_bnep = "alias bt-proto-4 bnep"
> -module_conf_hci_uart = "alias tty-ldisc-15 hci_uart"
> -module_conf_l2cap = "alias bt-proto-0 l2cap"
> -module_conf_sco = "alias bt-proto-2 sco"
> -module_conf_rfcomm = "alias bt-proto-3 rfcomm"
> -
> -python populate_packages_prepend () {
> - def extract_modinfo(file):
> - import tempfile, re, subprocess
> - tempfile.tempdir = d.getVar("WORKDIR", True)
> - tf = tempfile.mkstemp()
> - tmpfile = tf[1]
> - cmd = "PATH=\"%s\" %sobjcopy -j .modinfo -O binary %s %s" % (d.getVar("PATH", True), d.getVar("HOST_PREFIX", True) or "", file, tmpfile)
> - subprocess.call(cmd, shell=True)
> - f = open(tmpfile)
> - l = f.read().split("\000")
> - f.close()
> - os.close(tf[0])
> - os.unlink(tmpfile)
> - exp = re.compile("([^=]+)=(.*)")
> - vals = {}
> - for i in l:
> - m = exp.match(i)
> - if not m:
> - continue
> - vals[m.group(1)] = m.group(2)
> - return vals
> -
> - def parse_depmod():
> - import re
> -
> - dvar = d.getVar('PKGD', True)
> - if not dvar:
> - bb.error("PKGD not defined")
> - return
> -
> - kernelver = d.getVar('KERNEL_VERSION', True)
> - kernelver_stripped = kernelver
> - m = re.match('^(.*-hh.*)[\.\+].*$', kernelver)
> - if m:
> - kernelver_stripped = m.group(1)
> - path = d.getVar("PATH", True)
> -
> - cmd = "PATH=\"%s\" depmod -n -a -b %s -F %s/boot/System.map-%s %s" % (path, dvar, dvar, kernelver, kernelver_stripped)
> - f = os.popen(cmd, 'r')
> -
> - deps = {}
> - pattern0 = "^(.*\.k?o):..*$"
> - pattern1 = "^(.*\.k?o):\s*(.*\.k?o)\s*$"
> - pattern2 = "^(.*\.k?o):\s*(.*\.k?o)\s*\\\$"
> - pattern3 = "^\t(.*\.k?o)\s*\\\$"
> - pattern4 = "^\t(.*\.k?o)\s*$"
> -
> - line = f.readline()
> - while line:
> - if not re.match(pattern0, line):
> - line = f.readline()
> - continue
> - m1 = re.match(pattern1, line)
> - if m1:
> - deps[m1.group(1)] = m1.group(2).split()
> - else:
> - m2 = re.match(pattern2, line)
> - if m2:
> - deps[m2.group(1)] = m2.group(2).split()
> - line = f.readline()
> - m3 = re.match(pattern3, line)
> - while m3:
> - deps[m2.group(1)].extend(m3.group(1).split())
> - line = f.readline()
> - m3 = re.match(pattern3, line)
> - m4 = re.match(pattern4, line)
> - deps[m2.group(1)].extend(m4.group(1).split())
> - line = f.readline()
> - f.close()
> - return deps
> -
> - def get_dependencies(file, pattern, format):
> - # file no longer includes PKGD
> - file = file.replace(d.getVar('PKGD', True) or '', '', 1)
> - # instead is prefixed with /lib/modules/${KERNEL_VERSION}
> - file = file.replace("/lib/modules/%s/" % d.getVar('KERNEL_VERSION', True) or '', '', 1)
> -
> - if module_deps.has_key(file):
> - import re
> - dependencies = []
> - for i in module_deps[file]:
> - m = re.match(pattern, os.path.basename(i))
> - if not m:
> - continue
> - on = legitimize_package_name(m.group(1))
> - dependency_pkg = format % on
> - dependencies.append(dependency_pkg)
> - return dependencies
> - return []
> -
> - def frob_metadata(file, pkg, pattern, format, basename):
> - import re
> - vals = extract_modinfo(file)
> -
> - dvar = d.getVar('PKGD', True)
> -
> - # If autoloading is requested, output /etc/modules-load.d/<name>.conf and append
> - # appropriate modprobe commands to the postinst
> - autoload = d.getVar('module_autoload_%s' % basename, True)
> - if autoload:
> - name = '%s/etc/modules-load.d/%s.conf' % (dvar, basename)
> - f = open(name, 'w')
> - for m in autoload.split():
> - f.write('%s\n' % m)
> - f.close()
> - postinst = d.getVar('pkg_postinst_%s' % pkg, True)
> - if not postinst:
> - bb.fatal("pkg_postinst_%s not defined" % pkg)
> - postinst += d.getVar('autoload_postinst_fragment', True) % autoload
> - d.setVar('pkg_postinst_%s' % pkg, postinst)
> -
> - # Write out any modconf fragment
> - modconf = d.getVar('module_conf_%s' % basename, True)
> - if modconf:
> - name = '%s/etc/modprobe.d/%s.conf' % (dvar, basename)
> - f = open(name, 'w')
> - f.write("%s\n" % modconf)
> - f.close()
> -
> - files = d.getVar('FILES_%s' % pkg, True)
> - files = "%s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf" % (files, basename, basename)
> - d.setVar('FILES_%s' % pkg, files)
> -
> - if vals.has_key("description"):
> - old_desc = d.getVar('DESCRIPTION_' + pkg, True) or ""
> - d.setVar('DESCRIPTION_' + pkg, old_desc + "; " + vals["description"])
> -
> - rdepends_str = d.getVar('RDEPENDS_' + pkg, True)
> - if rdepends_str:
> - rdepends = rdepends_str.split()
> - else:
> - rdepends = []
> - rdepends.extend(get_dependencies(file, pattern, format))
> - d.setVar('RDEPENDS_' + pkg, ' '.join(rdepends))
> -
> - module_deps = parse_depmod()
> - module_regex = '^(.*)\.k?o$'
> - module_pattern = 'kernel-module-%s'
> -
> - postinst = d.getVar('pkg_postinst_modules', True)
> - postrm = d.getVar('pkg_postrm_modules', True)
> - do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.bin$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
> - do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.fw$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
> - do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.cis$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
> - do_split_packages(d, root='/lib/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='update-modules kernel-%s' % d.getVar("KERNEL_VERSION", True))
> -
> - # If modules-load.d and modprobe.d are empty at this point, remove them to
> - # avoid warnings. removedirs only raises an OSError if an empty
> - # directory cannot be removed.
> - dvar = d.getVar('PKGD', True)
> - for dir in ["%s/etc/modprobe.d" % (dvar), "%s/etc/modules-load.d" % (dvar), "%s/etc" % (dvar)]:
> - if len(os.listdir(dir)) == 0:
> - os.rmdir(dir)
> -
> - import re
> - metapkg = "kernel-modules"
> - d.setVar('ALLOW_EMPTY_' + metapkg, "1")
> - d.setVar('FILES_' + metapkg, "")
> - blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux' ]
> - for l in module_deps.values():
> - for i in l:
> - pkg = module_pattern % legitimize_package_name(re.match(module_regex, os.path.basename(i)).group(1))
> - blacklist.append(pkg)
> - metapkg_rdepends = []
> - packages = d.getVar('PACKAGES', True).split()
> - for pkg in packages[1:]:
> - if not pkg in blacklist and not pkg in metapkg_rdepends:
> - metapkg_rdepends.append(pkg)
> - d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends))
> - d.setVar('DESCRIPTION_' + metapkg, 'Kernel modules meta package')
> - packages.append(metapkg)
> - d.setVar('PACKAGES', ' '.join(packages))
> -}
> -
> -# Support checking the kernel size since some kernels need to reside in partitions
> -# with a fixed length or there is a limit in transferring the kernel to memory
> -do_sizecheck() {
> - if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then
> - size=`ls -l ${KERNEL_OUTPUT} | awk '{ print $5}'`
> - if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
> - rm ${KERNEL_OUTPUT}
> - die "This kernel (size=$size > ${KERNEL_IMAGE_MAXSIZE}) is too big for your device. Please reduce the size of the kernel by making more of it modular."
> - fi
> - fi
> -}
> -
> -addtask sizecheck before do_install after do_compile
> -
> -KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
> -# Don't include the DATETIME variable in the sstate package signatures
> -KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
> -KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
> -
> -do_uboot_mkimage() {
> - if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then
> - if test "x${KEEPUIMAGE}" = "x" ; then
> - ENTRYPOINT=${UBOOT_ENTRYPOINT}
> - if test -n "${UBOOT_ENTRYSYMBOL}"; then
> - ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
> - awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'`
> - fi
> - if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
> - ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
> - uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage
> - rm -f linux.bin
> - else
> - ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
> - rm -f linux.bin.gz
> - gzip -9 linux.bin
> - uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage
> - rm -f linux.bin.gz
> - fi
> - fi
> - fi
> -}
> -
> -addtask uboot_mkimage before do_install after do_compile
> -
> -kernel_do_deploy() {
> - install -m 0644 ${KERNEL_OUTPUT} ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
> - if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
> - tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib
> - fi
> -
> - cd ${DEPLOYDIR}
> - rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
> - ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin
> - ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGETYPE}
> -
> - cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOYDIR}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt
> -}
> -do_deploy[dirs] = "${DEPLOYDIR} ${B}"
> -
> -addtask deploy before do_build after do_install
> -
> -EXPORT_FUNCTIONS do_deploy
> -
> diff --git a/meta-oe/classes/machine_kernel_pr.bbclass b/meta-oe/classes/machine_kernel_pr.bbclass
> new file mode 100644
> index 0000000..463b64d
> --- /dev/null
> +++ b/meta-oe/classes/machine_kernel_pr.bbclass
> @@ -0,0 +1,8 @@
> +python __anonymous () {
> +
> + machine_kernel_pr = d.getVar('MACHINE_KERNEL_PR', True)
> +
> + if machine_kernel_pr:
> + d.setVar('PR', machine_kernel_pr)
> +}
> +
> --
> 1.7.5.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-oe][PATCH V2 7/7] kernel.bbclass: Rename to machine_kernel_pr.bbclass which provides added functionality
2012-08-01 17:38 ` Otavio Salvador
@ 2012-08-01 22:31 ` Khem Raj
0 siblings, 0 replies; 38+ messages in thread
From: Khem Raj @ 2012-08-01 22:31 UTC (permalink / raw)
To: openembedded-devel
On Aug 1, 2012, at 10:38 AM, Otavio Salvador <otavio@ossystems.com.br> wrote:
> On Tue, Jul 31, 2012 at 3:56 PM, Khem Raj <raj.khem@gmail.com> wrote:
>> Diffing with the OE-Core's kernel.bbclass only difference is setting of
>> machine kernel pr. So lets convert it to a separate class which provides
>> the added functionality and let everyone use kernel.bbclass from kernel
>
> ^ from OE-Core?
yes. I will resend a V3 with corrected comment.
Thx
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187
2012-08-01 15:11 ` [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187 Koen Kooi
@ 2012-08-01 22:56 ` Khem Raj
2012-08-02 8:11 ` Paul Eggleton
0 siblings, 1 reply; 38+ messages in thread
From: Khem Raj @ 2012-08-01 22:56 UTC (permalink / raw)
To: openembedded-devel
On Aug 1, 2012, at 8:11 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
>>
>> Along with upgrade use the release tarballs instead of git
>
> For an update we need to pull in some patches from master, so a git recipe
> is still the preferred way.
OK, you know more about it then me but do you know how many those will be ?
in other words does systemd releases mean much for stability yet or still
its a project moving at so fast pace ?
I see that releases are rolled out almost every month, that sort of could mean
either way, we wait until the next release or just take from a commit upstream
I feel like staying with a release+patches could be one way if we are not importing
pathes too often. but I don't know how often that would be. For the testing I did
release worked well for those platforms x86, ppc and arm
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187
2012-08-01 22:56 ` Khem Raj
@ 2012-08-02 8:11 ` Paul Eggleton
2012-08-03 10:32 ` Khem Raj
0 siblings, 1 reply; 38+ messages in thread
From: Paul Eggleton @ 2012-08-02 8:11 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
On Wednesday 01 August 2012 15:56:34 Khem Raj wrote:
> On Aug 1, 2012, at 8:11 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> >> Along with upgrade use the release tarballs instead of git
> >
> > For an update we need to pull in some patches from master, so a git recipe
> > is still the preferred way.
>
> OK, you know more about it then me but do you know how many those will be ?
> in other words does systemd releases mean much for stability yet or still
> its a project moving at so fast pace ?
>
> I see that releases are rolled out almost every month, that sort of could
> mean either way, we wait until the next release or just take from a commit
> upstream
>
> I feel like staying with a release+patches could be one way if we are not
> importing pathes too often. but I don't know how often that would be. For
> the testing I did release worked well for those platforms x86, ppc and arm
One might suggest, if stable releases are working and you want to live on the
bleeding edge in your distro, you can easily do so there...
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187
2012-08-02 8:11 ` Paul Eggleton
@ 2012-08-03 10:32 ` Khem Raj
2012-08-03 12:38 ` Koen Kooi
0 siblings, 1 reply; 38+ messages in thread
From: Khem Raj @ 2012-08-03 10:32 UTC (permalink / raw)
To: Paul Eggleton; +Cc: Koen Kooi, openembedded-devel
On Aug 2, 2012, at 1:11 AM, Paul Eggleton <paul.eggleton@linux.intel.com> wrote:
> On Wednesday 01 August 2012 15:56:34 Khem Raj wrote:
>> On Aug 1, 2012, at 8:11 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
>>>> Along with upgrade use the release tarballs instead of git
>>>
>>> For an update we need to pull in some patches from master, so a git recipe
>>> is still the preferred way.
>>
>> OK, you know more about it then me but do you know how many those will be ?
>> in other words does systemd releases mean much for stability yet or still
>> its a project moving at so fast pace ?
>>
>> I see that releases are rolled out almost every month, that sort of could
>> mean either way, we wait until the next release or just take from a commit
>> upstream
>>
>> I feel like staying with a release+patches could be one way if we are not
>> importing pathes too often. but I don't know how often that would be. For
>> the testing I did release worked well for those platforms x86, ppc and arm
>
> One might suggest, if stable releases are working and you want to live on the
> bleeding edge in your distro, you can easily do so there…
This is moving forward from where we were so it includes all the git commits that
were there until cd96b3b86abb4a88cac2722bdfb6e5d4413f6831 commit so this update
is inclusive.
we can also think of having a stable recipe and a git recipe but systemd releases
are almost a month apart it would be more or less covered if we moved from release
to release with some patches if needed.
thirdly we can have two recipes as Paul suggested.
>
> Cheers,
> Paul
>
> --
>
> Paul Eggleton
> Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187
2012-08-03 10:32 ` Khem Raj
@ 2012-08-03 12:38 ` Koen Kooi
2012-08-03 14:41 ` Khem Raj
0 siblings, 1 reply; 38+ messages in thread
From: Koen Kooi @ 2012-08-03 12:38 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 03-08-12 12:32, Khem Raj schreef:
>
> On Aug 2, 2012, at 1:11 AM, Paul Eggleton <paul.eggleton@linux.intel.com>
> wrote:
>
>> On Wednesday 01 August 2012 15:56:34 Khem Raj wrote:
>>> On Aug 1, 2012, at 8:11 AM, Koen Kooi <koen@dominion.thruhere.net>
>>> wrote:
>>>>> Along with upgrade use the release tarballs instead of git
>>>>
>>>> For an update we need to pull in some patches from master, so a git
>>>> recipe is still the preferred way.
>>>
>>> OK, you know more about it then me but do you know how many those
>>> will be ? in other words does systemd releases mean much for
>>> stability yet or still its a project moving at so fast pace ?
>>>
>>> I see that releases are rolled out almost every month, that sort of
>>> could mean either way, we wait until the next release or just take
>>> from a commit upstream
>>>
>>> I feel like staying with a release+patches could be one way if we are
>>> not importing pathes too often. but I don't know how often that would
>>> be. For the testing I did release worked well for those platforms
>>> x86, ppc and arm
>>
>> One might suggest, if stable releases are working and you want to live
>> on the bleeding edge in your distro, you can easily do so there…
>
> This is moving forward from where we were so it includes all the git
> commits that were there until cd96b3b86abb4a88cac2722bdfb6e5d4413f6831
> commit so this update is inclusive.
>
> we can also think of having a stable recipe and a git recipe but systemd
> releases are almost a month apart it would be more or less covered if we
> moved from release to release with some patches if needed.
If you look at the fedora and debian packages you'll see that they also pull
in a fair number of patches, so it's not uncommon to do what we're doing.
regards,
Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFQG8Y6MkyGM64RGpERAjOXAJ4mDqgr4BngOrGZk9drnilAvprDygCcCnW7
yiaKvRITgm6shVyoul4z3a0=
=bngc
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187
2012-08-03 12:38 ` Koen Kooi
@ 2012-08-03 14:41 ` Khem Raj
2012-08-03 15:36 ` Koen Kooi
0 siblings, 1 reply; 38+ messages in thread
From: Khem Raj @ 2012-08-03 14:41 UTC (permalink / raw)
To: openembedded-devel
On Fri, Aug 3, 2012 at 5:38 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Op 03-08-12 12:32, Khem Raj schreef:
>>
>> On Aug 2, 2012, at 1:11 AM, Paul Eggleton <paul.eggleton@linux.intel.com>
>> wrote:
>>
>>> On Wednesday 01 August 2012 15:56:34 Khem Raj wrote:
>>>> On Aug 1, 2012, at 8:11 AM, Koen Kooi <koen@dominion.thruhere.net>
>>>> wrote:
>>>>>> Along with upgrade use the release tarballs instead of git
>>>>>
>>>>> For an update we need to pull in some patches from master, so a git
>>>>> recipe is still the preferred way.
>>>>
>>>> OK, you know more about it then me but do you know how many those
>>>> will be ? in other words does systemd releases mean much for
>>>> stability yet or still its a project moving at so fast pace ?
>>>>
>>>> I see that releases are rolled out almost every month, that sort of
>>>> could mean either way, we wait until the next release or just take
>>>> from a commit upstream
>>>>
>>>> I feel like staying with a release+patches could be one way if we are
>>>> not importing pathes too often. but I don't know how often that would
>>>> be. For the testing I did release worked well for those platforms
>>>> x86, ppc and arm
>>>
>>> One might suggest, if stable releases are working and you want to live
>>> on the bleeding edge in your distro, you can easily do so there…
>>
>> This is moving forward from where we were so it includes all the git
>> commits that were there until cd96b3b86abb4a88cac2722bdfb6e5d4413f6831
>> commit so this update is inclusive.
>>
>> we can also think of having a stable recipe and a git recipe but systemd
>> releases are almost a month apart it would be more or less covered if we
>> moved from release to release with some patches if needed.
>
> If you look at the fedora and debian packages you'll see that they also pull
> in a fair number of patches, so it's not uncommon to do what we're doing.
ok. However, my original motivation is to make this layer independent
enough and remove the layer dependencies it has
It will make both layers thrive IMO. I proposed removal of
using gitpkgv you did not like that, then I proposed this to remove
use of SRCREV completely this also is objected on.
may I ask what other option do you have ? I am willing to
make a solution. Ultimately this will make systemd integration
into OE-Core as reference init system easier.
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187
2012-08-03 14:41 ` Khem Raj
@ 2012-08-03 15:36 ` Koen Kooi
2012-08-03 18:39 ` Khem Raj
2012-08-04 20:10 ` Khem Raj
0 siblings, 2 replies; 38+ messages in thread
From: Koen Kooi @ 2012-08-03 15:36 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 03-08-12 16:41, Khem Raj schreef:
> On Fri, Aug 3, 2012 at 5:38 AM, Koen Kooi <koen@dominion.thruhere.net>
> wrote:
>> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
>>
>> Op 03-08-12 12:32, Khem Raj schreef:
>>>
>>> On Aug 2, 2012, at 1:11 AM, Paul Eggleton
>>> <paul.eggleton@linux.intel.com> wrote:
>>>
>>>> On Wednesday 01 August 2012 15:56:34 Khem Raj wrote:
>>>>> On Aug 1, 2012, at 8:11 AM, Koen Kooi
>>>>> <koen@dominion.thruhere.net> wrote:
>>>>>>> Along with upgrade use the release tarballs instead of git
>>>>>>
>>>>>> For an update we need to pull in some patches from master, so a
>>>>>> git recipe is still the preferred way.
>>>>>
>>>>> OK, you know more about it then me but do you know how many
>>>>> those will be ? in other words does systemd releases mean much
>>>>> for stability yet or still its a project moving at so fast pace
>>>>> ?
>>>>>
>>>>> I see that releases are rolled out almost every month, that sort
>>>>> of could mean either way, we wait until the next release or just
>>>>> take from a commit upstream
>>>>>
>>>>> I feel like staying with a release+patches could be one way if we
>>>>> are not importing pathes too often. but I don't know how often
>>>>> that would be. For the testing I did release worked well for
>>>>> those platforms x86, ppc and arm
>>>>
>>>> One might suggest, if stable releases are working and you want to
>>>> live on the bleeding edge in your distro, you can easily do so
>>>> there…
>>>
>>> This is moving forward from where we were so it includes all the git
>>> commits that were there until
>>> cd96b3b86abb4a88cac2722bdfb6e5d4413f6831 commit so this update is
>>> inclusive.
>>>
>>> we can also think of having a stable recipe and a git recipe but
>>> systemd releases are almost a month apart it would be more or less
>>> covered if we moved from release to release with some patches if
>>> needed.
>>
>> If you look at the fedora and debian packages you'll see that they also
>> pull in a fair number of patches, so it's not uncommon to do what we're
>> doing.
>
> ok. However, my original motivation is to make this layer independent
> enough and remove the layer dependencies it has It will make both layers
> thrive IMO. I proposed removal of using gitpkgv you did not like that,
> then I proposed this to remove use of SRCREV completely this also is
> objected on. may I ask what other option do you have ? I am willing to
> make a solution. Ultimately this will make systemd integration into
> OE-Core as reference init system easier.
Move gitpkgv into oe-core
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFQG/ATMkyGM64RGpERAnAsAKCcUD6itYfYsd2xJLDYXLRoQHJL0ACcCaaH
rguf6ChRPi9AZxlufQ3+lsw=
=ASlA
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187
2012-08-03 15:36 ` Koen Kooi
@ 2012-08-03 18:39 ` Khem Raj
2012-08-03 18:42 ` Martin Jansa
2012-08-03 19:08 ` Koen Kooi
2012-08-04 20:10 ` Khem Raj
1 sibling, 2 replies; 38+ messages in thread
From: Khem Raj @ 2012-08-03 18:39 UTC (permalink / raw)
To: openembedded-devel
On Aug 3, 2012, at 8:36 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
>> . However, my original motivation is to make this layer independent
>> enough and remove the layer dependencies it has It will make both layers
>> thrive IMO. I proposed removal of using gitpkgv you did not like that,
>> then I proposed this to remove use of SRCREV completely this also is
>> objected on. may I ask what other option do you have ? I am willing to
>> make a solution. Ultimately this will make systemd integration into
>> OE-Core as reference init system easier.
>
> Move gitpkgv into oe-core
will it even be necessary with autopr ?
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187
2012-08-03 18:39 ` Khem Raj
@ 2012-08-03 18:42 ` Martin Jansa
2012-08-03 19:08 ` Koen Kooi
1 sibling, 0 replies; 38+ messages in thread
From: Martin Jansa @ 2012-08-03 18:42 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 843 bytes --]
On Fri, Aug 03, 2012 at 11:39:43AM -0700, Khem Raj wrote:
>
> On Aug 3, 2012, at 8:36 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> >> . However, my original motivation is to make this layer independent
> >> enough and remove the layer dependencies it has It will make both layers
> >> thrive IMO. I proposed removal of using gitpkgv you did not like that,
> >> then I proposed this to remove use of SRCREV completely this also is
> >> objected on. may I ask what other option do you have ? I am willing to
> >> make a solution. Ultimately this will make systemd integration into
> >> OE-Core as reference init system easier.
> >
> > Move gitpkgv into oe-core
>
>
> will it even be necessary with autopr ?
Yes as PR is applied after SRCPV
Cheers,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187
2012-08-03 18:39 ` Khem Raj
2012-08-03 18:42 ` Martin Jansa
@ 2012-08-03 19:08 ` Koen Kooi
1 sibling, 0 replies; 38+ messages in thread
From: Koen Kooi @ 2012-08-03 19:08 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 03-08-12 20:39, Khem Raj schreef:
>
> On Aug 3, 2012, at 8:36 AM, Koen Kooi <koen@dominion.thruhere.net>
> wrote:
>>> . However, my original motivation is to make this layer independent
>>> enough and remove the layer dependencies it has It will make both
>>> layers thrive IMO. I proposed removal of using gitpkgv you did not
>>> like that, then I proposed this to remove use of SRCREV completely
>>> this also is objected on. may I ask what other option do you have ? I
>>> am willing to make a solution. Ultimately this will make systemd
>>> integration into OE-Core as reference init system easier.
>>
>> Move gitpkgv into oe-core
>
>
> will it even be necessary with autopr ?
PV != PR!!!!One!!!!eleven!!!!
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFQHCGhMkyGM64RGpERAuUrAKCcsXZzLSoVOK6qVS+dHz3ohp5EsgCgs0XS
ssK5c/quhHOFaekH02udVn4=
=tQVt
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187
2012-08-03 15:36 ` Koen Kooi
2012-08-03 18:39 ` Khem Raj
@ 2012-08-04 20:10 ` Khem Raj
2012-08-04 20:35 ` Koen Kooi
1 sibling, 1 reply; 38+ messages in thread
From: Khem Raj @ 2012-08-04 20:10 UTC (permalink / raw)
To: openembedded-devel
On Fri, Aug 3, 2012 at 8:36 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> Move gitpkgv into oe-core
OK until I fight moving it into OE-Core :) , I have sent a V4 of
patchset which creates a copy of gitpkgv.bbclass
in meta-systemd. I believe it will be short lived. Please take a look
at them and install if ok
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187
2012-08-04 20:10 ` Khem Raj
@ 2012-08-04 20:35 ` Koen Kooi
2012-08-04 20:50 ` Khem Raj
0 siblings, 1 reply; 38+ messages in thread
From: Koen Kooi @ 2012-08-04 20:35 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 04-08-12 22:10, Khem Raj schreef:
> On Fri, Aug 3, 2012 at 8:36 AM, Koen Kooi <koen@dominion.thruhere.net>
> wrote:
>> Move gitpkgv into oe-core
>
> OK until I fight moving it into OE-Core :) , I have sent a V4 of patchset
> which creates a copy of gitpkgv.bbclass in meta-systemd. I believe it
> will be short lived. Please take a look at them and install if ok
Can't you just symlink it from meta-oe? It will be in the same git repo
anyway. That would avoid having 2 copies.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFQHYeGMkyGM64RGpERAgWIAJ9xNd5O/3TMfJCzt4yjP0/Er5JrfwCgg5pp
jDXWDi0yfnZ9IjX0uF5x0Z4=
=LkJ4
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-oe][PATCH V2 6/7] blacklist.bbclass: Move to meta-angstrom
2012-07-31 18:56 ` [meta-oe][PATCH V2 6/7] blacklist.bbclass: Move to meta-angstrom Khem Raj
2012-07-31 19:07 ` Koen Kooi
@ 2012-08-04 20:36 ` Koen Kooi
2012-08-04 20:47 ` Khem Raj
1 sibling, 1 reply; 38+ messages in thread
From: Koen Kooi @ 2012-08-04 20:36 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 31-07-12 20:56, Khem Raj schreef:
> This class is angstrom specific so lets move it to more appropriate
> layer
As said before, this class isn't angstrom specific and it won't move back to
angstrom.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFQHYe2MkyGM64RGpERAq3RAKCUTjgqXF4KVzxnHXDPneWwlG312QCgrcN3
+83iM4uRs2q3rI3aLlsswHI=
=++x/
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-oe][PATCH V2 6/7] blacklist.bbclass: Move to meta-angstrom
2012-08-04 20:36 ` Koen Kooi
@ 2012-08-04 20:47 ` Khem Raj
2012-08-04 21:56 ` Philip Balister
2012-08-05 11:41 ` Koen Kooi
0 siblings, 2 replies; 38+ messages in thread
From: Khem Raj @ 2012-08-04 20:47 UTC (permalink / raw)
To: openembedded-devel
On Sat, Aug 4, 2012 at 1:36 PM, Koen Kooi <koen@dominion.thruhere.net> wrote:
>
> As said before, this class isn't angstrom specific and it won't move back to
> angstrom.
koen no one else is using it other than angstrom. but it interferes
with similar class from OE-Core
so essentially you want to keep a feature thats just used by angstrom
in a non angstrom layer?
doent sound logical to me. Would it be acceptable if angstrom used
this feature from OE-Core as well ?
then it will remove the usecase completely.
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187
2012-08-04 20:35 ` Koen Kooi
@ 2012-08-04 20:50 ` Khem Raj
2012-08-05 11:42 ` Koen Kooi
0 siblings, 1 reply; 38+ messages in thread
From: Khem Raj @ 2012-08-04 20:50 UTC (permalink / raw)
To: openembedded-devel
On Sat, Aug 4, 2012 at 1:35 PM, Koen Kooi <koen@dominion.thruhere.net> wrote:
>> On Fri, Aug 3, 2012 at 8:36 AM, Koen Kooi <koen@dominion.thruhere.net>
>> wrote:
>>> Move gitpkgv into oe-core
>>
>> OK until I fight moving it into OE-Core :) , I have sent a V4 of patchset
>> which creates a copy of gitpkgv.bbclass in meta-systemd. I believe it
>> will be short lived. Please take a look at them and install if ok
>
> Can't you just symlink it from meta-oe? It will be in the same git repo
> anyway. That would avoid having 2 copies
we dont have synlinks in repo I didnt want to create first one and its
reaching across layers
moreover this calss seldom changes. If you prefer symlink I can redo that bit
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-oe][PATCH V2 6/7] blacklist.bbclass: Move to meta-angstrom
2012-08-04 20:47 ` Khem Raj
@ 2012-08-04 21:56 ` Philip Balister
2012-08-05 11:41 ` Koen Kooi
1 sibling, 0 replies; 38+ messages in thread
From: Philip Balister @ 2012-08-04 21:56 UTC (permalink / raw)
To: openembedded-devel
On 08/04/2012 04:47 PM, Khem Raj wrote:
> On Sat, Aug 4, 2012 at 1:36 PM, Koen Kooi <koen@dominion.thruhere.net> wrote:
>>
>> As said before, this class isn't angstrom specific and it won't move back to
>> angstrom.
>
> koen no one else is using it other than angstrom. but it interferes
> with similar class from OE-Core
> so essentially you want to keep a feature thats just used by angstrom
> in a non angstrom layer?
> doent sound logical to me. Would it be acceptable if angstrom used
> this feature from OE-Core as well ?
> then it will remove the usecase completely.
If Angstrom is the only user and no one else is asking for it, it is
Angstrom specific for all intents and purposes.
Philip
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-oe][PATCH V2 6/7] blacklist.bbclass: Move to meta-angstrom
2012-08-04 20:47 ` Khem Raj
2012-08-04 21:56 ` Philip Balister
@ 2012-08-05 11:41 ` Koen Kooi
2012-08-05 19:44 ` Khem Raj
2012-08-05 21:37 ` Chris Larson
1 sibling, 2 replies; 38+ messages in thread
From: Koen Kooi @ 2012-08-05 11:41 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 04-08-12 22:47, Khem Raj schreef:
> On Sat, Aug 4, 2012 at 1:36 PM, Koen Kooi <koen@dominion.thruhere.net>
> wrote:
>>
>> As said before, this class isn't angstrom specific and it won't move
>> back to angstrom.
>
> koen no one else is using it other than angstrom. but it interferes with
> similar class from OE-Core
I guess oe-core people need to be less anti-social with other layers then
and provide migration patches.
> so essentially you want to keep a feature thats just used by angstrom in
> a non angstrom layer?
No, I want the class deleted. But as I keep saying, the class was moved to
meta-oe on request because is was most certainly not angstrom specific. And
as angstrom maintainer I have no intent to add it back to the angstrom
layer. So your commit message is entirely wrong.
> doent sound logical to me. Would it be acceptable if angstrom used this
> feature from OE-Core as well ? then it will remove the usecase
> completely.
I keep waiting on the person that pushed it to oe-core to provide patches
for distro layers using the old functionality, see above.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFQHlvtMkyGM64RGpERAlM+AJ0QIjUUJazAAA39xptb5OTVbU7GkQCgumJT
FFtbzZWd8sI4w3gPZJTLeho=
=mlaZ
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187
2012-08-04 20:50 ` Khem Raj
@ 2012-08-05 11:42 ` Koen Kooi
2012-08-05 11:53 ` Philip Balister
0 siblings, 1 reply; 38+ messages in thread
From: Koen Kooi @ 2012-08-05 11:42 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 04-08-12 22:50, Khem Raj schreef:
> On Sat, Aug 4, 2012 at 1:35 PM, Koen Kooi <koen@dominion.thruhere.net>
> wrote:
>>> On Fri, Aug 3, 2012 at 8:36 AM, Koen Kooi
>>> <koen@dominion.thruhere.net> wrote:
>>>> Move gitpkgv into oe-core
>>>
>>> OK until I fight moving it into OE-Core :) , I have sent a V4 of
>>> patchset which creates a copy of gitpkgv.bbclass in meta-systemd. I
>>> believe it will be short lived. Please take a look at them and
>>> install if ok
>>
>> Can't you just symlink it from meta-oe? It will be in the same git
>> repo anyway. That would avoid having 2 copies
>
> we dont have synlinks in repo I didnt want to create first one and its
> reaching across layers moreover this calss seldom changes. If you prefer
> symlink I can redo that bit
Please use a symlink. Whenever there is manual synchronization needed people
*will* screw up, just look at kernel.bbclass in meta-oe :)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFQHlw/MkyGM64RGpERAsFEAJ9GGd0Q8NjGqRGUxLxBTMe/modZ0ACbB2we
FCmtXTuVV0fgxg8lUi+Zpbw=
=WDO3
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187
2012-08-05 11:42 ` Koen Kooi
@ 2012-08-05 11:53 ` Philip Balister
2012-08-05 19:40 ` Khem Raj
0 siblings, 1 reply; 38+ messages in thread
From: Philip Balister @ 2012-08-05 11:53 UTC (permalink / raw)
To: openembedded-devel
On 08/05/2012 07:42 AM, Koen Kooi wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Op 04-08-12 22:50, Khem Raj schreef:
>> On Sat, Aug 4, 2012 at 1:35 PM, Koen Kooi <koen@dominion.thruhere.net>
>> wrote:
>>>> On Fri, Aug 3, 2012 at 8:36 AM, Koen Kooi
>>>> <koen@dominion.thruhere.net> wrote:
>>>>> Move gitpkgv into oe-core
>>>>
>>>> OK until I fight moving it into OE-Core :) , I have sent a V4 of
>>>> patchset which creates a copy of gitpkgv.bbclass in meta-systemd. I
>>>> believe it will be short lived. Please take a look at them and
>>>> install if ok
>>>
>>> Can't you just symlink it from meta-oe? It will be in the same git
>>> repo anyway. That would avoid having 2 copies
>>
>> we dont have synlinks in repo I didnt want to create first one and its
>> reaching across layers moreover this calss seldom changes. If you prefer
>> symlink I can redo that bit
>
> Please use a symlink. Whenever there is manual synchronization needed people
> *will* screw up, just look at kernel.bbclass in meta-oe :)
Can someone provide a clear explanation of exactly what the gitpkgv
class does and why it is needed? Furthermore, does oe-core provide
something that could be used? It is clear that ther eis a desire for
something like this in two layers, and that makes it a candidate for
oe-core.
Symlinking stuff across layers is just wrong. The underlying issue has
to be resolved.
Philip
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.5 (Darwin)
> Comment: GPGTools - http://gpgtools.org
>
> iD8DBQFQHlw/MkyGM64RGpERAsFEAJ9GGd0Q8NjGqRGUxLxBTMe/modZ0ACbB2we
> FCmtXTuVV0fgxg8lUi+Zpbw=
> =WDO3
> -----END PGP SIGNATURE-----
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187
2012-08-05 11:53 ` Philip Balister
@ 2012-08-05 19:40 ` Khem Raj
0 siblings, 0 replies; 38+ messages in thread
From: Khem Raj @ 2012-08-05 19:40 UTC (permalink / raw)
To: openembedded-devel
On Sun, Aug 5, 2012 at 4:53 AM, Philip Balister <philip@balister.org> wrote:
> Can someone provide a clear explanation of exactly what the gitpkgv class
> does and why it is needed? Furthermore, does oe-core provide something that
> could be used? It is clear that ther eis a desire for something like this in
> two layers, and that makes it a candidate for oe-core.
well oe-core does not have this functionality and it works in most
cases and 'most cases' is a problem
to get it accepted in oe-core. Its a good feature where it provides a
good incremental version from the maze of
git SHA ids. That part is good however there is another variable it
provides which is GITPKGVTAG
that relies on the tags to be incrementally sortable which is broken
since tags are arbitrary
and systemd uses GITPKGVTAG
I think I can defend GITPKGV but GITPKGVTAG will have unanswered
questions. ideally bitbake fetcher
should provide this functionality
>
> Symlinking stuff across layers is just wrong. The underlying issue has to be
> resolved.
I am in agreement. here its deemed to be a short term solution so lets
live with it
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-oe][PATCH V2 6/7] blacklist.bbclass: Move to meta-angstrom
2012-08-05 11:41 ` Koen Kooi
@ 2012-08-05 19:44 ` Khem Raj
2012-08-05 21:37 ` Chris Larson
1 sibling, 0 replies; 38+ messages in thread
From: Khem Raj @ 2012-08-05 19:44 UTC (permalink / raw)
To: openembedded-devel
On Sun, Aug 5, 2012 at 4:41 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> No, I want the class deleted. But as I keep saying, the class was moved to
> meta-oe on request because is was most certainly not angstrom specific. And
> as angstrom maintainer I have no intent to add it back to the angstrom
> layer. So your commit message is entirely wrong.
OK I can change the commit message. I will also work on getting angstrom to use
this from OE-Core so even angstrom wont need this feature. I agree that when
similar features from other layers are added to OE-Core then all
distros should be informed and helped
out to adopt one good case where it happened nicely is buildhistory
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-oe][PATCH V2 6/7] blacklist.bbclass: Move to meta-angstrom
2012-08-05 11:41 ` Koen Kooi
2012-08-05 19:44 ` Khem Raj
@ 2012-08-05 21:37 ` Chris Larson
2012-08-05 22:06 ` Khem Raj
2012-08-06 7:43 ` Koen Kooi
1 sibling, 2 replies; 38+ messages in thread
From: Chris Larson @ 2012-08-05 21:37 UTC (permalink / raw)
To: openembedded-devel
On Sun, Aug 5, 2012 at 4:41 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
>> doent sound logical to me. Would it be acceptable if angstrom used this
>> feature from OE-Core as well ? then it will remove the usecase
>> completely.
>
> I keep waiting on the person that pushed it to oe-core to provide patches
> for distro layers using the old functionality, see above.
This doesn't make much sense to me. It's impossible to know what all
layers use a given piece of functionality, particularly ones that
aren't published in public places, so expecting every person changing
something in oe-core will go and submit changes to every layer that
exists is entirely unreasonable. If you maintain a layer, it's your
responsibility to make sure your layer retains compatibility with
upstream. It's not upstream's responsibility to make sure everyone
using their functionality stays compatible.
--
Christopher Larson
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-oe][PATCH V2 6/7] blacklist.bbclass: Move to meta-angstrom
2012-08-05 21:37 ` Chris Larson
@ 2012-08-05 22:06 ` Khem Raj
2012-08-06 7:43 ` Koen Kooi
1 sibling, 0 replies; 38+ messages in thread
From: Khem Raj @ 2012-08-05 22:06 UTC (permalink / raw)
To: openembedded-devel
On Sun, Aug 5, 2012 at 2:37 PM, Chris Larson <clarson@kergoth.com> wrote:
>
> This doesn't make much sense to me. It's impossible to know what all
> layers use a given piece of functionality, particularly ones that
> aren't published in public places, so expecting every person changing
> something in oe-core will go and submit changes to every layer that
> exists is entirely unreasonable. If you maintain a layer, it's your
> responsibility to make sure your layer retains compatibility with
> upstream. It's not upstream's responsibility to make sure everyone
> using their functionality stays compatible.
I would agree in general. In this given case this feature was taken
from meta-oe to begin with
so my point is if you moved it from meta-oe then make sure that its
removed from meta-oe
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-oe][PATCH V2 6/7] blacklist.bbclass: Move to meta-angstrom
2012-08-05 21:37 ` Chris Larson
2012-08-05 22:06 ` Khem Raj
@ 2012-08-06 7:43 ` Koen Kooi
2012-08-07 2:38 ` Khem Raj
1 sibling, 1 reply; 38+ messages in thread
From: Koen Kooi @ 2012-08-06 7:43 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 05-08-12 23:37, Chris Larson schreef:
> On Sun, Aug 5, 2012 at 4:41 AM, Koen Kooi <koen@dominion.thruhere.net>
> wrote:
>>> doent sound logical to me. Would it be acceptable if angstrom used
>>> this feature from OE-Core as well ? then it will remove the usecase
>>> completely.
>>
>> I keep waiting on the person that pushed it to oe-core to provide
>> patches for distro layers using the old functionality, see above.
>
> This doesn't make much sense to me. It's impossible to know what all
> layers use a given piece of functionality, particularly ones that aren't
> published in public places, so expecting every person changing something
> in oe-core will go and submit changes to every layer that exists is
> entirely unreasonable. If you maintain a layer, it's your responsibility
> to make sure your layer retains compatibility with upstream. It's not
> upstream's responsibility to make sure everyone using their functionality
> stays compatible.
In this specific instance the class was moved from meta-angstrom to meta-oe
as is and then moved to oe-core and changed to make it "less angstrom
specific".
I don't see how you can argue that the person making that change was/is
unaware of the existence of the angstrom layer. Or of the SHR usage of that
class.
But yes, some people don't know that layers exist, there was a nice example
last week when I asked if someone checked *all* the layers out there on the
impact of the patch in question and the response was "Yes, I checked both
oe-core and meta-intel".
I agree with your generic point that changes in oe-core can not and should
not require updating of all layers by the submitter. On the other hand: if
you know you're moving functionality between layers while breaking it in the
process it is anti-social to not fix up the user(s) of that functionality
that you know of.
This is similar to asking a oe-core patch to be held back for a few days
because a number of layers have a matching bbappend that will need updating.
Especially if those layers have maintainers where the patch review latency
is measured in days instead of hours (e.g. me with non-denzil based stuff).
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFQH3W3MkyGM64RGpERAlbgAKCBvZTQD38H44mB+JzjQ2t92ttMzQCfVxeJ
nX2o+AfM7mrFEZnBT7YAV5s=
=v8kK
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [meta-oe][PATCH V2 6/7] blacklist.bbclass: Move to meta-angstrom
2012-08-06 7:43 ` Koen Kooi
@ 2012-08-07 2:38 ` Khem Raj
0 siblings, 0 replies; 38+ messages in thread
From: Khem Raj @ 2012-08-07 2:38 UTC (permalink / raw)
To: openembedded-devel
Koen,
Besides this patch are rest of patches acceptable?
while I work on making blacklist class acceptable in all use case
On Mon, Aug 6, 2012 at 12:43 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> updating of all layers by the submitter. On the other hand: if
^ permalink raw reply [flat|nested] 38+ messages in thread
end of thread, other threads:[~2012-08-07 2:50 UTC | newest]
Thread overview: 38+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-31 18:56 [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187 Khem Raj
2012-07-31 18:56 ` [meta-systemd][PATCH V2 2/7] busybox: stopping systemd-kmsg-syslogd is not needed Khem Raj
2012-07-31 18:56 ` [meta-systemd][PATCH V2 3/7] busybox-syslog.service.in: Create alias for syslog.service Khem Raj
2012-07-31 18:56 ` [meta-systemd][PATCH V2 4/7] systemd: Use cross cpp Khem Raj
2012-07-31 18:56 ` [meta-oe][PATCH V2 5/7] testlab.bbclass: Delete Khem Raj
2012-07-31 18:56 ` [meta-oe][PATCH V2 6/7] blacklist.bbclass: Move to meta-angstrom Khem Raj
2012-07-31 19:07 ` Koen Kooi
2012-07-31 19:24 ` Chris Larson
2012-07-31 19:43 ` Martin Jansa
2012-07-31 20:46 ` Khem Raj
2012-08-04 20:36 ` Koen Kooi
2012-08-04 20:47 ` Khem Raj
2012-08-04 21:56 ` Philip Balister
2012-08-05 11:41 ` Koen Kooi
2012-08-05 19:44 ` Khem Raj
2012-08-05 21:37 ` Chris Larson
2012-08-05 22:06 ` Khem Raj
2012-08-06 7:43 ` Koen Kooi
2012-08-07 2:38 ` Khem Raj
2012-07-31 18:56 ` [meta-oe][PATCH V2 7/7] kernel.bbclass: Rename to machine_kernel_pr.bbclass which provides added functionality Khem Raj
2012-08-01 17:38 ` Otavio Salvador
2012-08-01 22:31 ` Khem Raj
2012-08-01 15:11 ` [meta-systemd][PATCH V2 1/7] systemd: Upgrade to 187 Koen Kooi
2012-08-01 22:56 ` Khem Raj
2012-08-02 8:11 ` Paul Eggleton
2012-08-03 10:32 ` Khem Raj
2012-08-03 12:38 ` Koen Kooi
2012-08-03 14:41 ` Khem Raj
2012-08-03 15:36 ` Koen Kooi
2012-08-03 18:39 ` Khem Raj
2012-08-03 18:42 ` Martin Jansa
2012-08-03 19:08 ` Koen Kooi
2012-08-04 20:10 ` Khem Raj
2012-08-04 20:35 ` Koen Kooi
2012-08-04 20:50 ` Khem Raj
2012-08-05 11:42 ` Koen Kooi
2012-08-05 11:53 ` Philip Balister
2012-08-05 19:40 ` Khem Raj
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.