From c8ba91fe350a5b56d46baef35470bdbbaa5edaef Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Wed, 26 Dec 2007 22:33:25 +0000 Subject: settings-daemon: Add missing dependency to gtk+ --- packages/settings-daemon/settings-daemon_svn.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/settings-daemon/settings-daemon_svn.bb b/packages/settings-daemon/settings-daemon_svn.bb index fb24fb1d75..eaffbfebb4 100644 --- a/packages/settings-daemon/settings-daemon_svn.bb +++ b/packages/settings-daemon/settings-daemon_svn.bb @@ -1,10 +1,12 @@ DESCRIPTION = "Settings-daemon provides a bridge between gconf and xsettings" LICENSE = "GPL" -DEPENDS = "gconf glib-2.0" +DEPENDS = "gconf glib-2.0 gtk+" RDEPENDS = "xrdb" SECTION = "x11" PV = "0.0+svnr${SRCREV}" +PR = "r1" + SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ file://70settings-daemon" -- cgit v1.2.3 From 88e9b1096892df9a73bffd82ec7f487b8a405fd3 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 28 Dec 2007 15:29:06 +0000 Subject: u-boot-mkimage-openmoko-native_oe catch up with recipe renaming --- packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb b/packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb index e7812a5ed0..08c0062fab 100644 --- a/packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb +++ b/packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb @@ -1,4 +1,4 @@ -require uboot-openmoko_svn.bb +require u-boot-openmoko_svn.bb inherit native -- cgit v1.2.3 From 1988774b35c20fb05e2b53dd06992b53b1f00f79 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 28 Dec 2007 15:51:33 +0000 Subject: moko-autorev.inc catch up with uboot recipe renamings --- conf/distro/include/moko-autorev.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 74b930781b..9f8ae61fc3 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -44,7 +44,7 @@ SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}" SRCREV_pn-openocd ?= "${AUTOREV}" SRCREV_pn-openocd-native ?= "${AUTOREV}" -SRCREV_pn-uboot-openmoko ?= "${AUTOREV}" +SRCREV_pn-u-boot-openmoko ?= "${AUTOREV}" SRCREV_pn-dfu-util ?= "${AUTOREV}" SRCREV_pn-dfu-util-native ?= "${AUTOREV}" SRCREV_pn-usbpath ?= "${AUTOREV}" -- cgit v1.2.3 From 872cb9dc7ffd37e5c059efd0e017649fd3551435 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Fri, 28 Dec 2007 16:07:40 +0000 Subject: altboot: Update to SVNR73 --- packages/altboot/altboot_1.1.1+wip-SVNR70.bb | 76 ---------------------------- packages/altboot/altboot_1.1.1+wip-SVNR73.bb | 76 ++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 76 deletions(-) delete mode 100644 packages/altboot/altboot_1.1.1+wip-SVNR70.bb create mode 100644 packages/altboot/altboot_1.1.1+wip-SVNR73.bb diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR70.bb b/packages/altboot/altboot_1.1.1+wip-SVNR70.bb deleted file mode 100644 index e22e992cc9..0000000000 --- a/packages/altboot/altboot_1.1.1+wip-SVNR70.bb +++ /dev/null @@ -1,76 +0,0 @@ -require altboot.inc - -PR = "r0" - -SVN_REV = "70" -SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \ - " - -do_install() { - install -d ${D}/sbin - install -d ${D}/etc/altboot-menu - install -d ${D}/etc/altboot.rc - install -d ${D}/usr/share/doc/altboot - install -d ${D}/usr/share/sounds - - if test -d ${S}/${MACHINE_DIR} - then - install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/ - else - install -m 0644 ${S}/altboot*.cfg ${D}/etc/ - fi - - install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds - install -m 0644 ${S}/altboot.func ${D}/etc - install -m 0644 ${S}/altboot.sbin ${D}/etc - install -m 0644 ${S}/altbootctl.conf ${D}/etc - install -m 0755 ${S}/init.altboot ${D}/sbin - install -m 0755 ${S}/altbootctl ${D}/sbin - - ln -s /sbin/init.altboot ${D}/sbin/altboot - - if test -d ${S}/${MACHINE_DIR}/altboot-menu - then - install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu - - if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced - then - install -d ${D}/etc/altboot-menu/Advanced - install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced - fi - else - install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu - - if test -d ${S}/altboot-menu/Advanced - then - install -d ${D}/etc/altboot-menu/Advanced - install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced - fi - fi - - if test -d ${S}/${MACHINE_DIR}/altboot.rc - then - install -m 0755 ${S}/${MACHINE_DIR}/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${S}/${MACHINE_DIR}/altboot.rc/*.txt ${D}/etc/altboot.rc - else - install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc - fi -} - -do_configure() { - cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_ - mv ${S}/init.altboot_ ${S}/init.altboot -} - -pkg_postinst_${PN}() { - test -L /linuxrc && update-alternatives --install /linuxrc linuxrc /sbin/init.altboot 55 - - update-alternatives --install /sbin/init init /sbin/init.altboot 55 -} - -pkg_postrm_${PN}() { - test -L /linuxrc && update_alternatives --remove linuxrc /sbin/init.altboot - - update-alternatives --remove init /sbin/init.altboot -} diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR73.bb b/packages/altboot/altboot_1.1.1+wip-SVNR73.bb new file mode 100644 index 0000000000..58d5721dbf --- /dev/null +++ b/packages/altboot/altboot_1.1.1+wip-SVNR73.bb @@ -0,0 +1,76 @@ +require altboot.inc + +PR = "r0" + +SVN_REV = "73" +SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \ + " + +do_install() { + install -d ${D}/sbin + install -d ${D}/etc/altboot-menu + install -d ${D}/etc/altboot.rc + install -d ${D}/usr/share/doc/altboot + install -d ${D}/usr/share/sounds + + if test -d ${S}/${MACHINE_DIR} + then + install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/ + else + install -m 0644 ${S}/altboot*.cfg ${D}/etc/ + fi + + install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds + install -m 0644 ${S}/altboot.func ${D}/etc + install -m 0644 ${S}/altboot.sbin ${D}/etc + install -m 0644 ${S}/altbootctl.conf ${D}/etc + install -m 0755 ${S}/init.altboot ${D}/sbin + install -m 0755 ${S}/altbootctl ${D}/sbin + + ln -s /sbin/init.altboot ${D}/sbin/altboot + + if test -d ${S}/${MACHINE_DIR}/altboot-menu + then + install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu + + if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced + then + install -d ${D}/etc/altboot-menu/Advanced + install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + fi + else + install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu + + if test -d ${S}/altboot-menu/Advanced + then + install -d ${D}/etc/altboot-menu/Advanced + install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + fi + fi + + if test -d ${S}/${MACHINE_DIR}/altboot.rc + then + install -m 0755 ${S}/${MACHINE_DIR}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/${MACHINE_DIR}/altboot.rc/*.txt ${D}/etc/altboot.rc + else + install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc + fi +} + +do_configure() { + cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_ + mv ${S}/init.altboot_ ${S}/init.altboot +} + +pkg_postinst_${PN}() { + test -L /linuxrc && update-alternatives --install /linuxrc linuxrc /sbin/init.altboot 55 + + update-alternatives --install /sbin/init init /sbin/init.altboot 55 +} + +pkg_postrm_${PN}() { + test -L /linuxrc && update_alternatives --remove linuxrc /sbin/init.altboot + + update-alternatives --remove init /sbin/init.altboot +} -- cgit v1.2.3