From 7b297dc027dab0a74b755934e00a697abaf9b6ad Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 30 Mar 2007 18:04:53 +0000 Subject: slugos-init: Add support for handing boot control over to altboot. --- packages/slugos-init/files/turnup | 13 ++++++++++++- packages/slugos-init/slugos-init_0.10.bb | 5 ++++- 2 files changed, 16 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup index 556d942e26..119d84f2c8 100644 --- a/packages/slugos-init/files/turnup +++ b/packages/slugos-init/files/turnup @@ -372,6 +372,8 @@ boot_rootfs() { nfs) shift 2;; flash) ;; ram) ;; + altboot) + ;; *) echo "turnup: boot_rootfs($type, $ffs, $device): unknown type" >&2 return 1;; esac @@ -405,6 +407,11 @@ boot_rootfs() { echo "turnup: boot_rootfs: failed to write $ffs/linuxrc.new" >&2 return 1 };; + altboot) + ln -s "boot/altboot" "$ffs"/linuxrc.new || { + echo "turnup: boot_rootfs: failed to create $ffs/linuxrc.new" >&2 + return 1 + };; *) { echo '#!/bin/sh' # echo 'modprobe ehci-hcd' # echo 'modprobe ohci-hcd' @@ -572,7 +579,7 @@ boot_reset() { local ffs typ status case "$1" in - flash|ram)type="$1" + flash|ram|altboot)type="$1" shift;; *) echo "turnup: boot_reset($1): invalid type" >&2 return 1;; @@ -799,6 +806,8 @@ nfs) shift nfs "$@";; flash) boot_reset flash;; ram) boot_reset ram;; +altboot) + boot_reset altboot;; preserve) shift sysconf save "$@";; @@ -841,6 +850,8 @@ usage: turnup command [options] ram Boot (once) into a ramdisk, subsequent boots will be to the flash file system. + altboot + Hand over boot control to the altboot utility. preserve Save the system configuration to the SysConf partition, you will need to create the SysConf partition from the boot loader diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index 56f3c7242a..90ad6f4cee 100644 --- a/packages/slugos-init/slugos-init_0.10.bb +++ b/packages/slugos-init/slugos-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r80" +PR = "r81" SRC_URI = "file://boot/flash \ file://boot/disk \ @@ -102,6 +102,9 @@ do_install() { install -m 0755 boot/$p ${D}/boot done + # Support for altboot + ln -s /sbin/init.altboot ${D}/boot/altboot + # Configuration files install -m 0644 conffiles ${D}${sysconfdir}/default -- cgit v1.2.3 From 49464dcea63bcd4fc2599216b71e78617912f16e Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 30 Mar 2007 18:25:11 +0000 Subject: slugos-init: Remove special altboot support - turnup flash is all that is required. --- packages/slugos-init/files/turnup | 13 +------------ packages/slugos-init/slugos-init_0.10.bb | 5 +---- 2 files changed, 2 insertions(+), 16 deletions(-) (limited to 'packages') diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup index 119d84f2c8..556d942e26 100644 --- a/packages/slugos-init/files/turnup +++ b/packages/slugos-init/files/turnup @@ -372,8 +372,6 @@ boot_rootfs() { nfs) shift 2;; flash) ;; ram) ;; - altboot) - ;; *) echo "turnup: boot_rootfs($type, $ffs, $device): unknown type" >&2 return 1;; esac @@ -407,11 +405,6 @@ boot_rootfs() { echo "turnup: boot_rootfs: failed to write $ffs/linuxrc.new" >&2 return 1 };; - altboot) - ln -s "boot/altboot" "$ffs"/linuxrc.new || { - echo "turnup: boot_rootfs: failed to create $ffs/linuxrc.new" >&2 - return 1 - };; *) { echo '#!/bin/sh' # echo 'modprobe ehci-hcd' # echo 'modprobe ohci-hcd' @@ -579,7 +572,7 @@ boot_reset() { local ffs typ status case "$1" in - flash|ram|altboot)type="$1" + flash|ram)type="$1" shift;; *) echo "turnup: boot_reset($1): invalid type" >&2 return 1;; @@ -806,8 +799,6 @@ nfs) shift nfs "$@";; flash) boot_reset flash;; ram) boot_reset ram;; -altboot) - boot_reset altboot;; preserve) shift sysconf save "$@";; @@ -850,8 +841,6 @@ usage: turnup command [options] ram Boot (once) into a ramdisk, subsequent boots will be to the flash file system. - altboot - Hand over boot control to the altboot utility. preserve Save the system configuration to the SysConf partition, you will need to create the SysConf partition from the boot loader diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index 90ad6f4cee..8f8c68d7b7 100644 --- a/packages/slugos-init/slugos-init_0.10.bb +++ b/packages/slugos-init/slugos-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r81" +PR = "r82" SRC_URI = "file://boot/flash \ file://boot/disk \ @@ -102,9 +102,6 @@ do_install() { install -m 0755 boot/$p ${D}/boot done - # Support for altboot - ln -s /sbin/init.altboot ${D}/boot/altboot - # Configuration files install -m 0644 conffiles ${D}${sysconfdir}/default -- cgit v1.2.3 From 9388d01bc7e5d1eea87480df05d35c10018b0886 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Fri, 30 Mar 2007 22:07:58 +0000 Subject: altboot_wip.bb: Drop altboot_wip.bb --- packages/altboot/altboot_wip.bb | 99 ----------------------------------------- 1 file changed, 99 deletions(-) delete mode 100644 packages/altboot/altboot_wip.bb (limited to 'packages') diff --git a/packages/altboot/altboot_wip.bb b/packages/altboot/altboot_wip.bb deleted file mode 100644 index 37a8b5f9dd..0000000000 --- a/packages/altboot/altboot_wip.bb +++ /dev/null @@ -1,99 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) -# -# Filename: altboot_1.0.5-rc2.bb -# Date: 21-Feb-06 - -DESCRIPTION = "The altboot bootmanager" -MAINTAINER = "Matthias 'CoreDump' Hentges " -HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" -LICENSE = "GPL" - -###################################################################################### - -RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools" -RRECOMMENDS_${PN}_append_akita = " kexec-tools" -RRECOMMENDS_${PN}_append_spitz = " kexec-tools" -RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools" - -RDEPENDS_${PN} = "${PN}-conf" -RDEPENDS_${PN}-conf = "${PN}" - -###################################################################################### - -WIP_DATE = "20070323" - -PV = "1.1.1+wip-${WIP_DATE}" -PR = "r0" - -###################################################################################### - -PACKAGES = "${PN}-conf ${PN}-doc ${PN}" - -PACKAGE_ARCH_${PN} = "all" -PACKAGE_ARCH_${PN}-doc = "all" -PACKAGE_ARCH_${PN}-conf = "${MACHINE}" - -TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-').replace('+', '-')}" - -SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};proto=svn" - -S = "${WORKDIR}/${TAG}/" - -###################################################################################### - -FILES_${PN}-conf = "/etc/altboot*cfg" - -###################################################################################### - -do_install() { - install -d ${D}/sbin - install -d ${D}/etc/altboot-menu - install -d ${D}/etc/altboot-menu/Advanced - install -d ${D}/etc/altboot.rc - install -d ${D}/usr/share/doc/altboot - install -d ${D}/usr/share/sounds - install -d ${D}/etc/skel/altboot - - if test -d ${S}/${MACHINE} - then - install -m 0644 ${S}/${MACHINE}/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}/altbootctl.conf ${D}/etc - install -m 0755 ${S}/init.altboot ${D}/sbin - install -m 0755 ${S}/altbootctl ${D}/sbin - - install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu - - install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced - - install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc -} - -###################################################################################### - -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}() { - update-alternatives --install /sbin/init init /sbin/init.altboot 55 -} - -###################################################################################### - -pkg_postrm_${PN}() { - update-alternatives --remove init /sbin/init.altboot -} - -- cgit v1.2.3 From 39886a956b7f240f604b2f71cfaea294276f40b9 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Fri, 30 Mar 2007 22:41:18 +0000 Subject: altboot: Add first installable version for nslu2 --- packages/altboot/altboot_1.1.1+wip-20070331.bb | 121 +++++++++++++++++++++++++ packages/altboot/altboot_svn.bb | 37 ++++++-- 2 files changed, 151 insertions(+), 7 deletions(-) create mode 100644 packages/altboot/altboot_1.1.1+wip-20070331.bb (limited to 'packages') diff --git a/packages/altboot/altboot_1.1.1+wip-20070331.bb b/packages/altboot/altboot_1.1.1+wip-20070331.bb new file mode 100644 index 0000000000..e9754b8dbe --- /dev/null +++ b/packages/altboot/altboot_1.1.1+wip-20070331.bb @@ -0,0 +1,121 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2006 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: altboot_1.0.5-rc2.bb +# Date: 21-Feb-06 + +DESCRIPTION = "The altboot bootmanager" +MAINTAINER = "Matthias 'CoreDump' Hentges " +HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" +LICENSE = "GPL" + +###################################################################################### + +RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools" +RRECOMMENDS_${PN}_append_akita = " kexec-tools" +RRECOMMENDS_${PN}_append_spitz = " kexec-tools" +RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools" + +RDEPENDS_${PN} = "${PN}-conf" +RDEPENDS_${PN}-conf = "${PN}" + +###################################################################################### + +SRCDATE="20070331" +PV = "1.1.1+wip-${SRCDATE}" +PR = "r0" + +###################################################################################### + +PACKAGES = "${PN}-conf ${PN}-doc ${PN}" + +PACKAGE_ARCH_${PN} = "${MACHINE}" +PACKAGE_ARCH_${PN}-doc = "all" +PACKAGE_ARCH_${PN}-conf = "${MACHINE}" + +SRC_URI = "svn://hentges.net/altboot;module=trunk;proto=svn" + +S = "${WORKDIR}/trunk/" + +###################################################################################### + +FILES_${PN}-conf = "/etc/altboot*cfg" + +###################################################################################### + +do_install() { + install -d ${D}/sbin + install -d ${D}/etc/altboot-menu + install -d ${D}/etc/altboot-menu/Advanced + install -d ${D}/etc/altboot.rc + install -d ${D}/usr/share/doc/altboot + install -d ${D}/usr/share/sounds + + if test -d ${S}/${MACHINE} + then + install -m 0644 ${S}/${MACHINE}/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}/altboot-menu + then + install -m 0755 ${S}/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu + + if test -d ${S}/${MACHINE}/altboot-menu/Advanced + then + install -m 0755 ${S}/${MACHINE}/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 -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + fi + fi + + if test -d ${S}/${MACHINE}/altboot.rc + then + install -m 0755 ${S}/${MACHINE}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/${MACHINE}/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_svn.bb b/packages/altboot/altboot_svn.bb index d31c5160a2..d753273fdf 100644 --- a/packages/altboot/altboot_svn.bb +++ b/packages/altboot/altboot_svn.bb @@ -30,7 +30,7 @@ PR = "r0" PACKAGES = "${PN}-conf ${PN}-doc ${PN}" -PACKAGE_ARCH_${PN} = "all" +PACKAGE_ARCH_${PN} = "${MACHINE}" PACKAGE_ARCH_${PN}-doc = "all" PACKAGE_ARCH_${PN}-conf = "${MACHINE}" @@ -51,7 +51,6 @@ do_install() { install -d ${D}/etc/altboot.rc install -d ${D}/usr/share/doc/altboot install -d ${D}/usr/share/sounds - install -d ${D}/etc/skel/altboot if test -d ${S}/${MACHINE} then @@ -62,18 +61,38 @@ do_install() { 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 - install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu - - install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + if test -d ${S}/${MACHINE}/altboot-menu + then + install -m 0755 ${S}/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu + + if test -d ${S}/${MACHINE}/altboot-menu/Advanced + then + install -m 0755 ${S}/${MACHINE}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + fi + else + install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu - install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc + if test -d ${S}/altboot-menu/Advanced + then + install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + fi + fi + + if test -d ${S}/${MACHINE}/altboot.rc + then + install -m 0755 ${S}/${MACHINE}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/${MACHINE}/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 } ###################################################################################### @@ -86,12 +105,16 @@ do_configure() { ###################################################################################### 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 From d872ea5d2c9ed96e72f7cd833e80eaeb599a6cf6 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Fri, 30 Mar 2007 23:28:35 +0000 Subject: altboot: Do no use SRCDATE for snapshots, use SVN revision instead --- packages/altboot/altboot_1.1.1+wip-20070331.bb | 121 ------------------------- packages/altboot/altboot_1.1.1+wip-SVNR25.bb | 120 ++++++++++++++++++++++++ 2 files changed, 120 insertions(+), 121 deletions(-) delete mode 100644 packages/altboot/altboot_1.1.1+wip-20070331.bb create mode 100644 packages/altboot/altboot_1.1.1+wip-SVNR25.bb (limited to 'packages') diff --git a/packages/altboot/altboot_1.1.1+wip-20070331.bb b/packages/altboot/altboot_1.1.1+wip-20070331.bb deleted file mode 100644 index e9754b8dbe..0000000000 --- a/packages/altboot/altboot_1.1.1+wip-20070331.bb +++ /dev/null @@ -1,121 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) -# -# Filename: altboot_1.0.5-rc2.bb -# Date: 21-Feb-06 - -DESCRIPTION = "The altboot bootmanager" -MAINTAINER = "Matthias 'CoreDump' Hentges " -HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" -LICENSE = "GPL" - -###################################################################################### - -RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools" -RRECOMMENDS_${PN}_append_akita = " kexec-tools" -RRECOMMENDS_${PN}_append_spitz = " kexec-tools" -RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools" - -RDEPENDS_${PN} = "${PN}-conf" -RDEPENDS_${PN}-conf = "${PN}" - -###################################################################################### - -SRCDATE="20070331" -PV = "1.1.1+wip-${SRCDATE}" -PR = "r0" - -###################################################################################### - -PACKAGES = "${PN}-conf ${PN}-doc ${PN}" - -PACKAGE_ARCH_${PN} = "${MACHINE}" -PACKAGE_ARCH_${PN}-doc = "all" -PACKAGE_ARCH_${PN}-conf = "${MACHINE}" - -SRC_URI = "svn://hentges.net/altboot;module=trunk;proto=svn" - -S = "${WORKDIR}/trunk/" - -###################################################################################### - -FILES_${PN}-conf = "/etc/altboot*cfg" - -###################################################################################### - -do_install() { - install -d ${D}/sbin - install -d ${D}/etc/altboot-menu - install -d ${D}/etc/altboot-menu/Advanced - install -d ${D}/etc/altboot.rc - install -d ${D}/usr/share/doc/altboot - install -d ${D}/usr/share/sounds - - if test -d ${S}/${MACHINE} - then - install -m 0644 ${S}/${MACHINE}/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}/altboot-menu - then - install -m 0755 ${S}/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu - - if test -d ${S}/${MACHINE}/altboot-menu/Advanced - then - install -m 0755 ${S}/${MACHINE}/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 -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced - fi - fi - - if test -d ${S}/${MACHINE}/altboot.rc - then - install -m 0755 ${S}/${MACHINE}/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${S}/${MACHINE}/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-SVNR25.bb b/packages/altboot/altboot_1.1.1+wip-SVNR25.bb new file mode 100644 index 0000000000..af15f64508 --- /dev/null +++ b/packages/altboot/altboot_1.1.1+wip-SVNR25.bb @@ -0,0 +1,120 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2006 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: altboot_1.0.5-rc2.bb +# Date: 21-Feb-06 + +DESCRIPTION = "The altboot bootmanager" +MAINTAINER = "Matthias 'CoreDump' Hentges " +HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" +LICENSE = "GPL" + +###################################################################################### + +RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools" +RRECOMMENDS_${PN}_append_akita = " kexec-tools" +RRECOMMENDS_${PN}_append_spitz = " kexec-tools" +RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools" + +RDEPENDS_${PN} = "${PN}-conf" +RDEPENDS_${PN}-conf = "${PN}" + +###################################################################################### + +SVN_REV = "25" +PR = "r0" + +###################################################################################### + +PACKAGES = "${PN}-conf ${PN}-doc ${PN}" + +PACKAGE_ARCH_${PN} = "${MACHINE}" +PACKAGE_ARCH_${PN}-doc = "all" +PACKAGE_ARCH_${PN}-conf = "${MACHINE}" + +SRC_URI = "svn://hentges.net/altboot;module=trunk;rev=${SVN_REV}" + +S = "${WORKDIR}/trunk/" + +###################################################################################### + +FILES_${PN}-conf = "/etc/altboot*cfg" + +###################################################################################### + +do_install() { + install -d ${D}/sbin + install -d ${D}/etc/altboot-menu + install -d ${D}/etc/altboot-menu/Advanced + install -d ${D}/etc/altboot.rc + install -d ${D}/usr/share/doc/altboot + install -d ${D}/usr/share/sounds + + if test -d ${S}/${MACHINE} + then + install -m 0644 ${S}/${MACHINE}/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}/altboot-menu + then + install -m 0755 ${S}/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu + + if test -d ${S}/${MACHINE}/altboot-menu/Advanced + then + install -m 0755 ${S}/${MACHINE}/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 -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + fi + fi + + if test -d ${S}/${MACHINE}/altboot.rc + then + install -m 0755 ${S}/${MACHINE}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/${MACHINE}/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 From ff824b1d9d5d2aa031188263d2098b2e35f86189 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 31 Mar 2007 00:31:32 +0000 Subject: glibc 2.5: Fix common case of GNU arrogance, make ldd work on posix shell. * Not bumping PR, to save people trouble. Leaving for decision to OE maintainers. --- packages/glibc/glibc-2.4/ldd-unbash.patch | 11 +++++++++++ packages/glibc/glibc_2.5.bb | 1 + 2 files changed, 12 insertions(+) create mode 100644 packages/glibc/glibc-2.4/ldd-unbash.patch (limited to 'packages') diff --git a/packages/glibc/glibc-2.4/ldd-unbash.patch b/packages/glibc/glibc-2.4/ldd-unbash.patch new file mode 100644 index 0000000000..2fb8854b49 --- /dev/null +++ b/packages/glibc/glibc-2.4/ldd-unbash.patch @@ -0,0 +1,11 @@ +--- glibc-2.5/elf/ldd.bash.in.org 2006-04-30 16:06:20.000000000 +0000 ++++ glibc-2.5/elf/ldd.bash.in 2007-03-30 19:18:57.000000000 +0000 +@@ -110,7 +110,7 @@ + # environments where the executed program might not have permissions + # to write to the console/tty. But only bash 3.x supports the pipefail + # option, and we don't bother to handle the case for older bash versions. +-if set -o pipefail 2> /dev/null; then ++if false; then + try_trace() { + eval $add_env '"$@"' | cat + } diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb index ee137541bb..8cd4c2ecd1 100644 --- a/packages/glibc/glibc_2.5.bb +++ b/packages/glibc/glibc_2.5.bb @@ -56,6 +56,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ # file://glibc-2.4-openat-3.patch;patch=1 \ # file://fixup-aeabi-syscalls.patch;patch=1 \ file://zecke-sane-readelf.patch;patch=1 \ + file://ldd-unbash.patch;patch=1 \ file://generic-bits_select.h \ file://generic-bits_types.h \ file://generic-bits_typesizes.h \ -- cgit v1.2.3 From 2f521a7ff7daacc63bfe2b477e09888dbd544311 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 30 Mar 2007 23:29:22 +0000 Subject: altboot: Allow for multiple machines using the same source config directories. --- packages/altboot/altboot_1.1.1+wip-SVNR25.bb | 23 +++++++++++++---------- packages/altboot/altboot_svn.bb | 23 +++++++++++++---------- 2 files changed, 26 insertions(+), 20 deletions(-) (limited to 'packages') diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR25.bb b/packages/altboot/altboot_1.1.1+wip-SVNR25.bb index af15f64508..e806604616 100644 --- a/packages/altboot/altboot_1.1.1+wip-SVNR25.bb +++ b/packages/altboot/altboot_1.1.1+wip-SVNR25.bb @@ -24,7 +24,7 @@ RDEPENDS_${PN}-conf = "${PN}" ###################################################################################### SVN_REV = "25" -PR = "r0" +PR = "r1" ###################################################################################### @@ -44,6 +44,9 @@ FILES_${PN}-conf = "/etc/altboot*cfg" ###################################################################################### +MACHINE_DIR = "${MACHINE}" +MACHINE_DIR_nslu2be = "nslu2le" + do_install() { install -d ${D}/sbin install -d ${D}/etc/altboot-menu @@ -52,9 +55,9 @@ do_install() { install -d ${D}/usr/share/doc/altboot install -d ${D}/usr/share/sounds - if test -d ${S}/${MACHINE} + if test -d ${S}/${MACHINE_DIR} then - install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc/ + install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/ else install -m 0644 ${S}/altboot*.cfg ${D}/etc/ fi @@ -68,13 +71,13 @@ do_install() { ln -s /sbin/init.altboot ${D}/sbin/altboot - if test -d ${S}/${MACHINE}/altboot-menu + if test -d ${S}/${MACHINE_DIR}/altboot-menu then - install -m 0755 ${S}/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu + install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu - if test -d ${S}/${MACHINE}/altboot-menu/Advanced + if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced then - install -m 0755 ${S}/${MACHINE}/altboot-menu/Advanced/*-* ${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 @@ -85,10 +88,10 @@ do_install() { fi fi - if test -d ${S}/${MACHINE}/altboot.rc + if test -d ${S}/${MACHINE_DIR}/altboot.rc then - install -m 0755 ${S}/${MACHINE}/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${S}/${MACHINE}/altboot.rc/*.txt ${D}/etc/altboot.rc + 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 diff --git a/packages/altboot/altboot_svn.bb b/packages/altboot/altboot_svn.bb index d753273fdf..18f73dd6ae 100644 --- a/packages/altboot/altboot_svn.bb +++ b/packages/altboot/altboot_svn.bb @@ -24,7 +24,7 @@ RDEPENDS_${PN}-conf = "${PN}" ###################################################################################### PV = "1.1.1+wip-${SRCDATE}" -PR = "r0" +PR = "r1" ###################################################################################### @@ -44,6 +44,9 @@ FILES_${PN}-conf = "/etc/altboot*cfg" ###################################################################################### +MACHINE_DIR = "${MACHINE}" +MACHINE_DIR_nslu2be = "nslu2le" + do_install() { install -d ${D}/sbin install -d ${D}/etc/altboot-menu @@ -52,9 +55,9 @@ do_install() { install -d ${D}/usr/share/doc/altboot install -d ${D}/usr/share/sounds - if test -d ${S}/${MACHINE} + if test -d ${S}/${MACHINE_DIR} then - install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc/ + install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/ else install -m 0644 ${S}/altboot*.cfg ${D}/etc/ fi @@ -68,13 +71,13 @@ do_install() { ln -s /sbin/init.altboot ${D}/sbin/altboot - if test -d ${S}/${MACHINE}/altboot-menu + if test -d ${S}/${MACHINE_DIR}/altboot-menu then - install -m 0755 ${S}/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu + install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu - if test -d ${S}/${MACHINE}/altboot-menu/Advanced + if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced then - install -m 0755 ${S}/${MACHINE}/altboot-menu/Advanced/*-* ${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 @@ -85,10 +88,10 @@ do_install() { fi fi - if test -d ${S}/${MACHINE}/altboot.rc + if test -d ${S}/${MACHINE_DIR}/altboot.rc then - install -m 0755 ${S}/${MACHINE}/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${S}/${MACHINE}/altboot.rc/*.txt ${D}/etc/altboot.rc + 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 -- cgit v1.2.3 From 67a237498058d3265957ae84f60c18de7e9e1076 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 31 Mar 2007 09:41:11 +0000 Subject: openmoko-messages: add patch from Marcin to make it build again (OM bug #333) --- packages/openmoko-apps/files/.mtn2git_empty | 0 .../openmoko-apps/files/unbreak-messages.patch | 29 ++++++++++++++++++++++ packages/openmoko-apps/openmoko-messages_svn.bb | 3 ++- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 packages/openmoko-apps/files/.mtn2git_empty create mode 100644 packages/openmoko-apps/files/unbreak-messages.patch (limited to 'packages') diff --git a/packages/openmoko-apps/files/.mtn2git_empty b/packages/openmoko-apps/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/openmoko-apps/files/unbreak-messages.patch b/packages/openmoko-apps/files/unbreak-messages.patch new file mode 100644 index 0000000000..c8d3413c0b --- /dev/null +++ b/packages/openmoko-apps/files/unbreak-messages.patch @@ -0,0 +1,29 @@ +Index: sms-membership-window.c +=================================================================== +--- sms-membership-window.c (wersja 1565) ++++ openmoko-messages/src/sms-membership-window.c (kopia robocza) +@@ -36,9 +36,6 @@ + #define SMS_MEMBERSHIP_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SMS_TYPE_MEMBERSHIP_WINDOW, SmsMembershipWindowPrivate)) + + typedef struct _SmsMembershipWindowPrivate SmsMembershipWindowPrivate; +-typedef gboolean (*GtkTreeModelFilterVisibleFunc) (GtkTreeModel *model, +- GtkTreeIter *iter, +- gpointer data); + + struct _SmsMembershipWindowPrivate + { +Index: main.c +=================================================================== +--- main.c (wersja 1565) ++++ openmoko-messages/src/main.c (kopia robocza) +@@ -41,10 +41,6 @@ + + #include + +-typedef gboolean (*GtkTreeModelFilterVisibleFunc) (GtkTreeModel *model, +- GtkTreeIter *iter, +- gpointer data); +- + gboolean init_dbus (MessengerData* d) + { + DBusError error; diff --git a/packages/openmoko-apps/openmoko-messages_svn.bb b/packages/openmoko-apps/openmoko-messages_svn.bb index 4411b860a1..1547c49d9a 100644 --- a/packages/openmoko-apps/openmoko-messages_svn.bb +++ b/packages/openmoko-apps/openmoko-messages_svn.bb @@ -2,7 +2,8 @@ DESCRIPTION = "The OpenMoko Messaging Application" SECTION = "openmoko/applications" PV = "0.0.1+svn${SRCDATE}" -PR = "r1" +PR = "r2" inherit openmoko +SRC_URI += "file://unbreak-messages.patch;patch=1" -- cgit v1.2.3 From b4a61530aa20a81020170c73936fe2c6b19df5b0 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 31 Mar 2007 11:39:16 +0000 Subject: libsexy: add bugfix release 0.1.11 --- packages/libsexy/libsexy_0.1.11.bb | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 packages/libsexy/libsexy_0.1.11.bb (limited to 'packages') diff --git a/packages/libsexy/libsexy_0.1.11.bb b/packages/libsexy/libsexy_0.1.11.bb new file mode 100644 index 0000000000..042ea757e9 --- /dev/null +++ b/packages/libsexy/libsexy_0.1.11.bb @@ -0,0 +1,2 @@ +require libsexy.inc +PR = "r0" -- cgit v1.2.3