From 04dd5164a7a07d9ca2b07385551f0e1c6a31535b Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 26 Mar 2007 01:06:34 +0000 Subject: task-slugos: Made rng-tools conditional on not uclibc --- packages/tasks/task-slugos.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb index 92820e069c..99b9ea44ae 100644 --- a/packages/tasks/task-slugos.bb +++ b/packages/tasks/task-slugos.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Task packages for the SlugOS distribution" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r5" +PR = "r6" PACKAGE_ARCH = "${MACHINE_ARCH}" ALLOW_EMPTY = "1" @@ -68,9 +68,12 @@ kernel-module-nls-cp437 \ kernel-module-nls-utf8 \ " + # Add daemon required for HW RNG support +SLUGOS_RNG_TOOLS_PACKAGE = "rng-tools" +SLUGOS_RNG_TOOLS_PACKAGE_linux-uclibc = "" SLUGOS_STANDARD_RRECOMMENDS += "\ -rng-tools \ +${SLUGOS_RNG_TOOLS_PACKAGE} \ " # Add modules required for usb support -- cgit v1.2.3 From bc6a7c3e28e23252895ad1a11cd957e0548b1476 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 28 Mar 2007 08:22:53 +0000 Subject: openmoko-keyboard: add openmoko-keyboard recipe based on matchbox-keyboard, and add it to task-openmoko --- packages/openmoko-apps/openmoko-keyboard_svn.bb | 19 +++++++++++++++++++ packages/tasks/task-openmoko.bb | 3 ++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 packages/openmoko-apps/openmoko-keyboard_svn.bb (limited to 'packages') diff --git a/packages/openmoko-apps/openmoko-keyboard_svn.bb b/packages/openmoko-apps/openmoko-keyboard_svn.bb new file mode 100644 index 0000000000..5bf5bbdd6a --- /dev/null +++ b/packages/openmoko-apps/openmoko-keyboard_svn.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Matchbox virtual keyboard for X11 - OpenMoko fork" +LICENSE = "GPL" +DEPENDS = "libfakekey expat libxft" +SECTION = "openmoko/input-methods" +PV = "0.0+svn${SRCDATE}" + +inherit openmoko autotools pkgconfig gettext + +SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/applications;module=${PN};proto=http" + +S = "${WORKDIR}/${PN}" + +EXTRA_OECONF = "--disable-cairo" + +FILES_${PN} = "${bindir}/* \ + ${datadir}/applications \ + ${datadir}/pixmaps \ + ${datadir}/openmoko-keyboard" + diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index dc4c7dcb0f..ece303d62a 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -5,7 +5,7 @@ PACKAGE_ARCH = "all" LICENSE = "MIT" PROVIDES = "task-openmoko-everything" -PR = "r31" +PR = "r32" PACKAGES = "\ task-openmoko-linux \ @@ -141,6 +141,7 @@ DESCRIPTION_task-openmoko-demo = "OpenMoko: Demo Applications" RDEPENDS_task-openmoko-demo = "\ matchbox-desktop \ matchbox-keyboard \ + openmoko-keyboard \ matchbox-stroke \ matchbox-config-gtk \ matchbox-panel-2-applets \ -- cgit v1.2.3 From fa3f91a6bdc75a97b9e562bdee897a979a4417b2 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 08:23:31 +0000 Subject: X11R7.2 preparation: xorg-apps - add individual release support to xorg-app-common.inc - add new X11R7.2 releases (individual release versions) they have smaller versions than anything where PV begins with "X11R7."... but the epoch is set PE="1". Thus the new packages will only be selected by either bitbake with epoch support or by a distro that sets PREFERRED_VERSIONs for X11R7.2. --- packages/xorg-app/appres_1.0.1.bb | 7 +++++++ packages/xorg-app/bdftopcf_1.0.1.bb | 7 +++++++ packages/xorg-app/beforelight_1.0.2.bb | 7 +++++++ packages/xorg-app/editres_1.0.2.bb | 7 +++++++ packages/xorg-app/fonttosfnt_1.0.3.bb | 7 +++++++ packages/xorg-app/luit_1.0.2.bb | 7 +++++++ packages/xorg-app/sessreg_1.0.2.bb | 7 +++++++ packages/xorg-app/setxkbmap_1.0.3.bb | 7 +++++++ packages/xorg-app/twm_1.0.3.bb | 11 +++++++++++ packages/xorg-app/xauth_1.0.2.bb | 7 +++++++ packages/xorg-app/xdbedizzy_1.0.2.bb | 7 +++++++ packages/xorg-app/xdm_1.1.3.bb | 8 ++++++++ packages/xorg-app/xf86dga_1.0.2.bb | 7 +++++++ packages/xorg-app/xfs_1.0.4.bb | 7 +++++++ packages/xorg-app/xinit_1.0.3.bb | 8 ++++++++ packages/xorg-app/xmodmap_1.0.2.bb | 8 ++++++++ packages/xorg-app/xorg-app-common.inc | 3 ++- packages/xorg-app/xprop_1.0.2.bb | 7 +++++++ 18 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 packages/xorg-app/appres_1.0.1.bb create mode 100644 packages/xorg-app/bdftopcf_1.0.1.bb create mode 100644 packages/xorg-app/beforelight_1.0.2.bb create mode 100644 packages/xorg-app/editres_1.0.2.bb create mode 100644 packages/xorg-app/fonttosfnt_1.0.3.bb create mode 100644 packages/xorg-app/luit_1.0.2.bb create mode 100644 packages/xorg-app/sessreg_1.0.2.bb create mode 100644 packages/xorg-app/setxkbmap_1.0.3.bb create mode 100644 packages/xorg-app/twm_1.0.3.bb create mode 100644 packages/xorg-app/xauth_1.0.2.bb create mode 100644 packages/xorg-app/xdbedizzy_1.0.2.bb create mode 100644 packages/xorg-app/xdm_1.1.3.bb create mode 100644 packages/xorg-app/xf86dga_1.0.2.bb create mode 100644 packages/xorg-app/xfs_1.0.4.bb create mode 100644 packages/xorg-app/xinit_1.0.3.bb create mode 100644 packages/xorg-app/xmodmap_1.0.2.bb create mode 100644 packages/xorg-app/xprop_1.0.2.bb (limited to 'packages') diff --git a/packages/xorg-app/appres_1.0.1.bb b/packages/xorg-app/appres_1.0.1.bb new file mode 100644 index 0000000000..4b6447a82e --- /dev/null +++ b/packages/xorg-app/appres_1.0.1.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "The appres program prints the resources seen by an application." + +DEPENDS += " virtual/libx11 libxt" + diff --git a/packages/xorg-app/bdftopcf_1.0.1.bb b/packages/xorg-app/bdftopcf_1.0.1.bb new file mode 100644 index 0000000000..c3e6ad2136 --- /dev/null +++ b/packages/xorg-app/bdftopcf_1.0.1.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "bdftopcf is a font compiler for the X server and font server." + +DEPENDS += " libxfont" + diff --git a/packages/xorg-app/beforelight_1.0.2.bb b/packages/xorg-app/beforelight_1.0.2.bb new file mode 100644 index 0000000000..a83c84eb79 --- /dev/null +++ b/packages/xorg-app/beforelight_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxscrnsaver libxt libxaw libxt" + diff --git a/packages/xorg-app/editres_1.0.2.bb b/packages/xorg-app/editres_1.0.2.bb new file mode 100644 index 0000000000..e5bf19bd71 --- /dev/null +++ b/packages/xorg-app/editres_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxt libxmu libxaw" + diff --git a/packages/xorg-app/fonttosfnt_1.0.3.bb b/packages/xorg-app/fonttosfnt_1.0.3.bb new file mode 100644 index 0000000000..8b7d7be108 --- /dev/null +++ b/packages/xorg-app/fonttosfnt_1.0.3.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xproto freetype libfontenc" + diff --git a/packages/xorg-app/luit_1.0.2.bb b/packages/xorg-app/luit_1.0.2.bb new file mode 100644 index 0000000000..67fc3266ae --- /dev/null +++ b/packages/xorg-app/luit_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " zlib zlib virtual/libx11 libfontenc" + diff --git a/packages/xorg-app/sessreg_1.0.2.bb b/packages/xorg-app/sessreg_1.0.2.bb new file mode 100644 index 0000000000..dc281b41b0 --- /dev/null +++ b/packages/xorg-app/sessreg_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11" + diff --git a/packages/xorg-app/setxkbmap_1.0.3.bb b/packages/xorg-app/setxkbmap_1.0.3.bb new file mode 100644 index 0000000000..9b97cf437a --- /dev/null +++ b/packages/xorg-app/setxkbmap_1.0.3.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " libxkbfile virtual/libx11" + diff --git a/packages/xorg-app/twm_1.0.3.bb b/packages/xorg-app/twm_1.0.3.bb new file mode 100644 index 0000000000..b8e75b2bbd --- /dev/null +++ b/packages/xorg-app/twm_1.0.3.bb @@ -0,0 +1,11 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "tiny window manager" + +DEPENDS += " virtual/libx11 libxext libxt libxmu" + +ALTERNATIVE_PATH = "${bindir}/twm" +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PRIORITY = "1" diff --git a/packages/xorg-app/xauth_1.0.2.bb b/packages/xorg-app/xauth_1.0.2.bb new file mode 100644 index 0000000000..45aaafb1ce --- /dev/null +++ b/packages/xorg-app/xauth_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxau libxext libxmu" + diff --git a/packages/xorg-app/xdbedizzy_1.0.2.bb b/packages/xorg-app/xdbedizzy_1.0.2.bb new file mode 100644 index 0000000000..43d5a4bbb8 --- /dev/null +++ b/packages/xorg-app/xdbedizzy_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " libxp libxprintutil libxp libxau libxext" + diff --git a/packages/xorg-app/xdm_1.1.3.bb b/packages/xorg-app/xdm_1.1.3.bb new file mode 100644 index 0000000000..7b4195e3d8 --- /dev/null +++ b/packages/xorg-app/xdm_1.1.3.bb @@ -0,0 +1,8 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "X display manager" + +DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 libxext libxdmcp libxt" + +EXTRA_OECONF += " --with-random-device=/dev/urandom" diff --git a/packages/xorg-app/xf86dga_1.0.2.bb b/packages/xorg-app/xf86dga_1.0.2.bb new file mode 100644 index 0000000000..462797a68d --- /dev/null +++ b/packages/xorg-app/xf86dga_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxxf86dga libxt libxaw libxmu" + diff --git a/packages/xorg-app/xfs_1.0.4.bb b/packages/xorg-app/xfs_1.0.4.bb new file mode 100644 index 0000000000..b6db0f9b81 --- /dev/null +++ b/packages/xorg-app/xfs_1.0.4.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "X fontserver" + +DEPENDS += " libfs libxfont xtrans" + diff --git a/packages/xorg-app/xinit_1.0.3.bb b/packages/xorg-app/xinit_1.0.3.bb new file mode 100644 index 0000000000..155bfc7c43 --- /dev/null +++ b/packages/xorg-app/xinit_1.0.3.bb @@ -0,0 +1,8 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11" +FILES_${PN} += " /usr/lib/X11/xinit" + diff --git a/packages/xorg-app/xmodmap_1.0.2.bb b/packages/xorg-app/xmodmap_1.0.2.bb new file mode 100644 index 0000000000..b934ebfa48 --- /dev/null +++ b/packages/xorg-app/xmodmap_1.0.2.bb @@ -0,0 +1,8 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X" +LICENSE = "MIT" + +DEPENDS += " virtual/libx11" + diff --git a/packages/xorg-app/xorg-app-common.inc b/packages/xorg-app/xorg-app-common.inc index b2a73f9ca8..15f76ab5e2 100644 --- a/packages/xorg-app/xorg-app-common.inc +++ b/packages/xorg-app/xorg-app-common.inc @@ -5,7 +5,8 @@ LICENSE = "MIT-X" #DEPENDS = "" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/app/${XORG_PN}-${PV}.tar.bz2" +XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/app/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" FILES_${PN} += " /usr/lib/X11/${XORG_PN}" diff --git a/packages/xorg-app/xprop_1.0.2.bb b/packages/xorg-app/xprop_1.0.2.bb new file mode 100644 index 0000000000..8623021717 --- /dev/null +++ b/packages/xorg-app/xprop_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " libxmu virtual/libx11" + -- cgit v1.2.3 From 2ed8a4553687b1708ec50794360237761640f8e4 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 08:29:34 +0000 Subject: X11R7.2 preparation: xorg-doc - add individual release support to xorg-doc-common.inc - add new X11R7.2 release (individual release version) of xorg-sgml-doctools --- packages/xorg-doc/xorg-doc-common.inc | 3 ++- packages/xorg-doc/xorg-sgml-doctools_1.1.1.bb | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 packages/xorg-doc/xorg-sgml-doctools_1.1.1.bb (limited to 'packages') diff --git a/packages/xorg-doc/xorg-doc-common.inc b/packages/xorg-doc/xorg-doc-common.inc index de47e60df1..4c3d6e8987 100644 --- a/packages/xorg-doc/xorg-doc-common.inc +++ b/packages/xorg-doc/xorg-doc-common.inc @@ -5,7 +5,8 @@ LICENSE = "MIT-X" #DEPENDS = "" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/doc/${XORG_PN}-${PV}.tar.bz2" +XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/doc/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig diff --git a/packages/xorg-doc/xorg-sgml-doctools_1.1.1.bb b/packages/xorg-doc/xorg-sgml-doctools_1.1.1.bb new file mode 100644 index 0000000000..18a3ef964a --- /dev/null +++ b/packages/xorg-doc/xorg-sgml-doctools_1.1.1.bb @@ -0,0 +1,8 @@ +require xorg-doc-common.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " + +FILES_${PN} += " /usr/share/X11/sgml" -- cgit v1.2.3 From ee75ba0da96d14917b86a37af7d680baf23bbcbe Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 08:44:43 +0000 Subject: remove non-existant bdftopcf 1.0.1 --- packages/xorg-app/bdftopcf_1.0.1.bb | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 packages/xorg-app/bdftopcf_1.0.1.bb (limited to 'packages') diff --git a/packages/xorg-app/bdftopcf_1.0.1.bb b/packages/xorg-app/bdftopcf_1.0.1.bb deleted file mode 100644 index c3e6ad2136..0000000000 --- a/packages/xorg-app/bdftopcf_1.0.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-app-common.inc -PE = "1" - -DESCRIPTION = "bdftopcf is a font compiler for the X server and font server." - -DEPENDS += " libxfont" - -- cgit v1.2.3 From bab81fec328ef6838db19cc2795bddd561f51fef Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 09:05:48 +0000 Subject: X11R7.2 preparation: xorg-driver - add individual release support to xorg-driver-common.inc - add new X11R7.2 releases (individual release versions) --- packages/xorg-driver/xf86-input-keyboard_1.1.1.bb | 7 +++++++ packages/xorg-driver/xf86-input-mouse_1.1.2.bb | 7 +++++++ packages/xorg-driver/xf86-input-penmount_1.2.0.bb | 7 +++++++ packages/xorg-driver/xf86-video-ati_6.6.3.bb | 6 ++++++ packages/xorg-driver/xf86-video-fbdev_0.3.1.bb | 6 ++++++ packages/xorg-driver/xf86-video-i128_1.1.0.6.bb | 6 ++++++ packages/xorg-driver/xf86-video-i810_1.6.5.bb | 7 +++++++ packages/xorg-driver/xf86-video-newport_0.2.1.bb | 7 +++++++ packages/xorg-driver/xf86-video-nsc_2.8.2.bb | 7 +++++++ packages/xorg-driver/xf86-video-nv_1.2.2.1.bb | 6 ++++++ packages/xorg-driver/xf86-video-rendition_4.1.3.bb | 6 ++++++ packages/xorg-driver/xf86-video-s3_0.5.0.bb | 6 ++++++ packages/xorg-driver/xf86-video-savage_2.1.2.bb | 6 ++++++ packages/xorg-driver/xf86-video-sis_0.9.3.bb | 7 +++++++ packages/xorg-driver/xf86-video-tdfx_1.3.0.bb | 6 ++++++ packages/xorg-driver/xf86-video-trident_1.2.3.bb | 6 ++++++ packages/xorg-driver/xf86-video-tseng_1.1.1.bb | 6 ++++++ packages/xorg-driver/xf86-video-vesa_1.3.0.bb | 8 ++++++++ packages/xorg-driver/xf86-video-via_0.2.2.bb | 6 ++++++ packages/xorg-driver/xf86-video-vmware_10.14.1.bb | 6 ++++++ packages/xorg-driver/xf86-video-voodoo_1.1.1.bb | 6 ++++++ packages/xorg-driver/xorg-driver-common.inc | 3 ++- 22 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 packages/xorg-driver/xf86-input-keyboard_1.1.1.bb create mode 100644 packages/xorg-driver/xf86-input-mouse_1.1.2.bb create mode 100644 packages/xorg-driver/xf86-input-penmount_1.2.0.bb create mode 100644 packages/xorg-driver/xf86-video-ati_6.6.3.bb create mode 100644 packages/xorg-driver/xf86-video-fbdev_0.3.1.bb create mode 100644 packages/xorg-driver/xf86-video-i128_1.1.0.6.bb create mode 100644 packages/xorg-driver/xf86-video-i810_1.6.5.bb create mode 100644 packages/xorg-driver/xf86-video-newport_0.2.1.bb create mode 100644 packages/xorg-driver/xf86-video-nsc_2.8.2.bb create mode 100644 packages/xorg-driver/xf86-video-nv_1.2.2.1.bb create mode 100644 packages/xorg-driver/xf86-video-rendition_4.1.3.bb create mode 100644 packages/xorg-driver/xf86-video-s3_0.5.0.bb create mode 100644 packages/xorg-driver/xf86-video-savage_2.1.2.bb create mode 100644 packages/xorg-driver/xf86-video-sis_0.9.3.bb create mode 100644 packages/xorg-driver/xf86-video-tdfx_1.3.0.bb create mode 100644 packages/xorg-driver/xf86-video-trident_1.2.3.bb create mode 100644 packages/xorg-driver/xf86-video-tseng_1.1.1.bb create mode 100644 packages/xorg-driver/xf86-video-vesa_1.3.0.bb create mode 100644 packages/xorg-driver/xf86-video-via_0.2.2.bb create mode 100644 packages/xorg-driver/xf86-video-vmware_10.14.1.bb create mode 100644 packages/xorg-driver/xf86-video-voodoo_1.1.1.bb (limited to 'packages') diff --git a/packages/xorg-driver/xf86-input-keyboard_1.1.1.bb b/packages/xorg-driver/xf86-input-keyboard_1.1.1.bb new file mode 100644 index 0000000000..b4ef6c683e --- /dev/null +++ b/packages/xorg-driver/xf86-input-keyboard_1.1.1.bb @@ -0,0 +1,7 @@ +require xorg-driver-input.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " kbproto" + diff --git a/packages/xorg-driver/xf86-input-mouse_1.1.2.bb b/packages/xorg-driver/xf86-input-mouse_1.1.2.bb new file mode 100644 index 0000000000..eb464ad5a6 --- /dev/null +++ b/packages/xorg-driver/xf86-input-mouse_1.1.2.bb @@ -0,0 +1,7 @@ +require xorg-driver-input.inc +PE = "1" + +DESCRIPTION = "Mouse Support in X11" + +#DEPENDS += " " + diff --git a/packages/xorg-driver/xf86-input-penmount_1.2.0.bb b/packages/xorg-driver/xf86-input-penmount_1.2.0.bb new file mode 100644 index 0000000000..f6032bceaa --- /dev/null +++ b/packages/xorg-driver/xf86-input-penmount_1.2.0.bb @@ -0,0 +1,7 @@ +require xorg-driver-input.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " + diff --git a/packages/xorg-driver/xf86-video-ati_6.6.3.bb b/packages/xorg-driver/xf86-video-ati_6.6.3.bb new file mode 100644 index 0000000000..994b8b6a3c --- /dev/null +++ b/packages/xorg-driver/xf86-video-ati_6.6.3.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" diff --git a/packages/xorg-driver/xf86-video-fbdev_0.3.1.bb b/packages/xorg-driver/xf86-video-fbdev_0.3.1.bb new file mode 100644 index 0000000000..843aa707b7 --- /dev/null +++ b/packages/xorg-driver/xf86-video-fbdev_0.3.1.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-i128_1.1.0.6.bb b/packages/xorg-driver/xf86-video-i128_1.1.0.6.bb new file mode 100644 index 0000000000..89cedc8b1a --- /dev/null +++ b/packages/xorg-driver/xf86-video-i128_1.1.0.6.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "Number Nine I128 for X11" + +#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-i810_1.6.5.bb b/packages/xorg-driver/xf86-video-i810_1.6.5.bb new file mode 100644 index 0000000000..198985f247 --- /dev/null +++ b/packages/xorg-driver/xf86-video-i810_1.6.5.bb @@ -0,0 +1,7 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "I810 for X11" + +DEPENDS += " virtual/libx11 libxvmc drm xf86driproto" + diff --git a/packages/xorg-driver/xf86-video-newport_0.2.1.bb b/packages/xorg-driver/xf86-video-newport_0.2.1.bb new file mode 100644 index 0000000000..b9f88fcc6f --- /dev/null +++ b/packages/xorg-driver/xf86-video-newport_0.2.1.bb @@ -0,0 +1,7 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "This is an unaccelerated driver for the SGI newport cards." + +#DEPENDS += " " + diff --git a/packages/xorg-driver/xf86-video-nsc_2.8.2.bb b/packages/xorg-driver/xf86-video-nsc_2.8.2.bb new file mode 100644 index 0000000000..9fc4277ad8 --- /dev/null +++ b/packages/xorg-driver/xf86-video-nsc_2.8.2.bb @@ -0,0 +1,7 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xf86dgaproto" + diff --git a/packages/xorg-driver/xf86-video-nv_1.2.2.1.bb b/packages/xorg-driver/xf86-video-nv_1.2.2.1.bb new file mode 100644 index 0000000000..843aa707b7 --- /dev/null +++ b/packages/xorg-driver/xf86-video-nv_1.2.2.1.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-rendition_4.1.3.bb b/packages/xorg-driver/xf86-video-rendition_4.1.3.bb new file mode 100644 index 0000000000..e6c89a8c74 --- /dev/null +++ b/packages/xorg-driver/xf86-video-rendition_4.1.3.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "X11 driver supporting cards based on the V1000 or the V2x00." + +#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-s3_0.5.0.bb b/packages/xorg-driver/xf86-video-s3_0.5.0.bb new file mode 100644 index 0000000000..843aa707b7 --- /dev/null +++ b/packages/xorg-driver/xf86-video-s3_0.5.0.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-savage_2.1.2.bb b/packages/xorg-driver/xf86-video-savage_2.1.2.bb new file mode 100644 index 0000000000..999b319b23 --- /dev/null +++ b/packages/xorg-driver/xf86-video-savage_2.1.2.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " drm xf86driproto" diff --git a/packages/xorg-driver/xf86-video-sis_0.9.3.bb b/packages/xorg-driver/xf86-video-sis_0.9.3.bb new file mode 100644 index 0000000000..ab53a64646 --- /dev/null +++ b/packages/xorg-driver/xf86-video-sis_0.9.3.bb @@ -0,0 +1,7 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xineramaproto xf86miscproto xf86dgaproto drm xf86driproto" + diff --git a/packages/xorg-driver/xf86-video-tdfx_1.3.0.bb b/packages/xorg-driver/xf86-video-tdfx_1.3.0.bb new file mode 100644 index 0000000000..999b319b23 --- /dev/null +++ b/packages/xorg-driver/xf86-video-tdfx_1.3.0.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " drm xf86driproto" diff --git a/packages/xorg-driver/xf86-video-trident_1.2.3.bb b/packages/xorg-driver/xf86-video-trident_1.2.3.bb new file mode 100644 index 0000000000..065e64dfb1 --- /dev/null +++ b/packages/xorg-driver/xf86-video-trident_1.2.3.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xf86dgaproto" diff --git a/packages/xorg-driver/xf86-video-tseng_1.1.1.bb b/packages/xorg-driver/xf86-video-tseng_1.1.1.bb new file mode 100644 index 0000000000..843aa707b7 --- /dev/null +++ b/packages/xorg-driver/xf86-video-tseng_1.1.1.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-vesa_1.3.0.bb b/packages/xorg-driver/xf86-video-vesa_1.3.0.bb new file mode 100644 index 0000000000..1e6760c3dc --- /dev/null +++ b/packages/xorg-driver/xf86-video-vesa_1.3.0.bb @@ -0,0 +1,8 @@ +require xorg-driver-video.inc +PE = "1" + +SRC_URI += "file://fix-includepath.patch;patch=1" + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-via_0.2.2.bb b/packages/xorg-driver/xf86-video-via_0.2.2.bb new file mode 100644 index 0000000000..a3ce7324c3 --- /dev/null +++ b/packages/xorg-driver/xf86-video-via_0.2.2.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " drm xf86driproto libxvmc" diff --git a/packages/xorg-driver/xf86-video-vmware_10.14.1.bb b/packages/xorg-driver/xf86-video-vmware_10.14.1.bb new file mode 100644 index 0000000000..c8169407cb --- /dev/null +++ b/packages/xorg-driver/xf86-video-vmware_10.14.1.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "X11 driver for VMware SVGA Device" + +#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-voodoo_1.1.1.bb b/packages/xorg-driver/xf86-video-voodoo_1.1.1.bb new file mode 100644 index 0000000000..bfceb2995c --- /dev/null +++ b/packages/xorg-driver/xf86-video-voodoo_1.1.1.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "X11 driver for Voodoo/Voodoo2" + +DEPENDS += " xf86dgaproto" diff --git a/packages/xorg-driver/xorg-driver-common.inc b/packages/xorg-driver/xorg-driver-common.inc index ae85f602f0..8053e6c236 100644 --- a/packages/xorg-driver/xorg-driver-common.inc +++ b/packages/xorg-driver/xorg-driver-common.inc @@ -7,7 +7,8 @@ PR = "r1" DEPENDS = "randrproto xorg-server xproto" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/driver/${XORG_PN}-${PV}.tar.bz2" +XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/driver/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" -- cgit v1.2.3 From 90f4b2907d7755fb16f89d4184202b8278ff2cfd Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 09:11:50 +0000 Subject: X11R7.2 preparation: xorg-font - add individual release support to xorg-font-common.inc - add new X11R7.2 releases (individual release versions) --- packages/xorg-font/encodings_1.0.2.bb | 8 ++++++++ packages/xorg-font/xorg-font-common.inc | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 packages/xorg-font/encodings_1.0.2.bb (limited to 'packages') diff --git a/packages/xorg-font/encodings_1.0.2.bb b/packages/xorg-font/encodings_1.0.2.bb new file mode 100644 index 0000000000..da67d037aa --- /dev/null +++ b/packages/xorg-font/encodings_1.0.2.bb @@ -0,0 +1,8 @@ +require xorg-font-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS = "mkfontscale-native" +RDEPENDS = "" + diff --git a/packages/xorg-font/xorg-font-common.inc b/packages/xorg-font/xorg-font-common.inc index 137ee0917f..148437a3e3 100644 --- a/packages/xorg-font/xorg-font-common.inc +++ b/packages/xorg-font/xorg-font-common.inc @@ -6,7 +6,8 @@ DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-n RDEPENDS = "encodings font-util font-alias" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/font/${XORG_PN}-${PV}.tar.bz2" +XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/font/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig -- cgit v1.2.3 From 2fbac633f4f49ee742e8ff18a788ed6bb2031749 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 09:24:20 +0000 Subject: avahi: add scripts to start avahi-autoipd from udhcpc --- packages/avahi/avahi.inc | 28 ++++++++++++++++++++++++++-- packages/avahi/files/.mtn2git_empty | 0 packages/avahi/files/00avahi-autoipd | 10 ++++++++++ packages/avahi/files/99avahi-autoipd | 10 ++++++++++ 4 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 packages/avahi/files/.mtn2git_empty create mode 100755 packages/avahi/files/00avahi-autoipd create mode 100755 packages/avahi/files/99avahi-autoipd (limited to 'packages') diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc index 3a0b28cc53..fb71361a1d 100644 --- a/packages/avahi/avahi.inc +++ b/packages/avahi/avahi.inc @@ -4,12 +4,14 @@ HOMEPAGE = "http://avahi.org" SECTION = "network" PRIORITY = "optional" LICENSE = "GPL" +PR="r1" DEPENDS = "expat libdaemon dbus glib-2.0" RRECOMMENDS = "libnss-mdns" RRECOMMENDS_avahi-daemon = "libnss-mdns" -SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz" +SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ + file://00avahi-autoipd file://99avahi-autoipd" inherit autotools pkgconfig update-rc.d @@ -35,7 +37,8 @@ FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \ FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" FILES_avahi-utils = "${bindir}/avahi-*" FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ - ${sysconfdir}/avahi/avahi-autoipd.action" + ${sysconfdir}/avahi/avahi-autoipd.action \ + ${sysconfdir}/udhcpc.d/*avahi-autoipd" CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" @@ -62,11 +65,32 @@ pkg_postinst_avahi-daemon () { fi } +pkg_postinst_avahi-autoipd () { + # can't do this offline + if [ "x$D" != "x" ]; then + exit 1 + fi + grep avahi-autoipd /etc/group || addgroup avahi-autoipd + grep avahi-autoipd /etc/passwd || adduser --disabled-password --system --home /var/lib/avahi-autoipd --no-create-home avahi-autoipd --ingroup avahi-autoipd -g "Avahi autoip daemon" +} + pkg_postrm_avahi-daemon () { deluser avahi || true delgroup avahi || true } +pkg_postrm_avahi-autoipd () { + deluser avahi-autoipd || true + delgroup avahi-autoipd || true +} + +do_install() { + autotools_do_install + install -d ${D}${sysconfdir}/udhcpc.d + install ${WORKDIR}/00avahi-autoipd ${D}${sysconfdir}/udhcpc.d + install ${WORKDIR}/99avahi-autoipd ${D}${sysconfdir}/udhcpc.d +} + do_stage() { autotools_stage_all } diff --git a/packages/avahi/files/.mtn2git_empty b/packages/avahi/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/avahi/files/00avahi-autoipd b/packages/avahi/files/00avahi-autoipd new file mode 100755 index 0000000000..a0ab814603 --- /dev/null +++ b/packages/avahi/files/00avahi-autoipd @@ -0,0 +1,10 @@ +#!/bin/sh + +[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 + +case "$1" in + + deconfig|renew|bound) + /usr/sbin/avahi-autoipd -k $interface 2> /dev/null + ;; +esac diff --git a/packages/avahi/files/99avahi-autoipd b/packages/avahi/files/99avahi-autoipd new file mode 100755 index 0000000000..234cdaa3eb --- /dev/null +++ b/packages/avahi/files/99avahi-autoipd @@ -0,0 +1,10 @@ +#!/bin/sh + +[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 + +case "$1" in + + leasefail) + /usr/sbin/avahi-autoipd -wD $interface 2> /dev/null + ;; +esac -- cgit v1.2.3 From 779bdbe42f923c547512fd05bf0925c20f540ade Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 09:48:42 +0000 Subject: X11R7.2 preparation: xorg-lib - add individual release support to xorg-lib-common.inc - add new X11R7.2 releases (individual release versions) --- packages/xorg-lib/diet-x11_1.1.1.bb | 11 +++++++++++ packages/xorg-lib/libfontenc_1.0.4.bb | 9 +++++++++ packages/xorg-lib/libsm_1.0.2.bb | 10 ++++++++++ packages/xorg-lib/libx11_1.1.1.bb | 24 ++++++++++++++++++++++++ packages/xorg-lib/libxau_1.0.3.bb | 11 +++++++++++ packages/xorg-lib/libxcomposite_0.3.1.bb | 12 ++++++++++++ packages/xorg-lib/libxcursor_1.1.8.bb | 11 +++++++++++ packages/xorg-lib/libxdamage_1.0.4.bb | 11 +++++++++++ packages/xorg-lib/libxdmcp-native_1.0.2.bb | 11 +++++++++++ packages/xorg-lib/libxdmcp_1.0.2.bb | 11 +++++++++++ packages/xorg-lib/libxevie_1.0.2.bb | 9 +++++++++ packages/xorg-lib/libxext_1.0.2.bb | 11 +++++++++++ packages/xorg-lib/libxfixes_4.0.3.bb | 10 ++++++++++ packages/xorg-lib/libxfont_1.2.7.bb | 14 ++++++++++++++ packages/xorg-lib/libxfontcache_1.0.4.bb | 9 +++++++++ packages/xorg-lib/libxi_1.0.2.bb | 9 +++++++++ packages/xorg-lib/libxkbfile_1.0.4.bb | 9 +++++++++ packages/xorg-lib/libxmu_1.0.3.bb | 17 +++++++++++++++++ packages/xorg-lib/libxpm_3.5.6.bb | 14 ++++++++++++++ packages/xorg-lib/libxrandr_1.1.2.bb | 10 ++++++++++ packages/xorg-lib/libxrender_0.9.2.bb | 10 ++++++++++ packages/xorg-lib/libxres_1.0.3.bb | 9 +++++++++ packages/xorg-lib/libxscrnsaver_1.1.2.bb | 14 ++++++++++++++ packages/xorg-lib/libxt_1.0.4.bb | 20 ++++++++++++++++++++ packages/xorg-lib/libxvmc_1.0.4.bb | 9 +++++++++ packages/xorg-lib/xorg-lib-common.inc | 3 ++- packages/xorg-lib/xtrans_1.0.3.bb | 9 +++++++++ 27 files changed, 306 insertions(+), 1 deletion(-) create mode 100644 packages/xorg-lib/diet-x11_1.1.1.bb create mode 100644 packages/xorg-lib/libfontenc_1.0.4.bb create mode 100644 packages/xorg-lib/libsm_1.0.2.bb create mode 100644 packages/xorg-lib/libx11_1.1.1.bb create mode 100644 packages/xorg-lib/libxau_1.0.3.bb create mode 100644 packages/xorg-lib/libxcomposite_0.3.1.bb create mode 100644 packages/xorg-lib/libxcursor_1.1.8.bb create mode 100644 packages/xorg-lib/libxdamage_1.0.4.bb create mode 100644 packages/xorg-lib/libxdmcp-native_1.0.2.bb create mode 100644 packages/xorg-lib/libxdmcp_1.0.2.bb create mode 100644 packages/xorg-lib/libxevie_1.0.2.bb create mode 100644 packages/xorg-lib/libxext_1.0.2.bb create mode 100644 packages/xorg-lib/libxfixes_4.0.3.bb create mode 100644 packages/xorg-lib/libxfont_1.2.7.bb create mode 100644 packages/xorg-lib/libxfontcache_1.0.4.bb create mode 100644 packages/xorg-lib/libxi_1.0.2.bb create mode 100644 packages/xorg-lib/libxkbfile_1.0.4.bb create mode 100644 packages/xorg-lib/libxmu_1.0.3.bb create mode 100644 packages/xorg-lib/libxpm_3.5.6.bb create mode 100644 packages/xorg-lib/libxrandr_1.1.2.bb create mode 100644 packages/xorg-lib/libxrender_0.9.2.bb create mode 100644 packages/xorg-lib/libxres_1.0.3.bb create mode 100644 packages/xorg-lib/libxscrnsaver_1.1.2.bb create mode 100644 packages/xorg-lib/libxt_1.0.4.bb create mode 100644 packages/xorg-lib/libxvmc_1.0.4.bb create mode 100644 packages/xorg-lib/xtrans_1.0.3.bb (limited to 'packages') diff --git a/packages/xorg-lib/diet-x11_1.1.1.bb b/packages/xorg-lib/diet-x11_1.1.1.bb new file mode 100644 index 0000000000..8dc3174a16 --- /dev/null +++ b/packages/xorg-lib/diet-x11_1.1.1.bb @@ -0,0 +1,11 @@ +SECTION = "x11/base" +require libx11_${PV}.bb + +EXTRA_OECONF += "--disable-udc --enable-xcms --disable-xlocale --disable-xkb" +CFLAGS += "-D_GNU_SOURCE" + +SRC_URI += "file://X18NCMSstubs.diff;patch=1 \ + file://fix-disable-xlocale.diff;patch=1 \ + file://fix-utf8-wrong-define.patch;patch=1 \ + file://xim.patch;patch=1 \ + file://xchar2b.patch;patch=1" diff --git a/packages/xorg-lib/libfontenc_1.0.4.bb b/packages/xorg-lib/libfontenc_1.0.4.bb new file mode 100644 index 0000000000..afb7ffe10e --- /dev/null +++ b/packages/xorg-lib/libfontenc_1.0.4.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X fontenc library (used by libxfont)." +LICENSE = "BSD-X" +PRIORITY = "optional" + +DEPENDS += " zlib xproto" + diff --git a/packages/xorg-lib/libsm_1.0.2.bb b/packages/xorg-lib/libsm_1.0.2.bb new file mode 100644 index 0000000000..e5113dfc76 --- /dev/null +++ b/packages/xorg-lib/libsm_1.0.2.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "Session management library" +PRIORITY = "optional" + +DEPENDS += " libice xproto xtrans" + +XORG_PN = "libSM" + diff --git a/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb new file mode 100644 index 0000000000..de47042dc4 --- /dev/null +++ b/packages/xorg-lib/libx11_1.1.1.bb @@ -0,0 +1,24 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "Base X libs." +SRC_URI += "file://makekeys.diff;patch=1" + +DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ + libxdmcp xf86bigfontproto kbproto inputproto" +PROVIDES = "virtual/libx11" +RPROVIDES = "virtual/libx11" + +XORG_PN = "libX11" + +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" +FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" + +do_compile() { + ( + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys + ) || exit 1 + rm -f ${STAGING_INCDIR}/X11/Xlib.h + oe_runmake +} diff --git a/packages/xorg-lib/libxau_1.0.3.bb b/packages/xorg-lib/libxau_1.0.3.bb new file mode 100644 index 0000000000..dcde9b4da2 --- /dev/null +++ b/packages/xorg-lib/libxau_1.0.3.bb @@ -0,0 +1,11 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "A Sample Authorization Protocol for X" +PRIORITY = "optional" + +DEPENDS += " xproto" +PROVIDES = "xau" + +XORG_PN = "libXau" + diff --git a/packages/xorg-lib/libxcomposite_0.3.1.bb b/packages/xorg-lib/libxcomposite_0.3.1.bb new file mode 100644 index 0000000000..71842d4a4d --- /dev/null +++ b/packages/xorg-lib/libxcomposite_0.3.1.bb @@ -0,0 +1,12 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Composite extension library." +LICENSE= "BSD-X" + +DEPENDS += " compositeproto virtual/libx11 libxfixes" +PROVIDES = "xcomposite" + +XORG_PN = "libXcomposite" + +SRC_URI += " file://change-include-order.patch;patch=1" diff --git a/packages/xorg-lib/libxcursor_1.1.8.bb b/packages/xorg-lib/libxcursor_1.1.8.bb new file mode 100644 index 0000000000..bf795757f6 --- /dev/null +++ b/packages/xorg-lib/libxcursor_1.1.8.bb @@ -0,0 +1,11 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Cursor library" +LICENSE= "BSD-X" + +DEPENDS += " libxrender libxfixes virtual/libx11 fixesproto" + +XORG_PN = "libXcursor" + +FILES_${PN} += "${libdir}/libXcursor.so" diff --git a/packages/xorg-lib/libxdamage_1.0.4.bb b/packages/xorg-lib/libxdamage_1.0.4.bb new file mode 100644 index 0000000000..dd6fc42df6 --- /dev/null +++ b/packages/xorg-lib/libxdamage_1.0.4.bb @@ -0,0 +1,11 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Damage extension library." +LICENSE= "BSD-X" + +DEPENDS += " virtual/libx11 damageproto libxfixes fixesproto xextproto" +PROVIDES = "xdamage" + +XORG_PN = "libXdamage" + diff --git a/packages/xorg-lib/libxdmcp-native_1.0.2.bb b/packages/xorg-lib/libxdmcp-native_1.0.2.bb new file mode 100644 index 0000000000..2438a7b599 --- /dev/null +++ b/packages/xorg-lib/libxdmcp-native_1.0.2.bb @@ -0,0 +1,11 @@ +SECTION = "x11/libs" +PRIORITY = "optional" +LICENSE = "BSD-X" +PE = "1" + +DEPENDS = "xproto-native util-macros-native" + +SRC_URI = "${XORG_MIRROR}/individual/lib/libXdmcp-${PV}.tar.bz2" +S = "${WORKDIR}/libXdmcp-${PV}" + +inherit native autotools pkgconfig diff --git a/packages/xorg-lib/libxdmcp_1.0.2.bb b/packages/xorg-lib/libxdmcp_1.0.2.bb new file mode 100644 index 0000000000..109c5b5615 --- /dev/null +++ b/packages/xorg-lib/libxdmcp_1.0.2.bb @@ -0,0 +1,11 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Display Manager Control Protocol library." +PRIORITY = "optional" + +DEPENDS += " xproto" +PROVIDES = "xdmcp" + +XORG_PN = "libXdmcp" + diff --git a/packages/xorg-lib/libxevie_1.0.2.bb b/packages/xorg-lib/libxevie_1.0.2.bb new file mode 100644 index 0000000000..06985bd112 --- /dev/null +++ b/packages/xorg-lib/libxevie_1.0.2.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xproto virtual/libx11 xextproto libxext evieext" + +XORG_PN = "libXevie" + diff --git a/packages/xorg-lib/libxext_1.0.2.bb b/packages/xorg-lib/libxext_1.0.2.bb new file mode 100644 index 0000000000..a64067e2ad --- /dev/null +++ b/packages/xorg-lib/libxext_1.0.2.bb @@ -0,0 +1,11 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Server Extension library" +PRIORITY = "optional" + +DEPENDS += " xproto virtual/libx11 xextproto libxau" +PROVIDES = "xext" + +XORG_PN = "libXext" + diff --git a/packages/xorg-lib/libxfixes_4.0.3.bb b/packages/xorg-lib/libxfixes_4.0.3.bb new file mode 100644 index 0000000000..cffe56a03a --- /dev/null +++ b/packages/xorg-lib/libxfixes_4.0.3.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Fixes extension library." +LICENSE= "BSD-X" + +DEPENDS += " virtual/libx11 xproto fixesproto xextproto" + +XORG_PN = "libXfixes" + diff --git a/packages/xorg-lib/libxfont_1.2.7.bb b/packages/xorg-lib/libxfont_1.2.7.bb new file mode 100644 index 0000000000..cc855c0106 --- /dev/null +++ b/packages/xorg-lib/libxfont_1.2.7.bb @@ -0,0 +1,14 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X font library (used by the X server)." +LICENSE= "BSD-X" +PRIORITY = "optional" + +SRC_URI += "file://no-scalable-crash.patch;patch=1" + +DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc" +PROVIDES = "xfont" + +XORG_PN = "libXfont" + diff --git a/packages/xorg-lib/libxfontcache_1.0.4.bb b/packages/xorg-lib/libxfontcache_1.0.4.bb new file mode 100644 index 0000000000..1e45867950 --- /dev/null +++ b/packages/xorg-lib/libxfontcache_1.0.4.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxext xextproto fontcacheproto" + +XORG_PN = "libXfontcache" + diff --git a/packages/xorg-lib/libxi_1.0.2.bb b/packages/xorg-lib/libxi_1.0.2.bb new file mode 100644 index 0000000000..84c67f5ae3 --- /dev/null +++ b/packages/xorg-lib/libxi_1.0.2.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Input extension library." + +DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto" + +XORG_PN = "libXi" + diff --git a/packages/xorg-lib/libxkbfile_1.0.4.bb b/packages/xorg-lib/libxkbfile_1.0.4.bb new file mode 100644 index 0000000000..2d9b778d02 --- /dev/null +++ b/packages/xorg-lib/libxkbfile_1.0.4.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X11 keyboard library" +LICENSE= "GPL" +PRIORITY = "optional" + +DEPENDS += " virtual/libx11 kbproto" + diff --git a/packages/xorg-lib/libxmu_1.0.3.bb b/packages/xorg-lib/libxmu_1.0.3.bb new file mode 100644 index 0000000000..e055874b3d --- /dev/null +++ b/packages/xorg-lib/libxmu_1.0.3.bb @@ -0,0 +1,17 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Window System miscellaneous utility library" +PRIORITY = "optional" + +DEPENDS += " libxt libxext xextproto virtual/libx11" +PROVIDES = "xmu" + +XORG_PN = "libXmu" + +PACKAGES =+ "libxmuu libxmuu-dev" + +FILES_libxmuu = "${libdir}/libXmuu.so.*" +FILES_libxmuu-dev = "${libdir}/libXmuu.so" + +LEAD_SONAME = "libXmu" diff --git a/packages/xorg-lib/libxpm_3.5.6.bb b/packages/xorg-lib/libxpm_3.5.6.bb new file mode 100644 index 0000000000..60779da43f --- /dev/null +++ b/packages/xorg-lib/libxpm_3.5.6.bb @@ -0,0 +1,14 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Pixmap library." +PRIORITY = "optional" +LICENSE = "X-BSD" + +DEPENDS += " xproto virtual/libx11 libxt libxext xextproto" + +XORG_PN = "libXpm" + +PACKAGES =+ "sxpm cxpm" +FILES_cxpm = "${bindir}/cxpm" +FILES_sxpm = "${bindir}/sxpm" diff --git a/packages/xorg-lib/libxrandr_1.1.2.bb b/packages/xorg-lib/libxrandr_1.1.2.bb new file mode 100644 index 0000000000..18e5deffb8 --- /dev/null +++ b/packages/xorg-lib/libxrandr_1.1.2.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Resize and Rotate extension library." +LICENSE = "BSD-X" + +DEPENDS += " virtual/libx11 randrproto libxext xextproto libxrender renderproto" + +XORG_PN = "libXrandr" + diff --git a/packages/xorg-lib/libxrender_0.9.2.bb b/packages/xorg-lib/libxrender_0.9.2.bb new file mode 100644 index 0000000000..b1372d3dac --- /dev/null +++ b/packages/xorg-lib/libxrender_0.9.2.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Render extension library." +LICENSE = "BSD-X" + +DEPENDS += " virtual/libx11 renderproto" + +XORG_PN = "libXrender" + diff --git a/packages/xorg-lib/libxres_1.0.3.bb b/packages/xorg-lib/libxres_1.0.3.bb new file mode 100644 index 0000000000..b9d2fd68ce --- /dev/null +++ b/packages/xorg-lib/libxres_1.0.3.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Resource usage library." + +DEPENDS += " virtual/libx11 libxext xextproto resourceproto" + +XORG_PN = "libXres" + diff --git a/packages/xorg-lib/libxscrnsaver_1.1.2.bb b/packages/xorg-lib/libxscrnsaver_1.1.2.bb new file mode 100644 index 0000000000..163ca199c1 --- /dev/null +++ b/packages/xorg-lib/libxscrnsaver_1.1.2.bb @@ -0,0 +1,14 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X screen saver extension library." +LICENSE = "GPL" + +DEPENDS += " virtual/libx11 libxext xextproto scrnsaverproto" + +XORG_PN = "libXScrnSaver" + +PROVIDES = "libxss" +RREPLACES = "libxss" + +#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" diff --git a/packages/xorg-lib/libxt_1.0.4.bb b/packages/xorg-lib/libxt_1.0.4.bb new file mode 100644 index 0000000000..e67590bdf1 --- /dev/null +++ b/packages/xorg-lib/libxt_1.0.4.bb @@ -0,0 +1,20 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Toolkit Intrinsics" +PRIORITY = "optional" + +DEPENDS += " libsm virtual/libx11 xproto kbproto" +PROVIDES = "xt" + +XORG_PN = "libXt" + +EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb" + +do_compile() { + ( + unset CC LD CXX CCLD + oe_runmake -C util 'XT_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs + ) || exit 1 + oe_runmake +} diff --git a/packages/xorg-lib/libxvmc_1.0.4.bb b/packages/xorg-lib/libxvmc_1.0.4.bb new file mode 100644 index 0000000000..54aaa895ff --- /dev/null +++ b/packages/xorg-lib/libxvmc_1.0.4.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc +PE = "1" + +DESCRIPTION = "X Video Motion Compensation extension library." + +DEPENDS += " virtual/libx11 libxext libxv xextproto videoproto" + +XORG_PN = "libXvMC" + diff --git a/packages/xorg-lib/xorg-lib-common.inc b/packages/xorg-lib/xorg-lib-common.inc index 0c6c1388d2..e1f783e352 100644 --- a/packages/xorg-lib/xorg-lib-common.inc +++ b/packages/xorg-lib/xorg-lib-common.inc @@ -4,7 +4,8 @@ LICENSE = "MIT-X" DEPENDS = "util-macros xorg-headers-native" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/lib/${XORG_PN}-${PV}.tar.bz2" +XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/lib/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig diff --git a/packages/xorg-lib/xtrans_1.0.3.bb b/packages/xorg-lib/xtrans_1.0.3.bb new file mode 100644 index 0000000000..e32509a5c4 --- /dev/null +++ b/packages/xorg-lib/xtrans_1.0.3.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc +PE = "1" + +SRC_URI += "file://fix-missing-includepath.patch;patch=1" + +DESCRIPTION = "network API translation layer to \ +insulate X applications and libraries from OS \ +network vageries." + -- cgit v1.2.3 From 83d964336d4e28d1be067ca515ea643c588e6b2a Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 09:54:20 +0000 Subject: X11R7.2 preparation: xorg-proto - add individual release support to xorg-proto-common.inc - add new X11R7.2 releases (individual release versions) --- packages/xorg-proto/glproto_1.4.8.bb | 6 ++++++ packages/xorg-proto/xorg-proto-common.inc | 3 ++- packages/xorg-proto/xproto_7.0.10.bb | 6 ++++++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 packages/xorg-proto/glproto_1.4.8.bb create mode 100644 packages/xorg-proto/xproto_7.0.10.bb (limited to 'packages') diff --git a/packages/xorg-proto/glproto_1.4.8.bb b/packages/xorg-proto/glproto_1.4.8.bb new file mode 100644 index 0000000000..7a4888d489 --- /dev/null +++ b/packages/xorg-proto/glproto_1.4.8.bb @@ -0,0 +1,6 @@ +require xorg-proto-common.inc +PE="1" + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/packages/xorg-proto/xorg-proto-common.inc b/packages/xorg-proto/xorg-proto-common.inc index 017e8755a8..1dc4f12fc7 100644 --- a/packages/xorg-proto/xorg-proto-common.inc +++ b/packages/xorg-proto/xorg-proto-common.inc @@ -5,7 +5,8 @@ LICENSE = "MIT-X" #DEPENDS = "" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/proto/${XORG_PN}-${PV}.tar.bz2" +XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/proto/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig diff --git a/packages/xorg-proto/xproto_7.0.10.bb b/packages/xorg-proto/xproto_7.0.10.bb new file mode 100644 index 0000000000..3f598df1bb --- /dev/null +++ b/packages/xorg-proto/xproto_7.0.10.bb @@ -0,0 +1,6 @@ +require xorg-proto-common.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " -- cgit v1.2.3 From 9178b2e1c457061710f3ee95b98ba845cf09cdc1 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 10:06:48 +0000 Subject: X11R7.2 preparation: xorg-xserver - add individual release support to xorg-xserver-common.inc - add new xorg-server 1.2.0 release --- packages/xorg-xserver/xorg-xserver-common.inc | 3 +- packages/xorg-xserver/xserver-kdrive_1.2.0.bb | 130 ++++++++++++++++++++++++++ packages/xorg-xserver/xserver-xorg_1.2.0.bb | 10 ++ 3 files changed, 142 insertions(+), 1 deletion(-) create mode 100644 packages/xorg-xserver/xserver-kdrive_1.2.0.bb create mode 100644 packages/xorg-xserver/xserver-xorg_1.2.0.bb (limited to 'packages') diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index 3aa3aaf3c6..fcfec6d4f7 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -19,7 +19,8 @@ libxkbui libxxf86misc libxi libdmx libxtst libxres mesa mkfontscale-native" RDEPENDS_${PN} = "rgb" XORG_PN = "xorg-server" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/xserver/${XORG_PN}-${PV}.tar.bz2 \ +XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/xserver/${XORG_PN}-${PV}.tar.bz2 \ ${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${MESA_VER}.tar.bz2 \ file://xorg.conf" diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb new file mode 100644 index 0000000000..5789004fd1 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb @@ -0,0 +1,130 @@ +LICENSE = "MIT" +DEPENDS = "tslib virtual/libsdl xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" + +PE = "1" + +PROVIDES = "virtual/xserver" +RPROVIDES = "virtual/xserver" +PACKAGES =+ "xserver-kdrive-fbdev \ + xserver-kdrive-sdl \ + xserver-kdrive-fake \ + xserver-kdrive-xephyr \ + xserver-kdrive-epson \ + xserver-kdrive-w100 \ + xserver-kdrive-ati \ + xserver-kdrive-chips \ + xserver-kdrive-i810 \ + xserver-kdrive-mach64 \ + xserver-kdrive-mga \ + xserver-kdrive-neomagic \ + xserver-kdrive-nvidia \ + xserver-kdrive-pm2 \ + xserver-kdrive-r128 \ + xserver-kdrive-smi \ + xserver-kdrive-vesa \ + xserver-kdrive-via \ + " + +SECTION = "x11/base" +DESCRIPTION = "X server from freedesktop.org" +DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" +DESCRIPTION_xserver-kdrive-fake = "Fake X server" +DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" +DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" +DESCRIPTION_xserver-kdrive-sdl = "X server from freedesktop.org, SDL version" +DESCRIPTION_xserver-kdrive-w100 = "X server from freedesktop.org, supporting the ATI imageon w100 chipset" +DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices" +DESCRIPTION_xserver-kdrive-chips = "X server from freedesktop.org, supporting Chips chipsets" +DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting Intel chipsets" +DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting mach64 chipsets" +DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting mga chipsets" +DESCRIPTION_xserver-kdrive-neomagic = "X server from freedesktop.org, supporting neomagic chipsets" +DESCRIPTION_xserver-kdrive-nvidia = "X server from freedesktop.org, supporting nvidia devices" +DESCRIPTION_xserver-kdrive-pm2 = "X server from freedesktop.org, supporting Permedia2 chipsets" +DESCRIPTION_xserver-kdrive-r128 = "X server from freedesktop.org, supporting rage128 chipsets" +DESCRIPTION_xserver-kdrive-smi = "X server from freedesktop.org, supporting Silicon Motion devices" +DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting any card with a VESA, VGA or even EGA BIOS. x86 hardware only" +DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA chipsets" + +FILES_${PN} += "${libdir}/xserver/SecurityPolicy" + +FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" +FILES_xserver-kdrive-fake = "${bindir}/Xfake" +FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" +FILES_xserver-kdrive-epson = "${bindir}/Xepson" +FILES_xserver-kdrive-sdl = "${bindir}/Xsdl" +FILES_xserver-kdrive-w100 = "${bindir}/Xw100" +FILES_xserver-kdrive-ati = "${bindir}/Xati" +FILES_xserver-kdrive-chips = "${bindir}/Xchips" +FILES_xserver-kdrive-i810 = "${bindir}/Xi810" +FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64" +FILES_xserver-kdrive-mga = "${bindir}/Xmga" +FILES_xserver-kdrive-neomagic = "${bindir}/Xneomagic" +FILES_xserver-kdrive-nvidia = "${bindir}/Xnvidia" +FILES_xserver-kdrive-pm2 = "${bindir}/Xpm2" +FILES_xserver-kdrive-r128 = "${bindir}/Xr128" +FILES_xserver-kdrive-smi = "${bindir}/Xsmi" +FILES_xserver-kdrive-vesa = "${bindir}/Xvesa" +FILES_xserver-kdrive-via = "${bindir}/Xvia" + +RDEPENDS_xserver-kdrive-fbdev = "${PN}" +RDEPENDS_xserver-kdrive-fake = "${PN}" +RDEPENDS_xserver-kdrive-xephyr = "${PN}" +RDEPENDS_xserver-kdrive-epson = "${PN}" +RDEPENDS_xserver-kdrive-sdl = "${PN}" +RDEPENDS_xserver-kdrive-w100 = "${PN}" +RDEPENDS_xserver-kdrive-ati = "${PN}" +RDEPENDS_xserver-kdrive-chips = "${PN}" +RDEPENDS_xserver-kdrive-i810 = "${PN}" +RDEPENDS_xserver-kdrive-mach64 = "${PN}" +RDEPENDS_xserver-kdrive-mga = "${PN}" +RDEPENDS_xserver-kdrive-neomagic = "${PN}" +RDEPENDS_xserver-kdrive-nvidia = "${PN}" +RDEPENDS_xserver-kdrive-pm2 = "${PN}" +RDEPENDS_xserver-kdrive-r128 = "${PN}" +RDEPENDS_xserver-kdrive-smi = "${PN}" +RDEPENDS_xserver-kdrive-vesa = "${PN}" +RDEPENDS_xserver-kdrive-via = "${PN}" + +SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ + file://kmode.patch;patch=1 \ + file://disable-apm.patch;patch=1 \ + file://no-serial-probing.patch;patch=1 \ + file://kdrive-evdev.patch;patch=1 \ + file://kdrive-use-evdev.patch;patch=1 \ + file://fbdev-not-fix.patch;patch=1 \ + file://enable-builtin-fonts.patch;patch=1 \ + file://optional-xkb.patch;patch=1 \ + file://enable-epson.patch;patch=1 \ + file://disable-xf86-dga-xorgcfg.patch;patch=1 \ + file://w100.patch;patch=1 \ + file://enable-tslib.patch;patch=1 \ + file://xcalibrate.patch;patch=1 \ + file://kmode-palm.patch;patch=1" + +SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" +SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" +PACKAGE_ARCH_poodle = "poodle" +PACKAGE_ARCH_palmtx = "palmtx" +PACKAGE_ARCH_palmld = "palmld" +PACKAGE_ARCH_palmz72 = "palmz72" + +S = "${WORKDIR}/xorg-server-${PV}" + +inherit autotools pkgconfig + +ARM_INSTRUCTION_SET = "arm" + +W100_OECONF = "--disable-w100" +W100_OECONF_arm = "--enable-w100" + +EXTRA_OECONF = "--enable-composite --enable-kdrive \ + --disable-dga --disable-dri --disable-xinerama \ + --disable-xf86misc --disable-xf86vidmode \ + --disable-xorg --disable-xorgcfg \ + --disable-xkb --disable-xnest --disable-xvfb \ + --disable-xevie --disable-xprint --disable-xtrap \ + --disable-dmx ${W100_OECONF} \ + --with-default-font-path=built-ins \ + --enable-tslib --enable-xcalibrate \ + ac_cv_file__usr_share_X11_sgml_defs_ent=no" diff --git a/packages/xorg-xserver/xserver-xorg_1.2.0.bb b/packages/xorg-xserver/xserver-xorg_1.2.0.bb new file mode 100644 index 0000000000..900c3266cb --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg_1.2.0.bb @@ -0,0 +1,10 @@ +require xorg-xserver-common.inc +PE = "1" + +SRC_URI += "file://drmfix.patch;patch=1" + +EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no " + +#DESCRIPTION = "" + +#DEPENDS += " " -- cgit v1.2.3 From 2969cc50e8e3ae6f457e2436633199b2e2e68740 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 10:48:11 +0000 Subject: xcb: update to xcb-proto/libxcb 0.9.3, xcb-util 0.2 --- packages/xcb/libxcb_0.9.93.bb | 46 ++++++++++++++++++++++++++++++++++++++++ packages/xcb/xcb-proto_0.9.93.bb | 19 +++++++++++++++++ packages/xcb/xcb-util_0.2.bb | 41 +++++++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+) create mode 100644 packages/xcb/libxcb_0.9.93.bb create mode 100644 packages/xcb/xcb-proto_0.9.93.bb create mode 100644 packages/xcb/xcb-util_0.2.bb (limited to 'packages') diff --git a/packages/xcb/libxcb_0.9.93.bb b/packages/xcb/libxcb_0.9.93.bb new file mode 100644 index 0000000000..26eea1d576 --- /dev/null +++ b/packages/xcb/libxcb_0.9.93.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" +PR = "r0" + +PARALLEL_MAKE = "" +DEPENDS = "xcb-proto libxau" +# DEPENDS += "xsltproc-native gperf-native" + +SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2" + +PACKAGES =+ "libxcb-composite libxcb-damage libxcb-dpms libxcb-glx \ + libxcb-randr libxcb-record libxcb-render libxcb-res \ + libxcb-screensaver libxcb-shape libxcb-shm libxcb-sync \ + libxcb-xevie libxcb-xf86dri libxcb-xfixes libxcb-xlib \ + libxcb-xprint libxcb-xtest libxcb-xv libxcb-xvmc" + +FILES_${PN} = "${libdir}/libxcb.so.*" +#FILES_${PN}-dev = "${libdir}/libxcb.* ${libdir}/pkgconfig/*.pc ${includedir}/xcb/*.h" +FILES_libxcb-composite = "${libdir}/libxcb-composite.so*" +FILES_libxcb-damage = "${libdir}/libxcb-damage.so.*" +FILES_libxcb-dpms = "${libdir}/libxcb-dpms.so.*" +FILES_libxcb-glx = "${libdir}/libxcb-glx.so.*" +FILES_libxcb-randr = "${libdir}/libxcb-randr.so.*" +FILES_libxcb-record = "${libdir}/libxcb-record.so.*" +FILES_libxcb-render = "${libdir}/libxcb-render.so.*" +FILES_libxcb-res = "${libdir}/libxcb-res.so.*" +FILES_libxcb-screensaver = "${libdir}/libxcb-screensaver.so.*" +FILES_libxcb-shape = "${libdir}/libxcb-shape.so.*" +FILES_libxcb-shm = "${libdir}/libxcb-shm.so.*" +FILES_libxcb-sync = "${libdir}/libxcb-sync.so.*" +FILES_libxcb-xevie = "${libdir}/libxcb-xevie.so.*" +FILES_libxcb-xf86dri = "${libdir}/libxcb-xf86dri.so.*" +FILES_libxcb-xfixes = "${libdir}/libxcb-xfixes.so.*" +FILES_libxcb-xlib = "${libdir}/libxcb-xlib.so.*" +FILES_libxcb-xprint = "${libdir}/libxcb-xprint.so.*" +FILES_libxcb-xtest = "${libdir}/libxcb-xtest.so.*" +FILES_libxcb-xv = "${libdir}/libxcb-xv.so.*" +FILES_libxcb-xvmc = "${libdir}/libxcb-xvmc.so.*" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xcb/xcb-proto_0.9.93.bb b/packages/xcb/xcb-proto_0.9.93.bb new file mode 100644 index 0000000000..f7f4160d5b --- /dev/null +++ b/packages/xcb/xcb-proto_0.9.93.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" +PR = "r0" + +SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2" + +inherit autotools pkgconfig + +FILES_${PN}-dev += "${datadir}/xcb/*.xml ${datadir}/xcb/xcb.xsd" + +do_stage() { + oe_runmake DESTDIR="${D}" install + mkdir -p ${STAGING_LIBDIR}/pkgconfig + install ${D}${libdir}/pkgconfig/xcb-proto.pc ${STAGING_LIBDIR}/pkgconfig + mkdir -p ${STAGING_DATADIR}/xcb + install ${D}${datadir}/xcb/*.xml ${STAGING_DATADIR}/xcb +} diff --git a/packages/xcb/xcb-util_0.2.bb b/packages/xcb/xcb-util_0.2.bb new file mode 100644 index 0000000000..b0efa9f669 --- /dev/null +++ b/packages/xcb/xcb-util_0.2.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" +PR = "r0" + +DEPENDS = "libxcb" +# DEPENDS += "gperf-native" + +PARALLEL_MAKE = "" + +SRC_URI = "http://xcb.freedesktop.org/dist/xcb-util-${PV}.tar.bz2" + +PACKAGES = "libxcbatom libxcbatom-dev libxcbaux libxcbaux-dev libxcbevent libxcbevent-dev libxcbicccm libxcbicccm-dev \ + libxcbimage libxcbimage-dev libxcbkeysyms libxcbkeysyms-dev libxcbproperty libxcbproperty-dev \ + libxcbreply libxcbreply-dev libxcbwm libxcbwm-dev" + +FILES_libxcbatom = "${libdir}/libXCBAtom.so.*" +FILES_libxcbatom-dev = "${libdir}/libXCBAtom.* ${libdir}/pkgconfig/xcb-atom.pc ${includedir}/X11/XCB/xcb_atom.h" +FILES_libxcbaux = "${libdir}/libXCBAux.so.*" +FILES_libxcbaux-dev = "${libdir}/libXCBAux.* ${libdir}/pkgconfig/xcb-aux.pc ${includedir}/X11/XCB/xcb_aux.h" +FILES_libxcbevent = "${libdir}/libXCBEvent.so.*" +FILES_libxcbevent-dev = "${libdir}/libXCBEvent.* ${libdir}/pkgconfig/xcb-event.pc ${includedir}/X11/XCB/xcb_event.h" +FILES_libxcbicccm = "${libdir}/libXCBICCCM.so.*" +FILES_libxcbicccm-dev = "${libdir}/libICCCM.* ${libdir}/pkgconfig/xcb-icccm.pc ${includedir}/X11/XCB/xcb_icccm.h" +FILES_libxcbimage = "${libdir}/libXCBImage.so.*" +FILES_libxcbimage-dev = "${libdir}/libXCBImage.* ${libdir}/pkgconfig/xcb-image.pc ${includedir}/X11/XCB/xcb_image.h" +FILES_libxcbkeysyms = "${libdir}/libXCBKeysyms.so.*" +FILES_libxcbkeysyms-dev = "${libdir}/libXCBKeysyms.* ${libdir}/pkgconfig/xcb-keysyms.pc ${includedir}/X11/XCB/xcb_keysyms.h" +FILES_libxcbproperty = "${libdir}/libXCBProperty.so.*" +FILES_libxcbproperty-dev = "${libdir}/libXCBProperty.* ${libdir}/pkgconfig/xcb-property.pc ${includedir}/X11/XCB/xcb_property.h" +FILES_libxcbreply = "${libdir}/libXCBReply.so.*" +FILES_libxcbreply-dev = "${libdir}/libXCBReply.* ${libdir}/pkgconfig/xcb-reply.pc ${includedir}/X11/XCB/xcb_reply.h" +FILES_libxcbwm = "${libdir}/libXCBWM.so.*" +FILES_libxcbwm-dev = "${libdir}/libXCBWM.* ${libdir}/pkgconfig/xcb-wm.pc ${includedir}/X11/XCB/xcb_wm.h" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} -- cgit v1.2.3 From bf303b546f3ed8d3050e4c21c14d03232f56463e Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 11:20:05 +0000 Subject: libx11-1.1.1: depends on libxcb --- packages/xorg-lib/libx11_1.1.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb index de47042dc4..88225a8eb7 100644 --- a/packages/xorg-lib/libx11_1.1.1.bb +++ b/packages/xorg-lib/libx11_1.1.1.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Base X libs." SRC_URI += "file://makekeys.diff;patch=1" DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ - libxdmcp xf86bigfontproto kbproto inputproto" + libxcb libxdmcp xf86bigfontproto kbproto inputproto" PROVIDES = "virtual/libx11" RPROVIDES = "virtual/libx11" -- cgit v1.2.3 From 93eb9085a1a551875e241eacf8127dce5aa0f426 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 11:23:48 +0000 Subject: xserver-kdrive-1.2.0: depends on libxkbfile --- packages/xorg-xserver/xserver-kdrive_1.2.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb index 5789004fd1..4e7d438b3e 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb @@ -1,5 +1,5 @@ LICENSE = "MIT" -DEPENDS = "tslib virtual/libsdl xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" +DEPENDS = "tslib virtual/libsdl xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxkbfile libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" PE = "1" -- cgit v1.2.3 From 9b72859f629ba81ea1d07c955dfbef070a9f7011 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 12:04:06 +0000 Subject: xserver-kdrive: add initial -common.inc to be used by all xserver-kdrive versions --- packages/xorg-xserver/xserver-kdrive-common.inc | 129 ++++++++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100644 packages/xorg-xserver/xserver-kdrive-common.inc (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive-common.inc b/packages/xorg-xserver/xserver-kdrive-common.inc new file mode 100644 index 0000000000..47ed5d0267 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-common.inc @@ -0,0 +1,129 @@ +LICENSE = "MIT" +DEPENDS = "compositeproto damageproto fixesproto recordproto resourceproto scrnsaverproto videoproto xextproto xproto \ + libxau libxext libxdmcp libxfont libxrandr tslib virtual/libsdl virtual/libx11 xtrans" + +PROVIDES = "virtual/xserver" +RPROVIDES = "virtual/xserver" +PACKAGES =+ "xserver-kdrive-fbdev \ + xserver-kdrive-sdl \ + xserver-kdrive-fake \ + xserver-kdrive-xephyr \ + xserver-kdrive-epson \ + xserver-kdrive-w100 \ + xserver-kdrive-ati \ + xserver-kdrive-chips \ + xserver-kdrive-i810 \ + xserver-kdrive-mach64 \ + xserver-kdrive-mga \ + xserver-kdrive-neomagic \ + xserver-kdrive-nvidia \ + xserver-kdrive-pm2 \ + xserver-kdrive-r128 \ + xserver-kdrive-smi \ + xserver-kdrive-vesa \ + xserver-kdrive-via \ + " + +SECTION = "x11/base" +DESCRIPTION = "X server from freedesktop.org" +DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" +DESCRIPTION_xserver-kdrive-fake = "Fake X server" +DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" +DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" +DESCRIPTION_xserver-kdrive-sdl = "X server from freedesktop.org, SDL version" +DESCRIPTION_xserver-kdrive-w100 = "X server from freedesktop.org, supporting the ATI imageon w100 chipset" +DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices" +DESCRIPTION_xserver-kdrive-chips = "X server from freedesktop.org, supporting Chips chipsets" +DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting Intel chipsets" +DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting mach64 chipsets" +DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting mga chipsets" +DESCRIPTION_xserver-kdrive-neomagic = "X server from freedesktop.org, supporting neomagic chipsets" +DESCRIPTION_xserver-kdrive-nvidia = "X server from freedesktop.org, supporting nvidia devices" +DESCRIPTION_xserver-kdrive-pm2 = "X server from freedesktop.org, supporting Permedia2 chipsets" +DESCRIPTION_xserver-kdrive-r128 = "X server from freedesktop.org, supporting rage128 chipsets" +DESCRIPTION_xserver-kdrive-smi = "X server from freedesktop.org, supporting Silicon Motion devices" +DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting any card with a VESA, VGA or even EGA BIOS. x86 hardware only" +DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA chipsets" + +FILES_${PN} += "${libdir}/xserver/SecurityPolicy" + +FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" +FILES_xserver-kdrive-fake = "${bindir}/Xfake" +FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" +FILES_xserver-kdrive-epson = "${bindir}/Xepson" +FILES_xserver-kdrive-sdl = "${bindir}/Xsdl" +FILES_xserver-kdrive-w100 = "${bindir}/Xw100" +FILES_xserver-kdrive-ati = "${bindir}/Xati" +FILES_xserver-kdrive-chips = "${bindir}/Xchips" +FILES_xserver-kdrive-i810 = "${bindir}/Xi810" +FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64" +FILES_xserver-kdrive-mga = "${bindir}/Xmga" +FILES_xserver-kdrive-neomagic = "${bindir}/Xneomagic" +FILES_xserver-kdrive-nvidia = "${bindir}/Xnvidia" +FILES_xserver-kdrive-pm2 = "${bindir}/Xpm2" +FILES_xserver-kdrive-r128 = "${bindir}/Xr128" +FILES_xserver-kdrive-smi = "${bindir}/Xsmi" +FILES_xserver-kdrive-vesa = "${bindir}/Xvesa" +FILES_xserver-kdrive-via = "${bindir}/Xvia" + +RDEPENDS_xserver-kdrive-fbdev = "${PN}" +RDEPENDS_xserver-kdrive-fake = "${PN}" +RDEPENDS_xserver-kdrive-xephyr = "${PN}" +RDEPENDS_xserver-kdrive-epson = "${PN}" +RDEPENDS_xserver-kdrive-sdl = "${PN}" +RDEPENDS_xserver-kdrive-w100 = "${PN}" +RDEPENDS_xserver-kdrive-ati = "${PN}" +RDEPENDS_xserver-kdrive-chips = "${PN}" +RDEPENDS_xserver-kdrive-i810 = "${PN}" +RDEPENDS_xserver-kdrive-mach64 = "${PN}" +RDEPENDS_xserver-kdrive-mga = "${PN}" +RDEPENDS_xserver-kdrive-neomagic = "${PN}" +RDEPENDS_xserver-kdrive-nvidia = "${PN}" +RDEPENDS_xserver-kdrive-pm2 = "${PN}" +RDEPENDS_xserver-kdrive-r128 = "${PN}" +RDEPENDS_xserver-kdrive-smi = "${PN}" +RDEPENDS_xserver-kdrive-vesa = "${PN}" +RDEPENDS_xserver-kdrive-via = "${PN}" + +SRC_URI ?= "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ + ${KDRIVE_COMMON_PATCHES}" +KDRIVE_COMMON_PATCHES = " \ + file://kmode.patch;patch=1 \ + file://disable-apm.patch;patch=1 \ + file://no-serial-probing.patch;patch=1 \ + file://kdrive-evdev.patch;patch=1 \ + file://kdrive-use-evdev.patch;patch=1 \ + file://fbdev-not-fix.patch;patch=1 \ + file://enable-builtin-fonts.patch;patch=1 \ + file://optional-xkb.patch;patch=1 \ + file://enable-epson.patch;patch=1 \ + file://w100.patch;patch=1 \ + file://enable-tslib.patch;patch=1 \ + file://xcalibrate.patch;patch=1 \ + file://kmode-palm.patch;patch=1 \ + " + +SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" +SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" +PACKAGE_ARCH_poodle = "poodle" +PACKAGE_ARCH_palmtx = "palmtx" +PACKAGE_ARCH_palmld = "palmld" +PACKAGE_ARCH_palmz72 = "palmz72" + +inherit autotools pkgconfig + +ARM_INSTRUCTION_SET = "arm" + +W100_OECONF = "--disable-w100" +W100_OECONF_arm = "--enable-w100" + +EXTRA_OECONF = "--enable-composite --enable-kdrive \ + --disable-dga --disable-dri --disable-xinerama \ + --disable-xf86misc --disable-xf86vidmode \ + --disable-xorg --disable-xorgcfg \ + --disable-xkb --disable-xnest --disable-xvfb \ + --disable-xevie --disable-xprint --disable-xtrap \ + --disable-dmx ${W100_OECONF} \ + --with-default-font-path=built-ins \ + --enable-tslib --enable-xcalibrate \ + ac_cv_file__usr_share_X11_sgml_defs_ent=no" -- cgit v1.2.3 From 551a53a388f30bbdc39aa29cea9411b5fe1e0dcb Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 13:16:37 +0000 Subject: randrproto: add 1.2.1 (>= 1.2 is needed for xserver-kdrive_git) --- packages/xorg-proto/randrproto_1.2.1.bb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 packages/xorg-proto/randrproto_1.2.1.bb (limited to 'packages') diff --git a/packages/xorg-proto/randrproto_1.2.1.bb b/packages/xorg-proto/randrproto_1.2.1.bb new file mode 100644 index 0000000000..1116da8f93 --- /dev/null +++ b/packages/xorg-proto/randrproto_1.2.1.bb @@ -0,0 +1,8 @@ +require xorg-proto-common.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " + +CONFLICTS = "randrext" -- cgit v1.2.3 From 3d54ca9f03dca695922e65e59549857ccc002842 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 13:58:48 +0000 Subject: damageproto: add 1.1.0 (>= 1.1 needed by xserver-kdrive_git) --- packages/xorg-proto/damageproto_1.1.0.bb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 packages/xorg-proto/damageproto_1.1.0.bb (limited to 'packages') diff --git a/packages/xorg-proto/damageproto_1.1.0.bb b/packages/xorg-proto/damageproto_1.1.0.bb new file mode 100644 index 0000000000..ae54c06a64 --- /dev/null +++ b/packages/xorg-proto/damageproto_1.1.0.bb @@ -0,0 +1,8 @@ +require xorg-proto-common.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " + +CONFLICTS = "damageext" -- cgit v1.2.3 From 69a046148be38774781d90fc22a339136917d4ee Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 14:00:20 +0000 Subject: inputproto: add 1.4.1 (>= 1.4 needed by xserver-kdrive_git) --- packages/xorg-proto/inputproto_1.4.1.bb | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 packages/xorg-proto/inputproto_1.4.1.bb (limited to 'packages') diff --git a/packages/xorg-proto/inputproto_1.4.1.bb b/packages/xorg-proto/inputproto_1.4.1.bb new file mode 100644 index 0000000000..40af1d2115 --- /dev/null +++ b/packages/xorg-proto/inputproto_1.4.1.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc +PE = "1" + +#DESCRIPTION = "" -- cgit v1.2.3 From b2fb28dbc919753212298bd283c118d6f1aea086 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 28 Mar 2007 14:53:17 +0000 Subject: xorg-app-common: add dep on util-macros --- packages/xorg-app/xorg-app-common.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/xorg-app/xorg-app-common.inc b/packages/xorg-app/xorg-app-common.inc index 15f76ab5e2..a33d107675 100644 --- a/packages/xorg-app/xorg-app-common.inc +++ b/packages/xorg-app/xorg-app-common.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.x.org" SECTION = "x11/applications" LICENSE = "MIT-X" -#DEPENDS = "" +DEPENDS = "util-macros" XORG_PN = "${PN}" XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/app/${XORG_PN}-${PV}.tar.bz2" -- cgit v1.2.3 From 8cbb367f96dd5826c03d10a9ec8abadf0073f717 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 28 Mar 2007 15:09:53 +0000 Subject: openmoko: add qvga theme and mark themes as arch agnostic --- .../openmoko-theme-standard-qvga_svn.bb | 25 ++++++++++++++++++++++ .../openmoko-base/openmoko-theme-standard_svn.bb | 3 ++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb (limited to 'packages') diff --git a/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb b/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb new file mode 100644 index 0000000000..0c19db77ac --- /dev/null +++ b/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution, qvga version" +SECTION = "openmoko/base" +PV = "0.0+svn${SRCDATE}" +PR = "r0" + +inherit openmoko-base + +SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=themes;proto=http" +S = "${WORKDIR}" + +dirs = "themes/openmoko-standard" + +do_install() { + find ${WORKDIR} -name ".svn" | xargs rm -rf + install -d ${D}${datadir}/themes/ + for i in ${dirs}; do + cp -fpPR ${WORKDIR}/$i ${D}${datadir}/themes/ + done + + install -d ${D}${sysconfdir}/gtk-2.0 + echo 'include "${datadir}/themes/openmoko-standard-qvga/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc +} + +PACKAGE_ARCH = "all" +FILES_${PN} = "${datadir} ${sysconfdir}" diff --git a/packages/openmoko-base/openmoko-theme-standard_svn.bb b/packages/openmoko-base/openmoko-theme-standard_svn.bb index e7a6def235..6265526de6 100644 --- a/packages/openmoko-base/openmoko-theme-standard_svn.bb +++ b/packages/openmoko-base/openmoko-theme-standard_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution" SECTION = "openmoko/base" PV = "0.0+svn${SRCDATE}" -PR = "r3" +PR = "r4" inherit openmoko-base @@ -21,4 +21,5 @@ do_install() { echo 'include "${datadir}/themes/openmoko-standard/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc } +PACKAGE_ARCH = "all" FILES_${PN} = "${datadir} ${sysconfdir}" -- cgit v1.2.3 From 7e18fbe25e35f1801955ee150622761a07c8b8f1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 28 Mar 2007 20:28:49 +0000 Subject: mediatomb: merge 0.9.0 recipe from mediatom svn --- packages/mediatomb/mediatomb_0.9.0.bb | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 packages/mediatomb/mediatomb_0.9.0.bb (limited to 'packages') diff --git a/packages/mediatomb/mediatomb_0.9.0.bb b/packages/mediatomb/mediatomb_0.9.0.bb new file mode 100644 index 0000000000..f3ea9f54dd --- /dev/null +++ b/packages/mediatomb/mediatomb_0.9.0.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "MediaTomb - UPnP AV MediaServer for Linux" +HOMEPAGE = "http://mediatomb.cc/" +LICENSE = "GPLv2" +DEPENDS = "sqlite3 libexif js zlib file id3lib" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/mediatomb/mediatomb-${PV}.tar.gz" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-mysql \ + --disable-rpl-malloc \ + --enable-sqlite3 \ + --enable-libjs \ + --enable-libmagic \ + --enable-id3lib \ + --enable-libexif \ + --disable-largefile \ + --with-sqlite3-h=${STAGING_INCDIR} \ + --with-sqlite3-libs=${STAGING_LIBDIR} \ + --with-magic-h=${STAGING_INCDIR} \ + --with-magic-libs=${STAGING_LIBDIR} \ + --with-exif-h=${STAGING_INCDIR} \ + --with-exif-libs=${STAGING_LIBDIR} \ + --with-zlib-h=${STAGING_INCDIR} \ + --with-zlib-libs=${STAGING_LIBDIR} \ + --with-js-h=${STAGING_INCDIR}/js \ + --with-js-libs=${STAGING_LIBDIR} \ + --with-id3lib-h=${STAGING_INCDIR} \ + --with-id3lib-libs=${STAGING_LIBDIR}" -- cgit v1.2.3 From 2992d24c5ad56361a793281566b1ff7c76aa2836 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Wed, 28 Mar 2007 22:13:05 +0000 Subject: altboot: - Drop files/* and altboot_0.0.0.bb - Add altboot_svn.bb - Add README.txt explaining what the different versions do --- packages/altboot/README.txt | 5 + packages/altboot/altboot_0.0.0.bb | 99 --- packages/altboot/altboot_svn.bb | 95 +++ packages/altboot/files/.mtn2git_empty | 0 packages/altboot/files/akita/.mtn2git_empty | 0 packages/altboot/files/akita/altboot-2.4.cfg | 31 - packages/altboot/files/akita/altboot-2.6.cfg | 41 - packages/altboot/files/altboot-menu/.mtn2git_empty | 0 packages/altboot/files/altboot-menu/00-Default | 14 - packages/altboot/files/altboot-menu/10-noGui | 16 - packages/altboot/files/altboot-menu/15-bootSD | 32 - packages/altboot/files/altboot-menu/20-bootCF | 32 - .../files/altboot-menu/99-ownScripts-example | 68 -- .../files/altboot-menu/Advanced/.mtn2git_empty | 0 .../files/altboot-menu/Advanced/30-bootUSB-Stick | 47 -- .../altboot/files/altboot-menu/Advanced/40-bootNFS | 110 --- .../altboot/files/altboot-menu/Advanced/55-bin-sh | 27 - .../files/altboot-menu/Advanced/60-orig-init | 20 - .../files/altboot-menu/Advanced/70-install-tgz | 266 ------- .../files/altboot-menu/Advanced/70-setKernel | 68 -- .../files/altboot-menu/Advanced/80-configure-kexec | 248 ------ .../files/altboot-menu/Advanced/80-copyrootfs | 323 -------- packages/altboot/files/altboot.func | 870 --------------------- packages/altboot/files/altboot.rc/.mtn2git_empty | 0 packages/altboot/files/altboot.rc/Readme.txt | 2 - .../altboot/files/altboot.rc/disable_printk.sh | 6 - packages/altboot/files/altboot.rc/loadkeymap.sh | 8 - packages/altboot/files/altboot.rc/playbeep.sh | 34 - packages/altboot/files/altbootctl | 311 -------- packages/altboot/files/altbootctl.conf | 98 --- packages/altboot/files/beep.raw | 1 - packages/altboot/files/c7x0/.mtn2git_empty | 0 packages/altboot/files/c7x0/altboot-2.4.cfg | 30 - packages/altboot/files/c7x0/altboot-2.6.cfg | 39 - packages/altboot/files/collie/.mtn2git_empty | 0 packages/altboot/files/collie/altboot-2.4.cfg | 26 - packages/altboot/files/fic-gta01/.mtn2git_empty | 0 packages/altboot/files/fic-gta01/altboot-2.6.cfg | 41 - .../files/fic-gta01/altboot-menu/.mtn2git_empty | 0 .../files/fic-gta01/altboot-menu/00-Default | 14 - .../altboot/files/fic-gta01/altboot-menu/15-bootSD | 32 - .../fic-gta01/altboot-menu/Advanced/.mtn2git_empty | 0 .../fic-gta01/altboot-menu/Advanced/40-bootNFS | 110 --- packages/altboot/files/init.altboot | 606 -------------- packages/altboot/files/nslu2le/.mtn2git_empty | 0 packages/altboot/files/nslu2le/altboot-2.6.cfg | 55 -- .../files/nslu2le/altboot-handlers/.mtn2git_empty | 0 .../files/nslu2le/altboot-handlers/05-USB-Storage | 90 --- .../nslu2le/altboot-handlers/10-Onboard-Flash | 18 - .../files/nslu2le/altboot-menu/.mtn2git_empty | 0 .../altboot/files/nslu2le/altboot-menu/00-Default | 17 - .../files/nslu2le/altboot-menu/30-bootUSB-Stick | 174 ----- .../altboot/files/nslu2le/altboot-menu/55-bin-sh | 27 - .../files/nslu2le/altboot.rc/.mtn2git_empty | 0 packages/altboot/files/poodle/.mtn2git_empty | 0 packages/altboot/files/poodle/altboot-2.4.cfg | 26 - packages/altboot/files/poodle/altboot-2.6.cfg | 45 -- packages/altboot/files/set-bootdev | 150 ---- packages/altboot/files/spitz/.mtn2git_empty | 0 packages/altboot/files/spitz/altboot-2.6.cfg | 41 - packages/altboot/files/tosa/.mtn2git_empty | 0 packages/altboot/files/tosa/altboot-2.4.cfg | 32 - packages/altboot/files/tosa/altboot-2.6.cfg | 41 - 63 files changed, 100 insertions(+), 4386 deletions(-) create mode 100644 packages/altboot/README.txt delete mode 100644 packages/altboot/altboot_0.0.0.bb create mode 100644 packages/altboot/altboot_svn.bb delete mode 100644 packages/altboot/files/.mtn2git_empty delete mode 100644 packages/altboot/files/akita/.mtn2git_empty delete mode 100644 packages/altboot/files/akita/altboot-2.4.cfg delete mode 100644 packages/altboot/files/akita/altboot-2.6.cfg delete mode 100644 packages/altboot/files/altboot-menu/.mtn2git_empty delete mode 100644 packages/altboot/files/altboot-menu/00-Default delete mode 100644 packages/altboot/files/altboot-menu/10-noGui delete mode 100644 packages/altboot/files/altboot-menu/15-bootSD delete mode 100644 packages/altboot/files/altboot-menu/20-bootCF delete mode 100644 packages/altboot/files/altboot-menu/99-ownScripts-example delete mode 100644 packages/altboot/files/altboot-menu/Advanced/.mtn2git_empty delete mode 100644 packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick delete mode 100644 packages/altboot/files/altboot-menu/Advanced/40-bootNFS delete mode 100644 packages/altboot/files/altboot-menu/Advanced/55-bin-sh delete mode 100644 packages/altboot/files/altboot-menu/Advanced/60-orig-init delete mode 100644 packages/altboot/files/altboot-menu/Advanced/70-install-tgz delete mode 100644 packages/altboot/files/altboot-menu/Advanced/70-setKernel delete mode 100644 packages/altboot/files/altboot-menu/Advanced/80-configure-kexec delete mode 100644 packages/altboot/files/altboot-menu/Advanced/80-copyrootfs delete mode 100644 packages/altboot/files/altboot.func delete mode 100644 packages/altboot/files/altboot.rc/.mtn2git_empty delete mode 100644 packages/altboot/files/altboot.rc/Readme.txt delete mode 100644 packages/altboot/files/altboot.rc/disable_printk.sh delete mode 100644 packages/altboot/files/altboot.rc/loadkeymap.sh delete mode 100644 packages/altboot/files/altboot.rc/playbeep.sh delete mode 100755 packages/altboot/files/altbootctl delete mode 100644 packages/altboot/files/altbootctl.conf delete mode 100644 packages/altboot/files/beep.raw delete mode 100644 packages/altboot/files/c7x0/.mtn2git_empty delete mode 100644 packages/altboot/files/c7x0/altboot-2.4.cfg delete mode 100644 packages/altboot/files/c7x0/altboot-2.6.cfg delete mode 100644 packages/altboot/files/collie/.mtn2git_empty delete mode 100644 packages/altboot/files/collie/altboot-2.4.cfg delete mode 100644 packages/altboot/files/fic-gta01/.mtn2git_empty delete mode 100644 packages/altboot/files/fic-gta01/altboot-2.6.cfg delete mode 100644 packages/altboot/files/fic-gta01/altboot-menu/.mtn2git_empty delete mode 100644 packages/altboot/files/fic-gta01/altboot-menu/00-Default delete mode 100644 packages/altboot/files/fic-gta01/altboot-menu/15-bootSD delete mode 100644 packages/altboot/files/fic-gta01/altboot-menu/Advanced/.mtn2git_empty delete mode 100644 packages/altboot/files/fic-gta01/altboot-menu/Advanced/40-bootNFS delete mode 100644 packages/altboot/files/init.altboot delete mode 100644 packages/altboot/files/nslu2le/.mtn2git_empty delete mode 100644 packages/altboot/files/nslu2le/altboot-2.6.cfg delete mode 100644 packages/altboot/files/nslu2le/altboot-handlers/.mtn2git_empty delete mode 100644 packages/altboot/files/nslu2le/altboot-handlers/05-USB-Storage delete mode 100644 packages/altboot/files/nslu2le/altboot-handlers/10-Onboard-Flash delete mode 100644 packages/altboot/files/nslu2le/altboot-menu/.mtn2git_empty delete mode 100644 packages/altboot/files/nslu2le/altboot-menu/00-Default delete mode 100644 packages/altboot/files/nslu2le/altboot-menu/30-bootUSB-Stick delete mode 100644 packages/altboot/files/nslu2le/altboot-menu/55-bin-sh delete mode 100644 packages/altboot/files/nslu2le/altboot.rc/.mtn2git_empty delete mode 100644 packages/altboot/files/poodle/.mtn2git_empty delete mode 100644 packages/altboot/files/poodle/altboot-2.4.cfg delete mode 100644 packages/altboot/files/poodle/altboot-2.6.cfg delete mode 100755 packages/altboot/files/set-bootdev delete mode 100644 packages/altboot/files/spitz/.mtn2git_empty delete mode 100644 packages/altboot/files/spitz/altboot-2.6.cfg delete mode 100644 packages/altboot/files/tosa/.mtn2git_empty delete mode 100644 packages/altboot/files/tosa/altboot-2.4.cfg delete mode 100644 packages/altboot/files/tosa/altboot-2.6.cfg (limited to 'packages') diff --git a/packages/altboot/README.txt b/packages/altboot/README.txt new file mode 100644 index 0000000000..07a41bef3d --- /dev/null +++ b/packages/altboot/README.txt @@ -0,0 +1,5 @@ +altboot_1.0.5.bb - Last known-working version for clamshell + Zauruses running kernel 2.4 +altboot_1.0.8.bb - Last known-working version for all Zauruses +altboot_1.1.1+wip-20061123.bb - Last known-working version for neo1973 +altboot_wip.bb diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb deleted file mode 100644 index 930a30c1ac..0000000000 --- a/packages/altboot/altboot_0.0.0.bb +++ /dev/null @@ -1,99 +0,0 @@ -# -# Copyright Matthias Hentges (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) -# -# Filename: altboot_0.0.0.bb -# Date: 07-May-06 - -DESCRIPTION = "The altboot bootmanager" -HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" -LICENSE = "GPL" -INHIBIT_PACKAGE_STRIP = "1" - -###################################################################################### - -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" - -# Currently the OM image for the Neo is lacking a few basic things... -RDEPENDS_${PN}_fic-gta01 = "${PN}-conf kernel-module-ext2 kernel-module-loop kernel-module-s3cmci " - - -###################################################################################### - -PR = "r52" - -###################################################################################### - -PACKAGES = "${PN}-conf ${PN}-doc ${PN}" - -#PACKAGE_ARCH_${PN} = "all" -PACKAGE_ARCH_${PN}-doc = "all" -PACKAGE_ARCH_${PN}-conf = "${MACHINE}" - -SRC_URI = "file://altboot-menu \ - file://altboot.rc \ - file://altboot.func \ - file://init.altboot \ - file://altboot*.cfg \ - file://altbootctl.conf \ - file://altbootctl \ - file://beep.raw" - -# S = "${WORKDIR}/altboot/" - -###################################################################################### - -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 -m 0644 ${WORKDIR}/beep.raw ${D}/usr/share/sounds - install -m 0644 ${WORKDIR}/altboot*.cfg ${D}/etc - install -m 0644 ${WORKDIR}/altboot.func ${D}/etc - install -m 0644 ${WORKDIR}/altbootctl.conf ${D}/etc - install -m 0755 ${WORKDIR}/init.altboot ${D}/sbin - install -m 0755 ${WORKDIR}/altbootctl ${D}/sbin - - install -m 0755 ${WORKDIR}/altboot-menu/*-* ${D}/etc/altboot-menu - - if test -d ${WORKDIR}/altboot-menu/Advanced - then - install -m 0755 ${WORKDIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced - fi - - install -m 0755 ${WORKDIR}/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${WORKDIR}/altboot.rc/*.txt ${D}/etc/altboot.rc -} - -###################################################################################### - -do_configure() { - cat ${WORKDIR}/init.altboot | sed "s/^VERSION=.*/VERSION=\"0.0.0 Developer Snapshot (${DATE})\"/" > ${WORKDIR}/init.altboot_ - mv ${WORKDIR}/init.altboot_ ${WORKDIR}/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 -} - diff --git a/packages/altboot/altboot_svn.bb b/packages/altboot/altboot_svn.bb new file mode 100644 index 0000000000..baf5116d70 --- /dev/null +++ b/packages/altboot/altboot_svn.bb @@ -0,0 +1,95 @@ +#! /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}" + +###################################################################################### + +PV = "1.1.1+wip-${SRCDATE}" +PR = "r0" + +###################################################################################### + +PACKAGES = "${PN}-conf ${PN}-doc ${PN}" + +PACKAGE_ARCH_${PN} = "all" +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 + 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 +} + diff --git a/packages/altboot/files/.mtn2git_empty b/packages/altboot/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/akita/.mtn2git_empty b/packages/altboot/files/akita/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/akita/altboot-2.4.cfg b/packages/altboot/files/akita/altboot-2.4.cfg deleted file mode 100644 index 4ea84ce32d..0000000000 --- a/packages/altboot/files/akita/altboot-2.4.cfg +++ /dev/null @@ -1,31 +0,0 @@ -# -# Altboot machine configuration for: Akita / Kernel 2.4 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" - -SD_DEVICE="/dev/mmcda1" -SD_KERNEL_MODULE="/lib/modules/2.4.20/kernel/drivers/block/sharp_mmcsd_m.o" - -USB_HOST_AVAILABLE="yes" -USB_STORAGE_MODULES="usb_ohci_pxa27x usb-storage" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/akita/altboot-2.6.cfg b/packages/altboot/files/akita/altboot-2.6.cfg deleted file mode 100644 index 62e8ea2434..0000000000 --- a/packages/altboot/files/akita/altboot-2.6.cfg +++ /dev/null @@ -1,41 +0,0 @@ -# -# Altboot machine configuration for: Akita / Kernel 2.6 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -ENABLE_SOUND="yes" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" -ENABLE_IMAGECONF="yes" - -SD_DEVICE="/dev/mmcblk0p1" -SD_KERNEL_MODULE="" - -USB_HOST_AVAILABLE="yes" -USB_STORAGE_MODULES="ohci_hcd usb_storage sd_mod" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -USB_NETWORKING_AVAILABLE="yes" -USB_NW_MODULES="usbcore pxa27x_udc ohci-hcd g_ether" -USB_NW_DEVICE="usb0" - -KEXEC_KERNEL_DIR="/boot" -KEXEC_BIN="/usr/sbin/kexec" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/altboot-menu/.mtn2git_empty b/packages/altboot/files/altboot-menu/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/altboot-menu/00-Default b/packages/altboot/files/altboot-menu/00-Default deleted file mode 100644 index 9d29fdae2a..0000000000 --- a/packages/altboot/files/altboot-menu/00-Default +++ /dev/null @@ -1,14 +0,0 @@ -# !/bin/sh -M_TITLE="Normal Boot" - - -run_module() { - exec $REAL_INIT "$INIT_RUNLEVEL" - exit 0 -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/altboot-menu/10-noGui b/packages/altboot/files/altboot-menu/10-noGui deleted file mode 100644 index cf3c10c381..0000000000 --- a/packages/altboot/files/altboot-menu/10-noGui +++ /dev/null @@ -1,16 +0,0 @@ -# !/bin/sh -M_TITLE="Don't launch GUI" - -test "$DISABLE_NOGUI_BOOT" = yes && exit 0 - - -run_module() { - clear ; exec $REAL_INIT "$NO_GUI_RL" - exit 0 -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/altboot-menu/15-bootSD b/packages/altboot/files/altboot-menu/15-bootSD deleted file mode 100644 index 3cf49deea5..0000000000 --- a/packages/altboot/files/altboot-menu/15-bootSD +++ /dev/null @@ -1,32 +0,0 @@ -# !/bin/sh -# -# Copyright Matthias Hentges (c) 2005 -# -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the GPL) - - -M_TITLE="Boot SD card" - -test "$DISABLE_SD_BOOT" = yes && exit 0 - -# This function is activated by init.altboot by calling this script with the "run" option -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - # Mount /proc, etc - init_rootfs - - mount_sd - - # Check for a real fs and loop-images. - check_target "$SD_MOUNTPOINT" >/dev/tty0 - -} - - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/altboot-menu/20-bootCF b/packages/altboot/files/altboot-menu/20-bootCF deleted file mode 100644 index 4add6e6631..0000000000 --- a/packages/altboot/files/altboot-menu/20-bootCF +++ /dev/null @@ -1,32 +0,0 @@ -# !/bin/sh -# -# Copyright Matthias Hentges (c) 2005 -# -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the GPL) - - -M_TITLE="Boot CF card" - -test "$DISABLE_CF_BOOT" = yes && exit 0 - -# This function is activated by init.altboot by calling this script with the "run" option -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - # Mount /proc, etc - init_rootfs - - mount_cf - - # Check for a real fs and loop-images. - check_target "$CF_MOUNTPOINT" - -} - - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/altboot-menu/99-ownScripts-example b/packages/altboot/files/altboot-menu/99-ownScripts-example deleted file mode 100644 index 7566416b87..0000000000 --- a/packages/altboot/files/altboot-menu/99-ownScripts-example +++ /dev/null @@ -1,68 +0,0 @@ -# !/bin/sh -# -# Copyright Matthias Hentges (c) 2005 -# -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the GPL) - - -# This file will teach you how to implement your own scripts while using existing altboot -# code. - -# /sbin/init.altboot searches /etc/altboot-menu for scripts. It will only list scripts which -# return a title when run with the "title" parameter. -# Script which do not return a title will never be shown in the boot menu! -# -M_TITLE="altboot sample" - -# We can use that to deactivate certain scripts: -exit 0 - -# The "title" parameter is implemented at the end of this script so it will never be reached -# and the script will simply be ignored by altboot. - -# This function is activated by init.altboot by calling this script with the "run" option -run_module() { - - # altboot.func contains re-useable code. If you intend to use check_target (see below) - # you must keep this line. If not, delete it. - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - - # The only thing you'll have to do is get your medium mounted. - # The following lines mount a SD card on 2.4-series kernels on a Zaurus - - ########################################## - - # Mount /proc, etc - init_rootfs - - echo -n "Loading SD kernel module..." - /sbin/insmod $SD_KERNEL_MODULE >/dev/null 2>&1 && echo ok || die "insmod failed" - - echo -n "Mounting $SD_MOUNTPOINT..." >/dev/tty0 - /bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT >/dev/null 2>&1 && echo ok >/dev/tty0|| die "/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT failed" - - echo "" - - # Give the SD and CF mounting some time. This is a must for SD - sleep 2 - ########################################## - - # Once the medium (be it a CF or SD card, or even a NFS drive) is mounted somewhere, - # just call check_target with the mountpoint as parameter. - # check_target searches the medium for a real filesystem and loop-images and - # asks the user what to boot if there are several choices. - - # Check for a real fs and loop-images. - check_target "$SD_MOUNTPOINT" >/dev/tty0 - - # Done :) - -} - - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/altboot-menu/Advanced/.mtn2git_empty b/packages/altboot/files/altboot-menu/Advanced/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick b/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick deleted file mode 100644 index b573e7a10c..0000000000 --- a/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick +++ /dev/null @@ -1,47 +0,0 @@ -# !/bin/sh -# -# Copyright Matthias Hentges (c) 2005 -# -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the GPL) - - -M_TITLE="Boot USB Storage" - -test "$USB_HOST_AVAILABLE" = "yes" || exit 0 - -# This function is activated by init.altboot by calling this script with the "run" option -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - # Mount /proc, etc - init_rootfs - - echo "Starting USB..." - - for module in $USB_STORAGE_MODULES - do - echo -en "\t - $module: " - modprobe "$module" >/dev/null 2>&1 && echo ok || die "Failed to modprobe [$module]" - done - - echo -n "Mounting $USB_STORAGE_PARTITION..." >/dev/tty0 - - mkdir -p /media/usb-storage >/dev/null 2>&1 - - sleep "$USB_STORAGE_WAIT" - - /bin/mount -t auto -o defaults,noatime $USB_STORAGE_PARTITION /media/usb-storage >/dev/null 2>&1 && echo ok >/dev/tty0|| die "/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT failed" - - echo "" - - # Check for a real fs and loop-images. - check_target "/media/usb-storage" >/dev/tty0 -} - - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS deleted file mode 100644 index 4f5c195be2..0000000000 --- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS +++ /dev/null @@ -1,110 +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: 40-bootNFS -# Date: 14-Apr-06 - - -M_TITLE="Boot from NFS" - -test "$DISABLE_NFS_BOOT" = yes && exit 0 - -# This function is activated by init.altboot by calling this script with the "run" option -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - # Mount /proc, etc - init_rootfs - - nfs_host="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'|sed -n "s/\(.*\)\:\(.*\)/\1/p" `" - nfs_mounts="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'`" - nfs_mountpoints="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $2}'`" - - start_networking "$nfs_host" - - if test -z "$nfs_host" - then - mdie "${C_RED}No configured NFS drives found in /etc/fstab$C_RESET" - - fi - - - if test "` echo "$nfs_mountpoints" |wc -l | tr -d " "`" -gt 1 - then - echo -e "Please select your NFS root:\n" - - cnt=1 - for nfs_mount in $nfs_mountpoints - do - echo -e "\t[$cnt] $nfs_mount" - let cnt=$cnt+1 - done - - echo "" - - while test -z "$selection" - do - stty echo - echo -n "Boot NFS root: " - - if test "$AUTOBOOT" != "yes" - then - read junk < /dev/tty1 - else - if test -e /etc/.altboot-bootNFS-source.last - then - junk="`cat /etc/.altboot-bootNFS-source.last`" - test -z "$junk" && read junk < /dev/tty1 || echo "$junk (autoboot)" - else - read junk < /dev/tty1 - fi - fi - - - cnt=1 - for nfs_mount in $nfs_mounts - do - if test "$junk" = "$cnt" - then - selection="$nfs_mount" - echo "$junk" > /etc/.altboot-bootNFS-source.last - fi - let cnt=$cnt+1 - done - - done - else - test -z "$nfs_mounts" && die "No NFS mounts configured in /etc/fstab!" - selection="$nfs_mounts" - fi - - mkdir -p /media/nfsroot || mdie "mkdir -p /media/nfsroot failed!" - - echo -n "Mounting NFS root..." - - if ( mount | grep -q "/media/nfsroot" ) - then - echo "/media/nfsroot already used, tying to umount..." - umount /media/image - losetup -d /dev/loop0 - umount /media/nfsroot || die "umount failed!" - fi - - mount -t nfs "$selection" /media/nfsroot && echo ok || mdie "mount -t nfs "$selection" /media/nfsroot failed!" - - # Use configured resolv.conf in the pivoted rootfs - #echo -n "Copying resolv.conf..." - #cp /etc/resolv.conf /media/nfsroot/etc && echo ok || echo "FAILED" - - check_target "/media/nfsroot" bootNFS - -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/altboot-menu/Advanced/55-bin-sh b/packages/altboot/files/altboot-menu/Advanced/55-bin-sh deleted file mode 100644 index e4fe99ebae..0000000000 --- a/packages/altboot/files/altboot-menu/Advanced/55-bin-sh +++ /dev/null @@ -1,27 +0,0 @@ -# !/bin/sh -M_TITLE="init=/bin/sh" - -test "$DISABLE_BINSH_BOOT" = yes && exit 0 - -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - test "$ASK_PW_ON_BOOT" != "yes" && verify_master_pw >/dev/$OUT_TTY - - # Mount /proc, etc - init_rootfs - - echo -e "\nBoot system with 'exec /sbin/init 5'\n" - while true - do - exec $SH_SHELL /dev/$OUT_TTY 2>&1 - echo "WARNING: Shell was killed!" - done -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/altboot-menu/Advanced/60-orig-init b/packages/altboot/files/altboot-menu/Advanced/60-orig-init deleted file mode 100644 index ad9f2c78e1..0000000000 --- a/packages/altboot/files/altboot-menu/Advanced/60-orig-init +++ /dev/null @@ -1,20 +0,0 @@ -# !/bin/sh -M_TITLE="Boot original INIT" - -exit 0 - -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - echo "altboot: Using real init [$REAL_INIT] [$INIT_RUNLEVEL] *" >/dev/tty1 - exec $REAL_INIT $INIT_RUNLEVEL - exit 0 - -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/altboot-menu/Advanced/70-install-tgz b/packages/altboot/files/altboot-menu/Advanced/70-install-tgz deleted file mode 100644 index b6e5d94d5d..0000000000 --- a/packages/altboot/files/altboot-menu/Advanced/70-install-tgz +++ /dev/null @@ -1,266 +0,0 @@ -#!/bin/sh -M_TITLE="Install RootFS from tar.gz" -M_FLAGS="noRemember" - -test "$DISABLE_INSTTGZ_BOOT" = yes && exit 0 - -run_module(){ - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - # Mount /proc, etc - init_rootfs - - # Mount - mount_sd ingore_errors - mount_cf - mount_home - - for source in /home /media/card /media/cf - do - #echo "source: [$source]" - rootfs_files="`ls -1 $source | grep "rootfs.tar.gz"`" - - #echo "rootfs_file: [$rootfs_files]" - if test "`echo "$rootfs_files" | wc -l | tr -d " "`" -gt 1 - then - echo "Multiple rootfs files not supported, yet" - else - if test -n "$rootfs_files" - then - rootfs_source="$source/$rootfs_files" - echo "Using [$rootfs_source]" - break - fi - fi - done - - test -z "$rootfs_source" && die "No rootfs.tar.gz found" - - echo -e "\nPlease choose the target of this installation:\n" - - echo -e "\t [1] SD / MMC" - echo -e "\t [2] Compact Flash" - - echo "" - while true - do - echo -n "Your target: " - read junk - - case "$junk" in - 1) if (mount | grep -q "/media/card ") - then - rootfs_target="/media/card"; break - else - echo -e "\nInstallation target [/media/card] not mounted\n" - fi ;; - 2) if (mount | grep -q "/media/cf ") - then - rootfs_target="/media/cf"; break - else - echo -e "\nInstallation target [/media/cf] not mounted\n" - fi ;; - esac - done - - echo -e "\nPlease choose the type of this installation:\n" - - echo -e "\t [1] Imagefile (loopfile)" - echo -e "\t [2] Direct Install" - - echo "" - while true - do - echo -n "Install type: " - read junk - - case "$junk" in - 1) if test -x /sbin/mkfs.ext2 - then - rootfs_type="image" - break - else - echo -e "\nNOTE: mkfs.ext2 (from e2fsprogs-mke2fs) not found, loop-images not supported\n" - fi ;; - 2) rootfs_type="direct" ; break ;; - esac - done - - case "$rootfs_type" in - image) install_rootfs_image "$rootfs_target";; - direct) install_rootfs_direct "$rootfs_target";; - esac -} - -clear_directories(){ - test "$1" = "/" -o "$1" = "/ " && die "clear_directories(): You don't want to do that." - - ! test -d "$1" && die "clear_directories(): [$1] not found." - - for d in bin dev media proc sys usr boot etc lib mnt sbin tmp var - do - if test -d "$1/$d" - then - echo "Removing [$1/$d]..." - rm -rf "$1/$d" - fi - done - -} - - -install_rootfs_direct(){ - - mount | grep -q "$1 " || die "Installation target [$1] not mounted" - - echo -e "Do you want to remove existing directories from [$1]\n before installing the new rootfs?" - echo "" - - while true - do - echo -n "Remove old directories? [Y|n] " - read junk /dev/tty0 2>&1 - - case "$junk" in - Y|y|"") clear_directories "$1"; break ;; - esac - done - - echo "Please press to begin the installation" - read junk /dev/tty0 2>&1 - - test -d "$1" || die "Directory [$1] not found" - - echo -n "Installing rootfs, please wait..." - tar -xzf "$rootfs_source" -C "$1" >/dev/null 2>&1 && echo ok || die "tar -xzf \"$rootfs_source\" -C \"$1\" failed!" - - echo -n "Syncing drives..." - sync - echo "done" - -# umount "$1" - - echo "Press to bring up the altboot menu" - read junk /dev/tty0 2>&1 - exec /sbin/init.altboot -force - -} - -install_rootfs_image(){ - - mount | grep -q "$1 " || die "Installation target [$1] not mounted" - - echo "" - echo "Please enter a name for the image file." - echo "Do not use the character" - echo "" - - - while true - do - echo -n "Image name: " - read junk - - if test -n "$junk" - then - if test -e "$1/boot-images/${junk}-rootfs.bin" - then - echo -e "\nFile [$1/boot-images/${junk}-rootfs.bin] already exists." - - while true - do - echo -n "Overwrite? [y|N] " - read junk2 - - case "$junk2" in - Y|y) break;; - n|N|"") install_rootfs_image "$1" - exit 0;; - esac - done - rootfs_image_name="${junk}-rootfs.bin" - break - else - echo -n "Use [$junk] as name? [Y|n] " - read junk2 - - case "$junk2" in - "Y"|"y"|"") rootfs_image_name="${junk}-rootfs.bin" - break ;; - *) echo "err ]$junk]";; - esac - fi - fi - done - - echo "" - echo "Please enter the image size in MegaBytes" - echo "Must be at least 30Mb" - echo "" - - while true - do - echo -n "Image size: " - read junk - - junk="`echo "$junk" | sed "s/[a-zA-Z]//g"`" - - if test -n "$junk" - then - if test "$junk" -gt 29 - then - echo -n "Is [${junk}Mb] correct? [Y|n] " - read junk2 - - case "$junk2" in - Y|y|"") rootfs_image_size="$junk" - break ;; - esac - - else - echo "Image size of [${junk}Mb] is too small!" - fi - fi - done - - test -z "$rootfs_image_name" -o -z "$rootfs_image_size" && die "DEBUG: Empty VAR in install_rootfs_image()" - - echo "" - echo "Creating [$rootfs_image_name] (${rootfs_image_size}Mb) on [$1]" - echo "Please wait..." - mkdir -p "$1/boot-images" - - dd if=/dev/zero of="$1/boot-images/$rootfs_image_name" bs=1024k count=$rootfs_image_size >/dev/null - - echo -n "Creating an ext2 filesystem on $rootfs_image_name..." - losetup /dev/loop0 "$1/boot-images/$rootfs_image_name" || die "losetup /dev/loop0 \"$1/boot-images/$rootfs_image_name\" failed!" - mkfs.ext2 -m0 /dev/loop0 >/dev/null 2>&1 && echo done || die "mkfs.ext2 -m0 /dev/loop0 failed!" - - echo -n "Mounting loopfile..." - mkdir -p /media/image - mount /dev/loop0 /media/image && echo ok || die "mount /dev/loop0 /media/image failed!" - - echo -n "Installing rootfs, please wait..." - tar -xzf "$rootfs_source" -C "/media/image" >/dev/null 2>&1 && echo ok || die "tar -xzf \"$rootfs_source\" -C \"$1\" failed!" - - echo -n "Syncing drives..." - sync - echo "done" - - umount "/media/image" && losetup -d /dev/loop0 - - echo "Press to bring up the altboot menu" - read junk /dev/tty0 2>&1 - exec /sbin/init.altboot -force - -} - - - -#run_module - -case "$1" in -title) echo "$M_TITLE";; -flags) echo "$M_FLAGS";; -run) run_module "$2";; -esac diff --git a/packages/altboot/files/altboot-menu/Advanced/70-setKernel b/packages/altboot/files/altboot-menu/Advanced/70-setKernel deleted file mode 100644 index 50f61d034f..0000000000 --- a/packages/altboot/files/altboot-menu/Advanced/70-setKernel +++ /dev/null @@ -1,68 +0,0 @@ -# !/bin/sh -M_TITLE="Choose kernel for next boot" - -# Deprecated due to altbootctl -exit 0 - -# Only kernel 2.6 offers kexec support -uname -r | grep -q "^2.6" || exit 0 - -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - test -z "$KEXEC_KERNEL_DIR" && KEXEC_KERNEL_DIR="/boot" - test -x "$KEXEC_BIN" || mdie "kexec-tools not found [$KEXEC_BIN]" - - # Mount /proc, etc - # init_rootfs - - if test `ls -1 $KEXEC_KERNEL_DIR | grep -v "kexec.cfg" | wc -l | tr -d " "` -gt 1 - then - echo -e "\nSelect the kernel for use of the next boot:\n" - - cnt=1 ; reset_pref "kexec_klist" - for k in `ls -1 $KEXEC_KERNEL_DIR/zImage* | grep -v "kexec.cfg" ` - do - echo -e "\t[$cnt] $k" - set_pref "kexec_klist" "$cnt" "$k" - - let cnt=$cnt+1 - done - - echo "" - - while true - do - echo -n "Select a kernel: " - read junk - - #echo_pref kexec_klist - - get_pref "kexec_klist" "$junk" KEXEC_SELECTED_KERNEL && break - - done - else - KEXEC_SELECTED_KERNEL="`ls -1 $KEXEC_KERNEL_DIR/zImage* | grep -v "kexec.cfg" `" - fi - - echo -e "\nUsing [$KEXEC_SELECTED_KERNEL]" - - if ! test -e "$KEXEC_SELECTED_KERNEL.kexec.cfg" - then - echo -e "\nWARNING: This kernel has not been configured." - echo -e "It will only boot correctly if CMDLINE is compiled in.\n" - fi - - export USE_KEXEC_ON_NEXT_BOOT=yes - export KEXEC_SELECTED_KERNEL - show_menu -} - - - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/altboot-menu/Advanced/80-configure-kexec b/packages/altboot/files/altboot-menu/Advanced/80-configure-kexec deleted file mode 100644 index 1b8fc6e547..0000000000 --- a/packages/altboot/files/altboot-menu/Advanced/80-configure-kexec +++ /dev/null @@ -1,248 +0,0 @@ -# !/bin/sh -M_TITLE="Configure kexec CMDLINE" - -# Deprecated due to altbootctl -exit 0 - - -# Only kernel 2.6 offers kexec support -uname -r | grep -q "^2.6" || exit 0 - -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - test -z "$KEXEC_KERNEL_DIR" && KEXEC_KERNEL_DIR="/boot" - test -x "$KEXEC_BIN" || mdie "kexec-tools not found [$KEXEC_BIN]" - - # Mount /proc, etc - init_rootfs - - if test `ls -1 $KEXEC_KERNEL_DIR | grep -v "kexec.cfg" | wc -l | tr -d " "` -gt 1 - then - echo -e "\nPlease select the kernel you want to configure:\n" - - cnt=1 ; reset_pref "kexec_klist" - for k in `ls -1 $KEXEC_KERNEL_DIR/zImage* | grep -v "kexec.cfg" ` - do - echo -e "\t[$cnt] $k" - set_pref "kexec_klist" "$cnt" "$k" - - let cnt=$cnt+1 - done - - echo "" - - while true - do - echo -n "Select a kernel: " - read junk - - get_pref "kexec_klist" "$junk" KEXEC_KERNEL && break - - done - else - KEXEC_KERNEL="`ls -1 $KEXEC_KERNEL_DIR/zImage* | grep -v "kexec.cfg" `" - fi - - echo -e "\nUsing [$KEXEC_KERNEL]" - - configure_rootdev - configure_roottype - configure_verbose - configure_custom - - CMDLINE="console=ttyS0,115200n8 console=tty1 dyntick=enable fbcon=rotate:1 noinitrd root=$KERNEL_ROOTDEV rootfstype=$KERNEL_ROOTFSTYPE $KERNEL_VERBOSE $KERNEL_CUSTOM" - - echo -en "\nWriting CMDLINE to $KEXEC_KERNEL.kexec.cfg..." - echo "$CMDLINE" > $KEXEC_KERNEL.kexec.cfg && echo ok || mdie FAILED - - show_menu -} - -configure_rootdev() { - - echo -e "\nPlease choose a root device (root=*):\n" - - cnt=1 ; reset_pref "kexec_rootdev" - for root in /dev/mtdblock2 /dev/hda1 "Manual Entry" - do - echo -e "\t[$cnt] $root" - set_pref kexec_rootdev "$cnt" "$root" - let cnt=cnt+1 - done - - echo "" - - while true - do - echo -n "Select a root device: " - read junk - - get_pref kexec_rootdev "$junk" KERNEL_ROOTDEV && break - done - - if test "$KERNEL_ROOTDEV" = "Manual Entry" - then - echo "" - - KERNEL_ROOTDEV="" - - while test -z "$KERNEL_ROOTDEV" - do - while true - do - echo -n "Enter the root device: " - read junk - test -n "$junk" && break - done - - echo -en "\nIs [$junk] correct? [Y|n] " - read junk2 - while true - do - if test "$junk2" = y -o "$junk2" = Y -o -z "$junk2" - then - KERNEL_ROOTDEV="$junk" - break - fi - - break - done - done - fi - - echo "Using [$KERNEL_ROOTDEV] as root device" -} - -configure_roottype() { - - echo -e "\nPlease choose a rootfs type (rootfs=*):\n" - - cnt=1 ; reset_pref "kexec_rootfstype" - for root in jffs2 ext2 ext3 "Manual Entry" - do - echo -e "\t[$cnt] $root" - set_pref kexec_rootfstype "$cnt" "$root" - let cnt=cnt+1 - done - - echo "" - - while true - do - echo -n "Select a rootfs type: " - read junk - - get_pref kexec_rootfstype "$junk" KERNEL_ROOTFSTYPE && break - done - - if test "$KERNEL_ROOTFSTYPE" = "Manual Entry" - then - echo "" - - KERNEL_ROOTFSTYPE="" - - while test -z "$KERNEL_ROOTFSTYPE" - do - while true - do - echo -n "Enter the rootfs type: " - read junk - test -n "$junk" && break - done - - echo -en "\nIs [$junk] correct? [Y|n] " - read junk2 - while true - do - if test "$junk2" = y -o "$junk2" = Y -o -z "$junk2" - then - KERNEL_ROOTFSTYPE="$junk" - break - fi - - break - done - done - fi - - echo "Using [$KERNEL_ROOTFSTYPE] as rootfs type" -} - -configure_verbose() { - echo -e "\nDo you want to see kernel messages? ([quiet | debug]):\n" - - echo -e "\t[1] Yes" - echo -e "\t[2] No" - - echo "" - - while true - do - echo -n "Select one of the above: " - read junk - - test "$junk" = 1 -o "$junk" = 2 && break - done - - test "$junk" = 1 && KERNEL_VERBOSE="debug" || KERNEL_VERBOSE="quiet" - -} - -configure_custom() { - echo -e "\nDo you want to set custom kernel options?\n" - - echo -e "\t[1] Yes" - echo -e "\t[2] No" - - echo "" - - while true - do - echo -n "Select one of the above: " - read junk - - test "$junk" = 1 -o "$junk" = 2 && break - done - - if test "$junk" = 1 - then - - echo "" - - KERNEL_CUSTOM="" - - while test -z "$KERNEL_CUSTOM" - do - while true - do - echo -n "Enter kernel options: " - read junk - test -n "$junk" && break - done - - echo -en "\nIs [$junk] correct? [Y|n] " - read junk2 - while true - do - if test "$junk2" = y -o "$junk2" = Y -o -z "$junk2" - then - KERNEL_CUSTOM="$junk" - break - fi - - break - done - done - fi - - echo "Using [$KERNEL_CUSTOM] as custom kernel options" - -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs b/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs deleted file mode 100644 index 2d305e349f..0000000000 --- a/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs +++ /dev/null @@ -1,323 +0,0 @@ -# !/bin/sh -M_TITLE="Copy rootfs to SD/CF" -M_FLAGS="noRemember" - -# Unfinished script. -exit 0 - -ask_target() { - available_disks="`mount | grep "/media" | grep -v ram | awk '{print $3}'`" - - if test -z "$available_disks" - then - die "No mounted targets found!" - fi - - cnt=1 - for d in $available_disks - do - echo -e "\t[$cnt] $d" - let cnt=$cnt+1 - done - - while test -z "$ROOTFS_TARGET" - do - echo -n "Target: " - read junk /dev/null 2>&1 - then - echo -n "Use [$junk]MB? [y|n] " - read junk2 - if test "$junk2" = y - then - ROOTFS_IMAGE_SIZE="$junk" - fi - fi - done - - echo -e "\nPlease enter a name for the image file." - echo "The name must _not_ contain whitespaces or the '-' sign." - - while test -z "$ROOTFS_IMAGE_NAME" - do - echo -n "File name: " - read junk - - if ! test -z "$junk" - then - echo -n "Use [$junk] as image name? [y|n] " - read junk2 - - if test "$junk2" = y - then - ROOTFS_IMAGE_NAME="$junk" - fi - fi - done - - echo -e "\nDo you want to format [$ROOTFS_TARGET_DEV] to the ext2 filesystem?" - - while true - do - echo -n "Format to ext2? [y|n] " - read junk - case "$junk" in - y) format_target - break ;; - n) break ;; - esac - done - - /etc/init.d/devices start - - echo -en "\nCreating image file [$ROOTFS_TARGET/$IMAGE_PATH/$ROOTFS_IMAGE_NAME-rootfs.bin] (${ROOTFS_IMAGE_SIZE}MB)..." - mkdir -p "$ROOTFS_TARGET/$IMAGE_PATH" - - dd if=/dev/zero of="$ROOTFS_TARGET/$IMAGE_PATH/$ROOTFS_IMAGE_NAME-rootfs.bin" bs=1024k count=$ROOTFS_IMAGE_SIZE >/dev/null 2>&1 && echo ok || die "FAILED" - losetup /dev/loop1 "$ROOTFS_TARGET/$IMAGE_PATH/$ROOTFS_IMAGE_NAME-rootfs.bin" - - echo -n "Creating filesystem..." - mkfs.ext2 -m0 /dev/loop1 >/dev/null 2>&1 && echo ok || die FAILED - - mkdir -p /media/temp - mount /dev/loop1 /media/temp || die "mount /dev/loop1 /media/temo FAILED!" - - copy_files - -} - -copy_files() { - echo -e "\nCopying files..." - - exclude_list="tmp sys proc var dev media root" - mkdir_list="var proc sys dev media/card media/cf /media/hdd" - - if (cat /etc/fstab | grep -q "/home") - then - echo "Note: /home appears to be mounted on a different flash partition: not copying /home" - exclude_list="$exclude_list home" - mkdir_list="$mkdir_list home/root" - - fi - - - - source_dirs="`ls -1 /`" - - echo -n "Excluding [" - for d in $exclude_list - do - echo -n "$d " - source_dirs="`echo "$source_dirs" | grep -v "$d"`" - done - echo "] from copy" - - - cd / - for dir in $source_dirs - do - if test -d "$dir" - then - echo -n "Copying [$dir]..." - cp -a $dir /media/temp && echo ok || echo FAILED - fi - done - - for dir in $mkdir_list - do - mkdir -p /media/temp/$dir - done - - rm /media/temp/etc/rcS.s/S39sd - -} -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - echo -e "${C_RED}* * * * * WARNING * * * * *${C_RESET}" - echo -e "${C_RED}Continueing will delete the content of the selected target device.\nTHIS IS NO JOKE. If you do now know what this menu-item does, exit NOW${C_RESET}" - - mount -o remount,rw / - - while true - do - echo -en "\nContinue? [y|n] " - read junk /dev/null 2>&1 && echo ok || echo "FAILED" -# -# echo -n "Trying to mount SD card..." -# /etc/init.d/sd start >/dev/null 2>&1 -# sleep 3 -# /etc/sdcontrol insert >/dev/null 2>&1 && echo ok || echo "FAILED" - - #exit 0 - echo -e "\nPlease select the target device:" - - # Sets ROOTFS_TARGET* - ask_target - - # Sets ROOTFS_TARGET_TYPE ([direct | image] - ask_format - - # Ask confirmation - ask_confirm - - case "$ROOTFS_TARGET_TYPE" in - direct) direct_install;; - image) image_install;; - esac -} - -case "$1" in -title) echo "$M_TITLE";; -flags) echo "$M_FLAGS";; -run) run_module;; -esac diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func deleted file mode 100644 index ae38c5b437..0000000000 --- a/packages/altboot/files/altboot.func +++ /dev/null @@ -1,870 +0,0 @@ -#! /bin/sh - -C_RED="\033[31m" -C_YELLOW="\033[35m" -C_BLUE="\033[34m" -C_WHITE="\033[38m" -C_RESET="\033[0m" - - -# This function checks for the presence of a real filesystem and loop-images on the target -# $1 = folder of rootfs, $2 = runlevel (defaults to 5) -# $2 = name of calling module -check_target() { - # Check if there is a /sbin/init or /sbin/init.sysvinit on the card - if test -x $1/sbin/init -o -x $1/$REAL_INIT - then - real_fs_found=1 - else - echo -e "Note: No INIT [$REAL_INIT] found on target" - fi - - # Check for loop-images - if (ls $1/$IMAGE_PATH/*rootfs.bin) >/dev/null 2>&1 - then - image_found=1 - else - echo "Note: No boot-images found in [$1/$IMAGE_PATH]" - fi - - # Check if we have both, a real fs and boot-images. If so, ask the user what to boot - if test "$real_fs_found" = 1 -a "$image_found" = 1 - then - echo -e "\nI have found a real filesystem and boot-images on the target" - echo -e "What do you want to boot?\n" - - echo -e "\t[1] The real filesystem" - echo -e "\t[2] A loop-image" - echo "" - - while test -z "$ans" - do - echo -n "Your choice: " - - if test "$AUTOBOOT" != "yes" - then - read junk < "$OUT_TTY" - else - if test -e /etc/.altboot-real-or-loop.last - then - junk="`cat /etc/.altboot-real-or-loop.last`" - test -z "$junk" && read junk < "$OUT_TTY" || echo "$junk (autoboot)" - else - read junk < "$OUT_TTY" - fi - fi - - if test "$junk" = 1 -o "$junk" = 2 - then - ans="$junk" - echo "$junk" > /etc/.altboot-real-or-loop.last - fi - done - - case "$ans" in - 1) pivot_realfs "$1" "$2">"$OUT_TTY";; - 2) pivot_image "$1" "$2">"$OUT_TTY";; - esac - - exit 0 - fi - - # Boot a real filesystem - test "$real_fs_found" = 1 && pivot_realfs "$1" >"$OUT_TTY" - - # Boot a loop-image - test "$image_found" = 1 && pivot_image "$1" >"$OUT_TTY" - - if test "$real_fs_found" != 1 -a "$image_found" != 1 - then - mdie "No direct-install or loop-images found. Nothing to do!" - fi -} - -boot_new_rootfs_splash() { -C_RED="\033[37;44m" -C_RESET="\033[0m" - - echo -e "${C_RED}+----------------------------------------------------------+${C_RESET}" - echo -e "${C_RED}| |${C_RESET}" - echo -e "${C_RED}| Booting the selected rootfs... |${C_RESET}" - echo -e "${C_RED}| |${C_RESET}" - echo -e "${C_RED}+----------------------------------------------------------+${C_RESET}" - -} - -# This function pivot_root's into a real filesystem calling $newrootfs/sbin/init -# $1 = The new rootfs -pivot_realfs() { - #test -z "$2" && RL="5" || RL="$2" - mkdir -p $1/media/ROM || die "mkdir -p $1/media/ROM failed" - - mount -o remount,ro / >/dev/null 2>&1 - - test "$ENABLE_IMAGECONF" = yes && image_conf $1 - - do_pivot "$1" "$RL" -} - -# This function loop-mounts an image-file and pivot_root's into it -# $1: The new rootfs -pivot_image() { - #test -z "$2" && RL="5" || RL="$2" - cd $1/$IMAGE_PATH - - # Check for rootfs images on the card - if test "`ls *rootfs.bin | wc -l | tr -d " "`" -gt 1 - then - echo -e "\n\nPlease select a rootfs:\n" - - # Show all available images - x=0 - for file in `ls *rootfs.bin` - do - let x=$x+1 - echo -e "\t\t[$x] $file" - done - - echo "" - - IMAGE_NAME="" - while test -z "$IMAGE_NAME" - do - echo -en "Please choose one of the above: " - if test "$AUTOBOOT" != "yes" - then - read junk < "$OUT_TTY" - else - if test -e /etc/.altboot-loopimage.last - then - junk="`cat /etc/.altboot-loopimage.last`" - test -z "$junk" && read junk < "$OUT_TTY" || echo "$junk (autoboot)" - else - read junk < "$OUT_TTY" - fi - fi - - x=0 - for file in `ls *rootfs.bin` - do - let x=$x+1 - if test "$x" = "$junk" - then - IMAGE_NAME="$file" - echo "$junk" > /etc/.altboot-loopimage.last - fi - done - done - else - IMAGE_NAME="`ls *rootfs.bin`" - test -z "$IMAGE_NAME" && die "No rootfs found (*rootfs.bin) in $1/$IMAGE_PATH" - fi - - - echo "" - - mkdir -p /media/image || die "mkdir -p /media/image failed" - - LOOP_MODULE="$(find /lib/modules/`uname -r`/ -name "loop.ko")" - test -n "$LOOP_MODULE" && ( insmod "$LOOP_MODULE" ; sleep 3 ) - - ! test -e /dev/loop0 && mknod /dev/loop0 b 7 0 - - losetup /dev/loop0 $1/$IMAGE_PATH/$IMAGE_NAME || die "losetup /dev/loop0 $1/$IMAGE_PATH/$IMAGE_NAME failed!" - check_fs /dev/loop0 $IMAGE_TYPE - - echo -e "\n* * * Mounting rootfs image * * *\n" - - # Busybox's "mount" doesn't seem to like "-o loop" for some reason - # It works on collie and b0rks on poodle. - if [ "$IMAGE_TYPE" = "" ]; then - IMAGE_TYPE="auto" - fi - - # If mount fails it has the tendency to spew out a _lot_ of error messages. - # We direct the output to /dev/null so the user can see which step actually failed. - mount /dev/loop0 -t $IMAGE_TYPE /media/image >/dev/null 2>&1 || die "mount -t $IMAGE_TYPE /dev/loop0 /media/image failed!" - - mkdir -p /media/image/media/ROM || die "mkdir -p /media/image/media/ROM failed" - - test "$ENABLE_IMAGECONF" = yes && image_conf /media/image - - do_pivot /media/image "$RL" -} - -#$1=mountpoint of the soon-to-be rootfs, $2=Runlevel -do_pivot(){ - - if test "$USE_KEXEC_ON_NEXT_BOOT" = yes - then - if test -e "$KEXEC_SELECTED_KERNEL.kexec.cfg" - then - CMDLINE="--append=\"`cat $KEXEC_SELECTED_KERNEL.kexec.cfg`\"" - else - CMDLINE="" - echo "WARNING: This kernel has not been configured!" - echo "Trying to boot anyway..." - fi - - echo "$KEXEC_BIN -l $KEXEC_SELECTED_KERNEL $CMDLINE" - $KEXEC_BIN -l $KEXEC_SELECTED_KERNEL $CMDLINE - sync - - read junk - $KEXEC_BIN -e - exit 0 - fi - - - echo -n "Pivoting root..." - if (/sbin/pivot_root "$1" "$1/media/ROM") - then - echo "Success" - - # This is important since we are still cd'ed into the old root - cd / - - ! test -d "$1" && mkdir -p "$1" - - # Move mountpoints from the old rootfs into the new one. - # The *real* mount is kinda touchy feely about that - /bin/busybox mount -o move /media/ROM/proc /proc >/dev/null 2>&1 - - for mpt in ` mount | grep "/media/ROM/" | awk '{print $3}'` - do - new_mpt="`echo "$mpt" | sed -n "s/\/media\/ROM//p"`" - - echo "Moving mountpoint [$mpt] -> [$new_mpt]" >"$OUT_TTY" 2>&1 - - ! test -d "$new_mpt" && mkdir -p "$new_mpt" - /bin/busybox mount -o move "$mpt" "$new_mpt" - done - - clear - boot_new_rootfs_splash - echo "Calling INIT" - - exec /usr/sbin/chroot . $REAL_INIT $2 >"$OUT_TTY" 2>&1 - #exec /usr/sbin/chroot . /sbin/init $2 >/dev/tty0 2>&1 - else - echo "FAILED" - die "* * * pivot_root failed! * * *" - fi - -} - -# $1: Path to mounted rootfs -image_conf(){ - ! test -d "$1" && die "image_conf: [$1] not found / no directory" - - test -e "$1/etc/.image_conf.done" && return - - echo -e "\n\n* * * rootfs configuration * * *\n" - echo -e "This setup lets you reconfigure your new rootfs." - echo "Most probably the rootfs is configured with" - echo "defaults based on a flash installation." - echo "If unsure, go with the defaults by pressing ." - echo "" - - if ( cat $1/etc/fstab | grep -v "^#" | grep -q "/home " ) - then - while true - do - echo "Usually your /home directory is located on another flash partition." - echo -n "Do you want me to move /home inside the loop-image? [N|y] " - read junk - - if test "$junk" = "y" -o "$junk" = "Y" - then - cat $1/etc/fstab | sed "/.*\/home.*/s/\/home/\/home.flash/" > $1/etc/fstab_ - mv $1/etc/fstab_ $1/etc/fstab - - mkdir -p $1/home.flash - break - fi - - test "$junk" = "" -o "$junk" = n -o "$junk" = N && break - done - - fi - - echo "" - - if ( cat $1/etc/ipkg.conf | grep -q ^lists_dir ) - then - while true - do - echo -e "Wasting RAM is never a good idea.\nOnly say Y if your rootfs is very small in size" - echo -en "Do you want to store ipkg package data\nin RAM? [N|y] " - read junk - - if test "$junk" = "" -o "$junk" = n -o "$junk" = N - then - cat $1/etc/ipkg.conf | sed "/^lists_dir.*/s/\(.*\)/#\ \1/"> $1/etc/ipkg.conf_ - mv $1/etc/ipkg.conf_ $1/etc/ipkg.conf - break - fi - - test "$junk" = "y" -o "$junk" = "Y" && break - done - fi - - echo "" - - if ( cat $1/etc/ipkg.conf | grep -q "^dest sd" ) - then - while true - do - echo -en "Do you want to keep the SD, CF and /home\nipkg install targets? [N|y] " - read junk - - if test "$junk" = "" -o "$junk" = n -o "$junk" = N - then - cat $1/etc/ipkg.conf | sed "/^dest\ \(sd\|cf\|home\).*/s/\(.*\)/#\ \1/" > $1/etc/ipkg.conf_ - mv $1/etc/ipkg.conf_ $1/etc/ipkg.conf - break - fi - - test "$junk" = "y" -o "$junk" = "Y" && break - done - fi - - - touch "$1/etc/.image_conf.done" -} - -# This functions configures the master password for altboot if none is set -set_password() { - - test -e /etc/altboot.pwd && . /etc/altboot.pwd - - mount -o remount,rw / - if test -z "$MASTER_PASSWORD" -a "$ENABLE_DEBUG" != yes - then - echo -e "\nAltboot is a boot-manager which allows to boot from SD,\nCF, USB-Storage and NFS" - echo -e "\nFor security reasons altboot requires a password\nto boot into init=/bin/sh." - echo -e "${C_RED}This is *not* your root password!\nIt is used by altboot alone!${C_RESET}\n" - - while true - do - echo -en "\nNew password: " - - stty -echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - read junk1 < "$OUT_TTY" - stty echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - - if ! test -z "$junk1" - then - echo -en "\nRepeat: " - - stty -echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - read junk2 < "$OUT_TTY" - stty echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - echo "" - - if test "$junk1" = "$junk2" - then - crypt_pw="`echo "$junk1" | md5sum | awk '{print $1}'`" - - if test -e "/etc/altboot.pwd" - then - sed "/^MASTER_PASSWORD/s/\(.*\=\).*/\1\"$crypt_pw\"/" "${ALTBOOT_CFG_FILE}" > ${ALTBOOT_CFG_FILE}_ - mv ${ALTBOOT_CFG_FILE}_ ${ALTBOOT_CFG_FILE} - MASTER_PASSWORD="$crypt_pw" - echo "Password changed." - else - echo "MASTER_PASSWORD=\"$crypt_pw\"" > /etc/altboot.pwd - echo "Password installed" - fi - - break - else - echo -e "Passwords didn't match, try again\n" - fi - fi - done - fi - -} - -# This function asks for altboots master password. It only returns if the correct password was supplied -verify_master_pw() { - - test -e /etc/altboot.pwd && . /etc/altboot.pwd - - if test -n "$MASTER_PASSWORD" -a "$MASTER_PASSWORD" != "[none]" - then - auth_timeout="3" - - echo -e "\nPlease enter your altboot master password" - - cnt=0 - while true - do - let cnt=$cnt+$auth_timeout - echo -n "Password: " - stty -echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - read junk < "$OUT_TTY" - stty echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - - if test "`echo "$junk" | md5sum | awk '{print $1}'`" = "$MASTER_PASSWORD" - then - break - else - echo "[`echo "$junk" | md5sum | awk '{print $1}'`]" - echo "[$MASTER_PASSWORD]" - echo "Wrong password, sleeping $cnt seconds..." - sleep $cnt - -# if test "$cnt" -gt 10 -# then -# break -# fi - fi - done - - echo "" - fi -} - - -check_fs() { - if [ "$FSCK_IMAGES" = "yes" ] - then - FSCK="" - if [ "$2" = "" ]; then - FSTYPE="ext2" - else - FSTYPE="$2" - fi - case "$FSTYPE" in - ext2 | ext3) - if [ -e /sbin/fsck.ext3 ]; then - FSCK="/sbin/fsck.ext3" - elif [ -e /sbin/e3fsck ]; then - FSCK="/sbin/e3fsck" - elif [ -e /sbin/fsck.ext2 ]; then - FSCK="/sbin/fsck.ext2" - elif [ -e /sbin/e2fsck ]; then - FSCK="/sbin/e2fsck" - fi - test -n "$FSCK" && FSCK="$FSCK -p" - ;; - vfat) - if [ -e /sbin/dosfsck ]; then - FSCK="/sbin/dosfsck -a" - fi - ;; - esac - -# debug_echo "check_fs() FSCK / FSTYPE: [$FSCK] / [$FSTYPE]" - - if [ "$FSCK" = "" ]; then - echo "Could not find fsck for $FSTYPE!" - else - echo "Checking file system on $1" - $FSCK $1 || sleep 2 - fi - fi -} - -# Make the initial rootfs a bit more usable -init_rootfs(){ -# echo -n "Mounting rootfs rw..." - mount -o remount,rw / || die "mount -o remount,rw / failed" - - mount | grep -q "/proc " >/dev/null 2>&1 || mount proc -t proc /proc >"$OUT_TTY" 2>&1 - - if ( uname -r | grep -q "2.6." ) - then - mount | grep -q "/sys " >/dev/null 2>&1 || mount sys -t sysfs /sys >"$OUT_TTY" 2>&1 - fi - - /etc/init.d/devices start || die "FAILED" -} - -mount_sd(){ - if mount | grep -q "$SD_MOUNTPOINT" - then - echo "Note: $SD_MOUNTPOINT is already mounted" - else - # We can't trust that the SD device file is there when running kernel 2.6 w/ udev - # and starting udev at this point may not be the best idea... - if `uname -r | grep -q "2.6"` - then - #Let's just assume the device file name never changes... - dev_no="`echo "$SD_DEVICE" | sed -n "s/\/dev\/mmcblk\(.*\)p\(.*\)/\1/p"`" - part_no="`echo "$SD_DEVICE" | sed -n "s/\/dev\/mmcblk\(.*\)p\(.*\)/\2/p"`" - ! test -e /dev/mmcblk${dev_no} && mknod /dev/mmcblk${dev_no} b 254 0 - ! test -e /dev/mmcblk${dev_no}p${part_no} && mknod /dev/mmcblk${dev_no}p${part_no} b 254 $part_no - fi - - # Kernel 2.6 has the SD driver compiled into the kernel - if test -n "$SD_KERNEL_MODULE" - then - echo "Loading SD kernel module..." - if ( echo "$SD_KERNEL_MODULE" | grep -q "^/" ) - then - echo -e "\t- Using full path for SD module" - SD_PATTERN="`basename "$SD_KERNEL_MODULE" | sed "s/\.ko//;s/\.o//"`" - - if ( lsmod | grep -q "^$SD_PATTERN" ) - then - echo -e "\t- Already loaded..." - else - echo -e "\t- Loading..." - /sbin/insmod $SD_KERNEL_MODULE >/dev/null 2>&1 && echo ok || die "insmod failed" - fi - - else - echo -e "\t- Searching [$SD_KERNEL_MODULE]" - SD_KERNEL_MODULE="$(find /lib/modules/`uname -r`/ -name "$SD_KERNEL_MODULE")" - echo -e "\t- Assuming module is [$SD_KERNEL_MODULE]" - - SD_PATTERN="`basename "$SD_KERNEL_MODULE" | sed "s/\.ko//;s/\.o//"`" - - if ( lsmod | grep -q "^$SD_PATTERN" ) - then - echo -e "\t- Already loaded..." - else - echo -e "\t- Loading..." - /sbin/insmod $SD_KERNEL_MODULE >/dev/null 2>&1 && echo ok || die "insmod failed" - fi - fi - fi - - sleep 3 - - check_fs "$SD_DEVICE" - - if ! mount | grep -q "$SD_MOUNTPOINT" - then - echo -n "Mounting $SD_MOUNTPOINT..." >"$OUT_TTY" - - if test "$1" = ingore_errors - then - /bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT >/dev/null 2>&1 || echo "Could not mount SD card" - else - /bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT >/dev/null 2>&1 || die "/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT failed" - fi - else - echo "NOTE: Some sort of auto-mounting is going on..." - fi - fi - echo "" - - # Give the SD and CF mounting some time. This is a must for SD - sleep 2 -} - -mount_cf(){ - if mount | grep -q "/media/cf " - then - echo "Note: /media/cf is already mounted" - else - if ( cat /etc/fstab | grep -v "^#" | grep -q "/media/cf" ) - then - # As of kernel 2.6.16, /e/i/pcmcia is replaced by udev - if test -x /etc/init.d/pcmcia - then - /etc/init.d/pcmcia status | grep -q running || /etc/init.d/pcmcia start && echo "Note: cardmgr is already active" - else - for n in 1 2 3 - do - ! test -e "/dev/hda$n" && mknod /dev/hda$n b 3 $n - done - fi - - # Give the SD and CF mounting some time. This is a must for SD - sleep 2 - - mount /media/cf -o async - else - echo "Note: Your system's fstab does not include an entry for /media/cf" - fi - fi -} - -mount_home(){ - if mount | grep -q "/home " - then - echo "Note: /home is already mounted" - else - - if ( cat /etc/fstab | grep -v "^#" | grep -q "/home " ) - then - echo "Mounting /home" - home_fstab="`grep "/home " /etc/fstab`" - home_dev="`echo "$home_fstab" | awk '{print $1}'`" - home_fs="`echo "$home_fstab" | awk '{print $3}'`" - home_options="`echo "$home_fstab" | awk '{print $4}'`" - - mount -t "$home_fs" -o $home_options "$home_dev" /home - else - echo "Note: Your system's fstab does not include an entry for /home" - fi - fi -} - -show_menu() { - - echo -e "\nPress to return to the menu" - read junk - - test "$junk" = x && exec /bin/sh || exec /sbin/init.altboot -force<"$OUT_TTY" >"$OUT_TTY" 2>&1 -} - -mdie() { - echo -e "${C_RED}ERROR:${C_RESET}${C_WHITE} $1${C_RESET}" >"$OUT_TTY" - - echo -e "\nPress to return to the menu" - read junk - - test "$junk" = x && exec /bin/sh || exec /sbin/init.altboot -force<"$OUT_TTY" >"$OUT_TTY" 2>&1 -} - -# $1: uniq name, $2 identifier, $3 value -set_pref() { - data_name="$1" - data_id="$2" - data_value="$3" - - #debug_echo "[$1] [$2] [$3]" - #export "${data_name}"="`eval echo -e \\$${data_name} | sed "s/\#\#\#/\#\#\#\\n/g"|sed s/^\ // | sed s/^$data_id.*//`" - - if test -z "$3" - then - debug_echo "set_pref(): WARNING, writing empty value to $data_name / $data_id! THIS WILL BREAK THINGS" - #data_value=" " - fi - export "${data_name}"="`eval echo -e \\$${data_name} `$data_id##$data_value###" -} - -# $1: uniq name -reset_pref() { - data_name="$1" - export "${data_name}"="" -} - -echo_pref() { - data_name="$1" - echo "****** $1 ******" - echo "`eval echo -e \\$${data_name} | sed "s/\#\#\#/\#\#\#\\n/g"|sed s/^\ // `" - echo "******" -} - -dump_pref() { - data_name="$1" - echo "`eval echo -e \\$${data_name} | sed "s/\#\#\#/\#\#\#\\n/g"|sed s/^\ // `" - - #echo "-- `eval echo ${data_name}` --" - #debug_echo "[$menu_fileflags]" -} - -# $1 = name, $2 = cache_file -export_pref() { - data_name="$1" - echo "`eval echo -e ${data_name}`" > "$2" -} - -# $1 = name, $2 = cache_file -import_pref() { - data_name="$1" - data_id="$2" - - #debug_echo "[$1] [$2] [$3]" - - if test -z "$3" - then - debug_echo "set_pref(): WARNING, writing empty value to $data_name / $data_id! THIS WILL BREAK THINGS" - #data_value=" " - fi - export "${data_name}"="`cat "$2"`" - -} - -# $1: uniq name, $2 identifier, $3 out var -get_pref() { - data_name="$1" - data_id="$2" - data_out="$3" - data_list="`eval echo -e \\$${data_name}`" - - #echo "data_list: [$data_list]" - #data_value="`echo "$data_list"| sed "s/\#\#\#/\\n/g"|sed s/^\ // | grep "^$data_id##" | sed -n "s/.*\#\(.*\)$/\1/p"`" - #data_value="`echo "$data_list"| sed "s/\#\#\#/\\n/g"|sed s/^\ // | sed -n "/^$data_id/s/.*\#\(.*\)$/\1/p"`" - data_value="`echo "$data_list"| sed "s/\#\#\#/\\n/g" | sed -n "s/^\ //;/^$data_id\#/s/.*\#\(.*\)$/\1/p"`" - #echo "WERT: [$data_value]" - - export "${data_out}"="$data_value" - test -n "$data_value" && return 0 -} - -debug_echo() { - test "$ENABLE_DEBUG" = "yes" && echo -e "${C_YELLOW}DEBUG:${C_RESET}${C_WHITE} $1 ${C_RESET}" >"$OUT_TTY" 2>&1 -} - -start_networking() { - - test -z "$1" && mdie "No remote host configured, check /etc/fstab for NFS hosts" - - if test "$USB_NETWORKING_AVAILABLE" = "yes" - then - echo "" - echo "Select the type of your network connection:" - echo "" - echo -e "\t[1] LAN or WLAN NIC" - echo -e "\t[2] USB Connection" - echo "" - - if test "$AUTOBOOT" != "yes" -o ! -e /etc/.altboot-lanselect.last - then - while true - do - echo -n "Connection Type: " - read junk - - test "$junk" = 1 -o "$junk" = 2 && break - done - else - junk="`cat /etc/.altboot-lanselect.last`" - test -z "$junk" && junk=1 - - echo "Connection Type: $junk (autoboot)" - fi - - case "$junk" in - 1) NW_TYPE="NIC" - ;; - 2) NW_TYPE="USB" - ;; - esac - - echo "$junk" > /etc/.altboot-lanselect.last - else - NW_TYPE=NIC - fi - - - - # Needed for NFS - /etc/init.d/portmap start >/dev/null 2>&1 || die "/etc/init.d/portmap start failed!" - - # For some reason NFS mounts hang if /e/i/networking is not run. - # For the time beeing I'm too lazy to investigate ;) - /etc/init.d/networking start >/dev/null 2>&1 || die "/etc/init.d/networking start failed!" - - sleep 2 - - if test "$NW_TYPE" = "NIC" - then - # After the PCMCIA service is started, an inserted WLAN card should automatically - # activate itself. - - if test -x /etc/init.d/pcmcia - then - echo -e "\nRunning cardctl to setup networking..." - /etc/init.d/pcmcia start >/dev/null 2>&1 || die "/etc/init.d/pcmcia start failed!" - sleep 3 - else - # With kernel 2.6.16+ udev is used - echo -e "\nRunning udevd to setup networking..." - ps ax | grep -v grep | grep -q udevd || /etc/init.d/udev start >/dev/null 2>&1 || die "/etc/init.d/udev start failed!" - - # Stop udev to work around some very ugly (yet harmless) error messages on boot - /etc/init.d/udev stop >/dev/null 2>&1 - fi - fi - - if test "$NW_TYPE" = "USB" - then - echo "" - for module in $USB_NW_MODULES - do - echo "modprobing [$module]" - modprobe $module || die "modprobe $module FAILED" - done - - ifdown "$USB_NW_DEVICE" >/dev/null 2>&1 - - - echo -e "\nPlease make sure that usb0 is up on your PC and hit ." - read junk - - ifup "$USB_NW_DEVICE" - fi - - WLAN_NIC="`iwconfig 2>/dev/null | grep ESSID | grep -v wifi | awk '{print $1}'`" - - if test -z "$WLAN_NIC" - then - # cardctl needs some time.... - echo -n "Waiting for WLAN card.." - timeout=0 - while test "$timeout" -lt 10 - do - WLAN_NIC="`iwconfig 2>/dev/null | grep ESSID | grep -v wifi | awk '{print $1}'`" - test -n "$WLAN_NIC" && break - echo -n "." - let timeout=$timeout+1 - sleep 1 - done - - if test -z "$WLAN_NIC" - then - debug_echo "WARNING: WLAN_NIC is empty!\n" - debug_echo "Filter result: [$WLAN_NIC]" - debug_echo "iwconfig: [`iwconfig`]" - mdie "No network interface found" - fi - fi - - # WLAN with DHCP needs some time to get a lease, set up the routing, etc. - echo -n "Waiting for host [$1] on [$WLAN_NIC]." - cnt=0 - while true - do - if (ping -c 1 $1) >/dev/null 2>&1 - then - echo " found" - break - else - if test "$cnt" = 30 -o "$cnt" = 60 - then - echo "" - echo "WARNING: $NW_TYPE didn't activate in $cnt seconds!" - - if test "$cnt" = 30 - then - let cnt=$cnt+1 - - if test "$NW_TYPE" = "NIC" - then - echo "Restarting udhcpc for [$WLAN_NIC]" - killall udhcpc - - udhcpc -i "$WLAN_NIC" -H `cat /etc/hostname` >"$OUT_TTY" 2>&1 - fi - - if test "$NW_TYPE" = "USB" - then - echo "ifdown/up $USB_NW_DEVICE..." - ifdown "$USB_NW_DEVICE" - sleep 1 - ifup "$USB_NW_DEVICE" - fi - - else - mdie "Failed to activate $NW_TYPE!" - break - fi - else - echo -n "." - let cnt=$cnt+1 - fi - fi - sleep 1 - done - - -} diff --git a/packages/altboot/files/altboot.rc/.mtn2git_empty b/packages/altboot/files/altboot.rc/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/altboot.rc/Readme.txt b/packages/altboot/files/altboot.rc/Readme.txt deleted file mode 100644 index 985e1fe7d0..0000000000 --- a/packages/altboot/files/altboot.rc/Readme.txt +++ /dev/null @@ -1,2 +0,0 @@ -Scripts (*.sh) in this folder are run by altboot before printing the menu. -Note: The rootfs is still mounted ro at this point. diff --git a/packages/altboot/files/altboot.rc/disable_printk.sh b/packages/altboot/files/altboot.rc/disable_printk.sh deleted file mode 100644 index af15adec44..0000000000 --- a/packages/altboot/files/altboot.rc/disable_printk.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -mount proc -t proc /proc >/dev/null 2>&1 - -echo 0 > /proc/sys/kernel/printk - diff --git a/packages/altboot/files/altboot.rc/loadkeymap.sh b/packages/altboot/files/altboot.rc/loadkeymap.sh deleted file mode 100644 index 97cff13dbb..0000000000 --- a/packages/altboot/files/altboot.rc/loadkeymap.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# Note: With kernel 2.6 the standard keymap is unusable -test -x /etc/init.d/keymap && /etc/init.d/keymap start >/dev/null 2>&1 - -# Do not exit w/ errorcode when the if above fails -/bin/true - diff --git a/packages/altboot/files/altboot.rc/playbeep.sh b/packages/altboot/files/altboot.rc/playbeep.sh deleted file mode 100644 index b41f098630..0000000000 --- a/packages/altboot/files/altboot.rc/playbeep.sh +++ /dev/null @@ -1,34 +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: playbeep.sh -# Date: 12-Apr-06 - -if test -x /usr/sbin/alsactl -a -e /etc/modules -a "$ENABLE_SOUND" = yes -then - for module in `cat /etc/modules | grep snd | grep -v ^#` - do - #echo "loading $module" - modprobe $module >/dev/null 2>&1 - done - - mount -o remount,rw / - - init_rootfs >/dev/null 2>&1 - - ! test -e /dev/audio && mknod /dev/audio c 14 4 - ! test -e /dev/dsp && mknod /dev/dsp c 14 3 - - mkdir /dev/snd >/dev/null 2>&1 - mknod /dev/snd/controlC0 c 116 0 >/dev/null 2>&1 - mknod /dev/snd/pcmC0D0c c 116 24 >/dev/null 2>&1 - mknod /dev/snd/pcmC0D0p c 116 16 >/dev/null 2>&1 - mknod /dev/snd/timer c 116 33 >/dev/null 2>&1 - /usr/sbin/alsactl restore >/dev/null 2>&1 - - test -e /usr/share/sounds/beep.raw && cat /usr/share/sounds/beep.raw > /dev/dsp -fi - -/bin/true diff --git a/packages/altboot/files/altbootctl b/packages/altboot/files/altbootctl deleted file mode 100755 index 58976afd0d..0000000000 --- a/packages/altboot/files/altbootctl +++ /dev/null @@ -1,311 +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: hentges-setup.sh -# Date: 03-Jun-06 - -die() { - echo -e "$*" - exit 1 -} - - -PERMANENT_CFG="/etc/altboot-`uname -r | cut -c1-3`.cfg" -TEMPORARY_CFG="/etc/altboot-`uname -r | cut -c1-3`.cfg.next-reboot" - -CFG="$PERMANENT_CFG" -SCRIPT_CONFIG="/etc/altbootctl.conf" - -test -e "$SCRIPT_CONFIG" && . "$SCRIPT_CONFIG" || die "$SCRIPT_CONFIG not found" - -# $1= Setting, $2 = new value -set_pref() { - - if ( cat "$CFG" | grep -q "$1" ) - then - cat "$CFG" | sed "/^$1/s/\(.*\)\=\(.*\)/\1\=\"$2\"/" > ${CFG}_ - mv ${CFG}_ ${CFG} - else - echo "$1=\"$2\"" >> "${CFG}" - fi -} - -# $1= Setting -get_pref() { - n="$1" - value="`cat "${CFG}" | sed -n "/^$n/s/\(.*\)\=\\"\(.*\)\\"/\2/p"`" - #echo "cat "${CFG}" | sed -n "/^$n/s/\(.*\)\=\"\(.*\)\"/\2/p"" - test -z "$value" && die "Couldn't get value for [$n]" - echo "$value" -} - -ask_pref() { - SETTING_NAME="$1" - - SETTING_TEXT_="${SETTING_NAME}_TEXT" - SETTING_TEXT="`eval echo -e \\$${SETTING_TEXT_}`" - - SETTING_VALUES_="${SETTING_NAME}_VALUES" - SETTING_VALUES="`eval echo -e \\$${SETTING_VALUES_}`" - - SETTING_OLD_VALUE="`get_pref "$SETTING_NAME"`" - test -z "$SETTING_TEXT" -o -z "$SETTING_VALUES" && die "ask_pref: [$1] -> [$SETTING_TEXT] [$SETTING_VALUES]" - - #echo "[$1] -> $SETTING_OLD_VALUE" - #echo -e "$SETTING_TEXT" - - - if test "$SETTING_VALUES" = "" - then - while true - do - echo -e "\nPlease enter a new value [$SETTING_OLD_VALUE]" - echo -en "Your Choice: " - read junk - - echo "" - - while true - do - echo -n "Is the new value of [$junk] correct? [Y|n] " - read junk2 - - case "$junk2" in - y|Y|"") END_LOOP=true - break ;; - *) END_LOOP=false - break ;; - esac - done - - if test "$END_LOOP" = "true" - then - SETTING_NEW_VALUE="$junk" - break - fi - - done - - else - # If it's not a string, it's a fixed list of possible settings - echo -e "\nSelect one of the following:\n" - cnt=1 - - echo " $SETTING_VALUES" - for val in $SETTING_VALUES - do - if test "$val" != "$SETTING_OLD_VALUE" - then - echo -e "\t[$cnt] $val" - else - echo -e "\t[$cnt] $val *" - SETTING_OLD_VALUE_NUM="$cnt" - fi - let cnt=$cnt+1 - done - - echo "" - while true - do - echo -en "Your choice [$SETTING_OLD_VALUE_NUM]: " - read junk - - if test -n "$junk" - then - cnt=1 ; SETTING_NEW_VALUE="" - for val in $SETTING_VALUES - do - if test "$junk" = "$cnt" - then - SETTING_NEW_VALUE="$val" - break - fi - - let cnt=$cnt+1 - done - else - SETTING_NEW_VALUE="$SETTING_OLD_VALUE" - fi - - test -n "$SETTING_NEW_VALUE" && break - done - - fi - - - if test "$SETTING_NEW_VALUE" != "$SETTING_OLD_VALUE" - then - set_pref "$SETTING_NAME" "$SETTING_NEW_VALUE" - echo "Changed $SETTING_NAME to $SETTING_NEW_VALUE" - else - echo "$SETTING_NAME remains unchanged" - fi - echo -e "\n" -} - -build_menu() { - for setting in $TARGETS - do - # SETTING_MENUPOS contains $setting_MENUPOS - SETTING_MENUPOS_="${setting}_MENUPOS" - SETTING_MENUPOS="`eval echo -e \\$${SETTING_MENUPOS_}`" - - # Store all entries in variables named after the menu name - MENU_NAME="SUBMENU_${SETTING_MENUPOS}" - export "${MENU_NAME}"="`eval echo -e \\$${MENU_NAME} ` $setting" - - - echo "$AVAILABLE_MENUES" | grep -q "$SETTING_MENUPOS" || AVAILABLE_MENUES="$SETTING_MENUPOS $AVAILABLE_MENUES" - - done - - #echo "[$AVAILABLE_MENUES]" - - while true - do - echo -e "\nSelect a menu:\n" - cnt=1 - for menu in $AVAILABLE_MENUES Exit - do - MENU_NAME="SUBMENU_$menu" - echo -e "\t[$cnt] $menu" - let cnt=$cnt+1 - done - - echo "" - - while true - do - echo -n "Your Choice: " - read junk - - cnt=1 ; GET_MENU="" - for menu in $AVAILABLE_MENUES Exit - do - if test "$cnt" = "$junk" - then - GET_MENU="$menu" - break - fi - let cnt=$cnt+1 - done - - if test "$GET_MENU" = "Exit" - then - EXIT_PROG=true - break - else - EXIT_PROG=false - fi - - if test -n "$GET_MENU" - then - show_menu "$menu" - break - fi - done - test "$EXIT_PROG" = true && break - done -} - -show_menu() { - MENU_NAME="SUBMENU_$1" - - - while true - do - echo -e "\nEntries in this menu:\n" - cnt=1 - for entry in `eval echo -e \\$${MENU_NAME}` Back - do - MENU_NAME_TEXT="${entry}_TEXT" || MENU_NAME_TEXT="${entry}" - - test "$entry" != Back && tmp_="`eval echo -e \\$${MENU_NAME_TEXT}`" || tmp_="Back" - - echo -e "\t[$cnt] $tmp_" - let cnt=$cnt+1 - done - - echo "" - - while true - do - echo -en "Your Choice: " - read junk - - cnt=1 ; GET_ENTRY="" - for entry in `eval echo -e \\$${MENU_NAME}` Back - do - if test "$cnt" = "$junk" - then - GET_ENTRY="$entry" - break - fi - let cnt=$cnt+1 - done - - if test "$GET_ENTRY" = "Back" - then - EXIT_MENU=true - break - else - EXIT_MENU=false - fi - - - # At this point the user has selected a menuitem != "Back" - if test -n "$GET_ENTRY" - then - select_config - ask_pref "$GET_ENTRY" - break - fi - done - - test "$EXIT_MENU" = true && break - done -} - -select_config() { - echo -e "\nChange this setting only for the next reboot or permanently?\n" - - echo -e "Select one of the following:\n" - - echo -e "\t[1] Only for the next reboot" - echo -e "\t[2] Permanently" - echo "" - - while true - do - echo -en "Your Choice: " - read junk - - case "$junk" in - 2) CFG="$PERMANENT_CFG" - break ;; - 1) CFG="$TEMPORARY_CFG" - break ;; - esac - done - - # Supress error message about missing config - ! test -e "$CFG" && touch "$CFG" - -} - -go() { - build_menu - - exit 0 - for setting in $TARGETS - do - ask_pref "$setting" - done - -} - - -! test -e "$CFG" && die "[$CFG] not found, exiting" -go diff --git a/packages/altboot/files/altbootctl.conf b/packages/altboot/files/altbootctl.conf deleted file mode 100644 index 13f22b7e91..0000000000 --- a/packages/altboot/files/altbootctl.conf +++ /dev/null @@ -1,98 +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: hentges-setup.conf -# Date: 04-Jun-06 - - -TARGETS="REMEMBER_LAST_SELECTION ENABLE_ALTBOOT FSCK_IMAGES TIMEOUT INIT_RUNLEVEL NO_GUI_RL \ - USB_HOST_AVAILABLE USB_NETWORKING_AVAILABLE ASK_PW_ON_BOOT SD_DEVICE SD_KERNEL_MODULE \ - IMAGE_PATH IMAGE_TYPE ENABLE_IMAGECONF USB_STORAGE_MODULES USB_STORAGE_PARTITION \ - USB_STORAGE_WAIT SD_MOUNTPOINT ENABLE_DEBUGGING ENABLE_DEBUG_SHELL ENABLE_SOUND" - - -REMEMBER_LAST_SELECTION_VALUES="yes no" -REMEMBER_LAST_SELECTION_TEXT="Remember the last selected menu item for next boot" -REMEMBER_LAST_SELECTION_MENUPOS="Core" - -ENABLE_ALTBOOT_VALUES="yes no" -ENABLE_ALTBOOT_TEXT="Enable or disable the altboot boot-manager" -ENABLE_ALTBOOT_MENUPOS="Core" - -TIMEOUT_VALUES="" -TIMEOUT_TEXT="Altboot boot-menu timeout in seconds" -TIMEOUT_MENUPOS="Core" - -INIT_RUNLEVEL_VALUES="" -INIT_RUNLEVEL_TEXT="Default runlevel" -INIT_RUNLEVEL_MENUPOS="Core" - -NO_GUI_RL_VALUES="" -NO_GUI_RL_TEXT="GUI-less runlevel" -NO_GUI_RL_MENUPOS="Core" - -ENABLE_DEBUGGING_VALUES="auto yes no" -ENABLE_DEBUGGING_TEXT="Enable debugging output" -ENABLE_DEBUGGING_MENUPOS="Core" - -ENABLE_DEBUG_SHELL_VALUES="yes no" -ENABLE_DEBUG_SHELL_TEXT="Enable a shell prompt after kernel init" -ENABLE_DEBUG_SHELL_MENUPOS="Core" - -ENABLE_SOUND_VALUES="yes no" -ENABLE_SOUND_TEXT="Emmit a beep on boot" -ENABLE_SOUND_MENUPOS="Core" - -FSCK_IMAGES_VALUES="yes no" -FSCK_IMAGES_TEXT="Automatically fsck loop-images" -FSCK_IMAGES_MENUPOS="LoopImages" - -IMAGE_PATH_VALUES="" -IMAGE_PATH_TEXT="Subdirectory for loop-files" -IMAGE_PATH_MENUPOS="LoopImages" - -IMAGE_TYPE_VALUES="" -IMAGE_TYPE_TEXT="Image FS type" -IMAGE_TYPE_MENUPOS="LoopImages" - -ENABLE_IMAGECONF_VALUES="yes no" -ENABLE_IMAGECONF_TEXT="Configure new loop-images on 1st boot" -ENABLE_IMAGECONF_MENUPOS="LoopImages" - -USB_HOST_AVAILABLE_VALUES="yes no" -USB_HOST_AVAILABLE_TEXT="Device supports full USB *HOST* mode" -USB_HOST_AVAILABLE_MENUPOS="USB" - -USB_NETWORKING_AVAILABLE_VALUES="yes no" -USB_NETWORKING_AVAILABLE_TEXT="USB networking is available" -USB_NETWORKING_AVAILABLE_MENUPOS="USB" - -USB_STORAGE_MODULES_VALUES="" -USB_STORAGE_MODULES_TEXT="Kernelmodules required for USB" -USB_STORAGE_MODULES_MENUPOS="USB" - -USB_STORAGE_PARTITION_VALUES="" -USB_STORAGE_PARTITION_TEXT="USB storage device file" -USB_STORAGE_PARTITION_MENUPOS="USB" - -USB_STORAGE_WAIT_VALUES="" -USB_STORAGE_WAIT_TEXT="Wait x seconds before mount USB storage" -USB_STORAGE_WAIT_MENUPOS="USB" - -ASK_PW_ON_BOOT_VALUES="yes no" -ASK_PW_ON_BOOT_TEXT="Alway ask altboot password on boot" -ASK_PW_ON_BOOT_MENUPOS="Core" - -SD_DEVICE_VALUES="" -SD_DEVICE_TEXT="The device-file for the SD card" -SD_DEVICE_MENUPOS="SD_MMC" - -SD_KERNEL_MODULE_VALUES="" -SD_KERNEL_MODULE_TEXT="Kernelmodule required for SD operation" -SD_KERNEL_MODULE_MENUPOS="SD_MMC" - -SD_MOUNTPOINT_VALUES="" -SD_MOUNTPOINT_TEXT="Mointpoint for the SD card" -SD_MOUNTPOINT_MENUPOS="SD_MMC" diff --git a/packages/altboot/files/beep.raw b/packages/altboot/files/beep.raw deleted file mode 100644 index f76112185c..0000000000 --- a/packages/altboot/files/beep.raw +++ /dev/null @@ -1 +0,0 @@ -€~€~~~~€~€~€~€~~€~€~€~€~€~~€€~v…ok›”[lฉ‘SpฏŒMxณ‚L‚ณxMฐnS’ชlT”ฎgOžฐZQซฉO\ดœHjธŽFxธ€H…ตuMฐmR–ซgVšจdXœฆaZŸค^[ฃคZ\งขU^ญ Obณ›Jgท”FoปŒCxผƒC€ป{EˆธtIŽดnM”ฏiR—ชfX›ฅb]žŸ_bขš\hฅ”XoจVvช…T~ซ~T…ซvUŒฉoX’ฅj\—กg`šœde›—cjœ’božŽasŸ‰_xก…]|ข€\‚ค{Z‡ฅuYฅpZ’คk[–ขg^šŸcb›afŸ—_jก“^oขŽ]tฃ‰[yคƒ[ค~[„คx\Šฃr] l`•hc™™dh•al ^qข‹]wฃ†\|ฃ€\ฃ{\†ฃv]Œกq_‘Ÿla•œgeš™chž•`mก]rฃ‹[wค†Z|ฅ€Zฅ{[‡คv\Œขq^Ÿma”œid˜™fhš•dlœbqžŒavŸ‡`{Ÿ‚a€}c…›xe‰™ugŒ—ri•oj’•kk–”flœ’`oขŽZtงˆW{ชUชzV‡จuXŒฆqZฃm]“ j`–gcššcg•amŸ_rกŠ^xข…]|ข€]ข|]…กx^Šกs_ŽŸoa’kd–™hh˜•fk™’eo›Žcr‹awŸ†_| €_‚ z`‡žvcŠšvhˆ“yq…Š|y‚‚€~ƒ~|ƒ~}€‚€~~‚~|‚„}{‚„}|‚ƒ}}~€}‚}€‚}€~~‚~|ƒ}|‚‚}~€~€€~€‚}€‚}€€~€€~~‚‚||„ƒz|…ƒz|„ƒ||‚„~z‡}w…‡ty’ƒeก{Y‰งpY”ฃfa˜_mก\wค„Z~ฆWƒฉzUˆชtUŽฉnW”ฆg[›ขa` œ]fค–ZmฆYsฆŠYwฆ…X|งWจ|W…จxW‰งtYŒฆpZ‘ฅj\˜ขc` œ\gฅ”YnงXuฆˆZyฅ„Z|ฅ€Zฅ|[…ฃx\‰ขu^Œกr^ m_•Ÿga›œbe —]kฃ’[pฅŒZuฆ‡Y{ฆ‚Y€ฆ|Y†ฅw[‹ฃr]กm_”žib™›efœ—akŸ’^oข]tฃˆ[yคƒ[~ค[ƒฃz\ˆขu^Œกq`‘žlb•›hf˜˜eiœ”bnž`r ‹^wข†]|ฃ\ฃ{\†ขv]‹กr_Ÿma”œhd™™ehœ•am ^rข‹\wค…Z}ฅ€Y‚ฆzZˆฅu[ฃp]’กk_–žgcššdg–alŸ‘_qก‹^vข†]{ข]ข|^…กw_Š s`Žžpb‘œme”™jh–•hk˜’fpšet›‰cx…b|€až|a…žxb‰tcœpd‘šlf”˜ii—•flš‘doœbtž‰axž…`}ž€až|b…œxcˆ›ue‹™rf˜nh’•jk—’fo›buž‡a{ž‚a~b‚{b†wcŠ›te™qh–nk’“mm“‘lo”jq–hu—‰lx…u{…ƒ~}…x€ˆw‡~z„~}‚€€€€€€|„z…~{„|€ƒ|ƒ~}‚}~‚~}ƒ}{‚…|zƒ„|{ƒƒ}|‚ƒ}|‚ƒ|{„„{{…„z|…‚{~ƒ}}‚‚~|ƒ~}€‚€}~ƒ€{‚…vy‘†exก†YzฉƒT~ซ}T…ชvVงnZ”ขh_™žcdž˜_iข“\nฅYsจŠVwช…T|ญ€Q‚ฐzN‰ฑqN“ฏgRœซ_WฃฅZ]งŸWcช™Uiซ’TpซŒTvช…U}ฉV‚จzXˆฆtZฃp]‘กl`•hc˜šeg›–ck’aoŸŽ`s ‰_xก…^}ก€_‚ {_‡ v`ŒŸqamc”›ie—˜fi›”cmž`r ‹^wข†]|ฃ\ฃ{\‡ฃv]Œกq_Ÿla•œhd™™dhœ•alŸ_qก‹]vฃ†\{ค[€ค|[…ฃw\Šขs^ n`“žjc—šffš—cj“`o Ž^sขŠ]xฃ…\}ฃ€\‚ฃ{]†ขv^‹ r`žnc“›jf——giš“dnœbržŠ`wŸ†_| _€ |`…Ÿxa‰žtbœpd‘™lg•–hj˜“fn›cqŒbvž‡azŸƒ`Ÿ~`„Ÿx`Šžsbnd“šjf—˜ghš•dkœ’bnž`r ‹^vก†^{ก‚^ ~`ƒžzc‡›ve‹˜rh–nk““in˜dqœŒau ˆ^yก„^}ก€^ |_…Ÿx`‰Ÿsažnb”œheš™chž•`l ‘_qกŒ^uกˆ^yข…]}ฃ€[‚คz[ˆคt\กm`”œif–•jn“ŒoxŒƒv€†||…y€‡~y†~z„}‚~~‚~}‚}~ƒ{„{„~{‚ƒ||ƒ‚|~ƒ€{€„{„~{„}{‚„}|ƒƒ|}ƒ{€„|ƒ}}‚‚}}‚~~~~‚~~~€€~‚{~‡v„Œuo”hfœ^bฅVdฌ—QlฏŽPuฏ…P}ฎ~R„ฌwT‹ชqV‘จkX—ฅe\œก`a ›]gฃ–\lค[rฅ‹Ywง†X|จ€V‚ฉzVˆจtWฆoZ“ฃj]˜ eaœ_eฃ—YkจTsญ‡P|ฐ~O…ฐvPŒฎrRซpUฉnW‘จlW”จiX˜ฆe[ก`aก›\hฅ“Ypฆ‹Xwง…X}ฆYƒฅyZˆคt\ขp^’ ka–œhe™™ehœ•bmž`q Œ^uข‡]zข‚]ข~]„ขy^ˆกt_Ÿpa‘lc•›hf™—djœ“anŸ_rกŠ^wข†]|ข]ข|]†กw_ŠŸranc“šjg——gjš“dnœbsžŠ`wŸ…_| €_ |`†Ÿwa‹žrbœne“™jg—–fkš“cnarŸŠ_w †^{ก‚^€ก}^… x_‰ŸsaŽžoc’›ke•™hh˜•el›‘cpbužˆazŸƒ`~Ÿ~`ƒžyaˆucŒ›pe‘™mg”–ik—“fnšdrœ‹bwž†a{Ÿ`€Ÿ}`…Ÿxa‰žtbpc‘›ld•™if——fiš•dk’aoŸŽ_sกŠ]xข„]~ข}_…žxc‰šug‹–sj”ql’on‘mq“ks”‹ju–‰hw˜‡fz™ƒh”}p„Šz{…€zƒ…y{ˆ„u{‹ƒu|Š‚w~‡z~…{~„€{€ƒ|€ƒ|€ƒ|€‚~}‚~}‚}}ƒ‚|~„€{€ƒ~}€}€‚}€‚~}~~€€~‚€|„{€„{€„~{ƒ~|‚„}z‚†}xƒˆ|w„ˆ{w„Šzp†–xcˆขuZŒฆqY‘ฅk\—กdaœ_fข–\lค‘ZqฆŒXuจ‡WzจƒW~จVƒฉyV‰จrXฆkZ˜ฃd_Ÿ]eฅ–XmจVsฉ‰UyซƒT~ซ~TƒชyVˆจtXฆp[’ฃk^–Ÿgbš›cf—`k ’^oข\tฃˆ[zคƒ[ค}\„ฃx]‰ขs^Ž n`“jc—›ff›—cjž“`n ^rข‹\wค†[|ฅZ€ฅ|Z…ฅx[‰คs\Žขo^’Ÿka–œgdš™dh•alŸ‘_pกŒ^uข‡]zข‚]ข}]„กx^‰ t`Žžoc’›kf–˜giš”dmœaqŸ‹_v †^{ก]€ข}]…กx^Š s_Žžnb“œjd—™ghš•cl‘apŸ_tกˆ^yก„]~ข^‚กz_‡ v`‹žrbœne“™kh––gk™’eo›ŽbsžŠawŸ…`| _€Ÿ|`…Ÿxa‰žtbœpd‘šlg•—ik—’go™Žfs™‹fv™‡eyš„e}›d‚›ze‡™ugŒ–rj“om‘‘mn“jo–gqšŒcu‡azžƒ`ž~a‚{b…xbˆœucŒ›qe™mh”•im˜frš‹cw†a|ž€až{a†vb‹œqd›me•šhfš˜ciž“_oก_wžƒe€–{nˆŒuxŒ„sŒu‚‰~x†€z~…‚{|„„|zƒ…|zƒ†|yƒ†|y„†{y……z{„ƒ{}ƒ€}€€~€}~ƒ{~„{~„{}„‚{|„ƒ{{„„{z……yz‡„w{‰ƒu}Š€u€Š~w‚‡}{‚‚~~ƒ‚y}ˆv‚‹wrimœ•^jฆ”VnฌRwฏ‚PƒฏvQฌkV™ฆb\ŸŸ]cค˜Yiจ“VoซŽSsญŠQwฏ…O}ฐNƒฑyO‰ฏsQญlT•ฉgXšฅd]œ abŸš_hก”]nฃŽZtฆˆXzง‚Wจ~WƒจzX‡ฆwZŠคt]กp_‘žlc–šgg›–bl ]rค‰YyงƒX€จ|W†งwYŠฅs[Žฃp^ n`“žkb•œhd™šef˜ai •]lค‘ZpฆXuงˆXzง‚Y€ฅ|[…ขw^‹Ÿramd“™jg—–fkš’což`tกˆ\zค‚Y€ง|X†งvX‹ฆq[ขm_“ke“˜nkrtŠ‡x}…~|…‚x~‰€u€Šu€‰w€‡z€„|€‚}‚~}‚}}‚‚}}‚‚}}~~~€€€€~€~€~€~€~€~€€~€~€~€~€~€~€~€~€~€€~€~€~€~€~€~~€~€~€~€~~~~€~€€€€€€€€~€~€~€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€ \ No newline at end of file diff --git a/packages/altboot/files/c7x0/.mtn2git_empty b/packages/altboot/files/c7x0/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/c7x0/altboot-2.4.cfg b/packages/altboot/files/c7x0/altboot-2.4.cfg deleted file mode 100644 index 557730fa9f..0000000000 --- a/packages/altboot/files/c7x0/altboot-2.4.cfg +++ /dev/null @@ -1,30 +0,0 @@ -# -# Altboot machine configuration for: C7x0 / Kernel 2.4 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" - -SD_DEVICE="/dev/mmcda1" -SD_KERNEL_MODULE="/lib/modules/2.4.28/kernel/drivers/block/sharp_mmcsd_m.o" - -USB_STORAGE_MODULES="usb_ohci_pxa27x usb-storage" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/c7x0/altboot-2.6.cfg b/packages/altboot/files/c7x0/altboot-2.6.cfg deleted file mode 100644 index 8d91602b25..0000000000 --- a/packages/altboot/files/c7x0/altboot-2.6.cfg +++ /dev/null @@ -1,39 +0,0 @@ -# -# Altboot machine configuration for: c7x0 / Kernel 2.6 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -ENABLE_SOUND="yes" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" - -SD_DEVICE="/dev/mmcblk0p1" -SD_KERNEL_MODULE="" - -USB_STORAGE_MODULES="usb_ohci_pxa27x usb-storage" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -USB_NETWORKING_AVAILABLE="yes" -USB_NW_MODULES="usbcore pxa27x_udc ohci-hcd g_ether" -USB_NW_DEVICE="usb0" - -KEXEC_KERNEL_DIR="/boot" -KEXEC_BIN="/usr/sbin/kexec" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/collie/.mtn2git_empty b/packages/altboot/files/collie/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/collie/altboot-2.4.cfg b/packages/altboot/files/collie/altboot-2.4.cfg deleted file mode 100644 index 702902c9d0..0000000000 --- a/packages/altboot/files/collie/altboot-2.4.cfg +++ /dev/null @@ -1,26 +0,0 @@ -# -# Altboot machine configuration for: Collie / Kernel 2.4 -# - -# -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="3" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" -ENABLE_IMAGECONF="yes" - -SD_DEVICE="/dev/mmcda1" -SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o" -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/fic-gta01/.mtn2git_empty b/packages/altboot/files/fic-gta01/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/fic-gta01/altboot-2.6.cfg b/packages/altboot/files/fic-gta01/altboot-2.6.cfg deleted file mode 100644 index 2ad9406083..0000000000 --- a/packages/altboot/files/fic-gta01/altboot-2.6.cfg +++ /dev/null @@ -1,41 +0,0 @@ -# -# Altboot machine configuration for: Akita / Kernel 2.6 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -ENABLE_SOUND="yes" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" -ENABLE_IMAGECONF="no" - -SD_DEVICE="/dev/mmcblk0p1" -SD_KERNEL_MODULE="s3cmci.ko" - -USB_HOST_AVAILABLE="yes" -USB_STORAGE_MODULES="ohci_hcd usb_storage sd_mod" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -USB_NETWORKING_AVAILABLE="yes" -USB_NW_MODULES="usbcore pxa27x_udc ohci-hcd g_ether" -USB_NW_DEVICE="usb0" - -KEXEC_KERNEL_DIR="/boot" -KEXEC_BIN="/usr/sbin/kexec" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/fic-gta01/altboot-menu/.mtn2git_empty b/packages/altboot/files/fic-gta01/altboot-menu/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/fic-gta01/altboot-menu/00-Default b/packages/altboot/files/fic-gta01/altboot-menu/00-Default deleted file mode 100644 index 9d29fdae2a..0000000000 --- a/packages/altboot/files/fic-gta01/altboot-menu/00-Default +++ /dev/null @@ -1,14 +0,0 @@ -# !/bin/sh -M_TITLE="Normal Boot" - - -run_module() { - exec $REAL_INIT "$INIT_RUNLEVEL" - exit 0 -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/fic-gta01/altboot-menu/15-bootSD b/packages/altboot/files/fic-gta01/altboot-menu/15-bootSD deleted file mode 100644 index 3cf49deea5..0000000000 --- a/packages/altboot/files/fic-gta01/altboot-menu/15-bootSD +++ /dev/null @@ -1,32 +0,0 @@ -# !/bin/sh -# -# Copyright Matthias Hentges (c) 2005 -# -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the GPL) - - -M_TITLE="Boot SD card" - -test "$DISABLE_SD_BOOT" = yes && exit 0 - -# This function is activated by init.altboot by calling this script with the "run" option -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - # Mount /proc, etc - init_rootfs - - mount_sd - - # Check for a real fs and loop-images. - check_target "$SD_MOUNTPOINT" >/dev/tty0 - -} - - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/fic-gta01/altboot-menu/Advanced/.mtn2git_empty b/packages/altboot/files/fic-gta01/altboot-menu/Advanced/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/fic-gta01/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/fic-gta01/altboot-menu/Advanced/40-bootNFS deleted file mode 100644 index 4f5c195be2..0000000000 --- a/packages/altboot/files/fic-gta01/altboot-menu/Advanced/40-bootNFS +++ /dev/null @@ -1,110 +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: 40-bootNFS -# Date: 14-Apr-06 - - -M_TITLE="Boot from NFS" - -test "$DISABLE_NFS_BOOT" = yes && exit 0 - -# This function is activated by init.altboot by calling this script with the "run" option -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - # Mount /proc, etc - init_rootfs - - nfs_host="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'|sed -n "s/\(.*\)\:\(.*\)/\1/p" `" - nfs_mounts="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'`" - nfs_mountpoints="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $2}'`" - - start_networking "$nfs_host" - - if test -z "$nfs_host" - then - mdie "${C_RED}No configured NFS drives found in /etc/fstab$C_RESET" - - fi - - - if test "` echo "$nfs_mountpoints" |wc -l | tr -d " "`" -gt 1 - then - echo -e "Please select your NFS root:\n" - - cnt=1 - for nfs_mount in $nfs_mountpoints - do - echo -e "\t[$cnt] $nfs_mount" - let cnt=$cnt+1 - done - - echo "" - - while test -z "$selection" - do - stty echo - echo -n "Boot NFS root: " - - if test "$AUTOBOOT" != "yes" - then - read junk < /dev/tty1 - else - if test -e /etc/.altboot-bootNFS-source.last - then - junk="`cat /etc/.altboot-bootNFS-source.last`" - test -z "$junk" && read junk < /dev/tty1 || echo "$junk (autoboot)" - else - read junk < /dev/tty1 - fi - fi - - - cnt=1 - for nfs_mount in $nfs_mounts - do - if test "$junk" = "$cnt" - then - selection="$nfs_mount" - echo "$junk" > /etc/.altboot-bootNFS-source.last - fi - let cnt=$cnt+1 - done - - done - else - test -z "$nfs_mounts" && die "No NFS mounts configured in /etc/fstab!" - selection="$nfs_mounts" - fi - - mkdir -p /media/nfsroot || mdie "mkdir -p /media/nfsroot failed!" - - echo -n "Mounting NFS root..." - - if ( mount | grep -q "/media/nfsroot" ) - then - echo "/media/nfsroot already used, tying to umount..." - umount /media/image - losetup -d /dev/loop0 - umount /media/nfsroot || die "umount failed!" - fi - - mount -t nfs "$selection" /media/nfsroot && echo ok || mdie "mount -t nfs "$selection" /media/nfsroot failed!" - - # Use configured resolv.conf in the pivoted rootfs - #echo -n "Copying resolv.conf..." - #cp /etc/resolv.conf /media/nfsroot/etc && echo ok || echo "FAILED" - - check_target "/media/nfsroot" bootNFS - -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot deleted file mode 100644 index 74200d1ec9..0000000000 --- a/packages/altboot/files/init.altboot +++ /dev/null @@ -1,606 +0,0 @@ -#!/bin/sh -# -# altboot provides a simple bootmenu before init is beeing run. -# There are two default menu entries: "Normal boot" and "Single user mode" -# New menu entries can be created be putting files into /etc/altboot-menu. -# - -test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - -CURRENT_ENV="`set`" -VERSION="DEVELOPER SNAPSHOT" - -# Set some defaults in case altboot.cfg is missing -REAL_INIT="/sbin/init.sysvinit" - -# Read default runlevel from inittab -INIT_RUNLEVEL="`cat /etc/inittab | sed -n "/^id\:/s/id\:\([0-9]\)\:.*$/\1/p"`" -test -z "$INIT_RUNLEVEL" && INIT_RUNLEVEL=5 - -# If this step fails the results are fatal. Seen on Collie / kernel 2.4 (where else...) -OUT_TTY="`tty`" ; test -z "$OUT_TTY" && OUT_TTY="/dev/tty1" - -if ( echo "$OUT_TTY" | grep -q "not" ) -then - OUT_TTY="/dev/tty1" - echo "WARNING: Assignment of OUT_TTY failed (2)!" > "$OUT_TTY" -fi - -case "`uname -r`" in -2.6*) ALTBOOT_CFG_FILE="/etc/altboot-2.6.cfg";; -2.4*) ALTBOOT_CFG_FILE="/etc/altboot-2.4.cfg";; -*) echo "Warning: Unknown kernel [`uname -r`], using kernel 2.6 configuration!" - ALTBOOT_CFG_FILE="/etc/altboot-2.6.cfg";; -esac - -test -e "$ALTBOOT_CFG_FILE" && . "$ALTBOOT_CFG_FILE" || echo "WARNING: No $ALTBOOT_CFG_FILE found! Check your installation of Altboot!" > "$OUT_TTY" - -if test -e "${ALTBOOT_CFG_FILE}.next-reboot" -then - . "${ALTBOOT_CFG_FILE}.next-reboot" - rm "${ALTBOOT_CFG_FILE}.next-reboot" -fi - -ENABLE_DEBUG="$ENABLE_DEBUGGING" - -C_RED="\033[31m" -C_YELLOW="\033[33m" -C_BLUE="\033[34m" -C_WHITE="\033[37m" -C_RESET="\033[0m" - - -die() { - echo -e "${C_RED}ERROR: $1${C_RESET}" >"$OUT_TTY" - exec $SH_SHELL <"$OUT_TTY" >"$OUT_TTY" 2>&1 -} - -debug_shell() { - # VT 2 = Opie, VT 3 = GPE - test -z "$1" && VT=4 || VT=$1 - - echo -e "\033c" > /dev/tty$VT - - echo -en "\nPress to activate the debug shell." > /dev/tty$VT - read junk /dev/tty$VT - /bin/sh /dev/tty$VT 2>&1 - - #openvt -lf -c$VT -- /bin/sh /dev/tty$VT 2>&1 -} - -# This function prints the boot-menu -# $1: Directory containing the scripts for the menu-items -show_menu() { - test -z "$1" && die "DEBUG: Parameter 1 is empty in show_menu" - ! test -d "$1" && die "show_menu: [$1] not found or no directory." - - echo "" - echo -e "altboot v$VERSION\n" - - m_entry="" - - cd $1 - - cnt=0 ; reset_pref "menu_filelist" - for file in `ls -1` - do -# debug_echo "show_menu(): file = [$file]" - if ! test -d "$1/$file" - then - # NOTE: It is important to use "." here so that the script inherits - # the shell environment / all set variables! - M_TITLE="`. $1/$file title`" - FLAGS="`$1/$file flags`" - - if ! test -z "$M_TITLE" - then - let cnt=$cnt+1 - # Keep a list of existing "modules" together with an index number - # This sure is ugly, but Busybox sh doesn't do arrays.... - #m_entry="`echo -e "$m_entry\n$cnt:$file\n"`" - - set_pref "menu_filelist" "$cnt" "$file" - test -n "$FLAGS" && set_pref "menu_fileflags" "$cnt" "$FLAGS" - echo -e "\t\t[$cnt] $M_TITLE" - fi - M_TITLE="" - fi - done - -# debug_echo "FILES READ" - - # Display directories below /etc/altboot-menu as menu-item - # and add all scripts inside the directory to m_entry - for dir in `ls -1` - do - if test -d "$1/$dir" - then - M_TITLE="`basename "$1/$dir"`" - if ! test -z "$M_TITLE" - then - let cnt=$cnt+1 - # Keep a list of existing "modules" together with an index number - # This sure is ugly, but Busybox sh doesn't do arrays.... - - set_pref "menu_filelist" "$cnt" "$dir:DIR" - - # Set noRemember flag for directories - set_pref "menu_fileflags" "$cnt" "noRemember" - - echo -e "\t\t[$cnt] $M_TITLE" - - OLD_PWD="$PWD" - cd "$1/$dir" - for file in `ls -1` - do - if ! test -d "$1/$dir/$file" - then - M_TITLE="`$1/$dir/$file title`" - FLAGS="`$1/$dir/$file flags`" - - if ! test -z "$M_TITLE" - then - let cnt=$cnt+1 - # Keep a list of existing "modules" together with an index number - # This sure is ugly, but Busybox sh doesn't do arrays.... - - set_pref "menu_filelist" "$cnt" "$dir/$file" - test -n "$FLAGS" && set_pref "menu_fileflags" "$cnt" "$FLAGS" - fi - M_TITLE="" - fi - done - cd "$OLD_PWD" - - else - debug_echo "show_menu(): \$M_TITLE is empty" - fi - M_TITLE="" - fi - done - -# debug_echo "DIRS READ" - - echo "" -} - -# This function is used to display the content of directories below -# /etc/altboot-menu as menu-items -show_sub_menu() { - dirname="`basename "$1"`" - - d_entries="`dump_pref "menu_filelist" | grep "$dirname/"`" - - echo -e "\naltboot v$VERSION: $dirname menu\n" - - for d_entry in $d_entries - do - d_entry_number="`echo "$d_entry"| sed -n "s/\(.*\)\#\#\(.*\)\#\#\#/\1/p"`" - d_entry_file="`echo "$d_entry"| sed -n "s/\(.*\)\#\#\(.*\)\#\#\#/\2/p"`" - d_entry_title="`$d_entry_file title`" - - echo -e "\t\t[$d_entry_number] $d_entry_title" - done - - echo "" - -} - -get_kbd_ints(){ - if ( uname -r | grep -q ^2.6 ) - then - if test -z "$KBD_INT" - then - # find out how the keyboard is called - for kbd in Spitzkbd corgikbd locomokbd tosakbd "Neo1973 AUX button" - do - if ( cat /proc/interrupts | grep -q "$kbd" ) - then - debug_echo "run_timer(): Using [$kbd] as keyboard interrupt" - KBD_INT="$kbd" - break - fi - done - fi - key_ints="`cat /proc/interrupts | grep "$KBD_INT"`" - #debug_echo "run_timer(): key_ints = [$key_ints]" - else - KBD_INT="$kbd" - debug_echo "\nrun_timer(): Using [keyboard] as keyboard interrupt in kernel-2.4 mode" - key_ints="`cat /proc/interrupts | grep keyboard | awk '{print $2}'`" - fi - - test -z "$KBD_INT" && debug_echo "Couldn't read keyboard ints!" -} - -# Shows the timer and sets $launch_altboot to yes if a keypress was detected -run_timer() { - if test "$TIMEOUT" != 0 -a "$TIMEOUT" != "[none]" - then - - mount -t proc proc /proc >/dev/null 2>&1 - - get_kbd_ints - kbd_ints_old="$key_ints" - - #debug_echo "run_timer() old:`echo $key_ints | md5sum`" - - stty -echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - - case "$KBD_INT" in - Neo1973*) echo -en "\n\nPlease press [AUX] to launch altboot." > "$OUT_TTY" ;; - *) echo -en "\n\nPlease press any key to launch altboot." > "$OUT_TTY" ;; - esac - - test -z "$TIMEOUT" && TIMEOUT="3" - - cnt=0 - while test "$cnt" != "$TIMEOUT" - do - sleep 1 - - get_kbd_ints - kbd_ints_new="$key_ints" - - if test "$kbd_ints_new" != "$kbd_ints_old" -o -z "$kbd_ints_new" - then - launch_altboot=yes - stty echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - break - fi - echo -n "." >"$OUT_TTY" - let cnt=$cnt+1 - done - - if test "$launch_altboot" != "yes" - then - AUTOBOOT=yes - else - rm -f /etc/.altboot*.last - fi - - else - launch_altboot=yes - fi - - if test "$TIMEOUT" = "[none]" - then - echo "" - echo -e "altboot v$VERSION ($MACHINE)\n" - - echo "NOTE: The menu is not available on this device" - echo "Use \"set-bootdev\" to change the boot device" - - launch_altboot=no - fi -} - -# $1 = ID -parse_module_flags() { - if test -n "$1" - then - # Each module can set "flags" to influence handling of the module - get_pref "menu_fileflags" "$1" flags - - test -n "$flags" && debug_echo "parse_module_flags(): [$1] has flags [$flags]" - - for flag in $flags - do - case "$flag" in - noRemember) REMEMBER_LAST_SELECTION=no;; - esac - done - else - debug_echo "parse_module_flags(): Empty \$1" - fi -} - -# This function launches the selected menu item / script -# $1: Directory containing the scripts for the menu-items -launch_selection() { - test -z "$1" && die "Parameter 1 of launch_selection is empty!" - - case "$junk" in - *) #file="`echo "$m_entry"| sed -n "/$junk\:/s/^.*\:\(.*\)/\1/p"`" - - get_pref "menu_filelist" "$junk" file_ - type="`echo "$file_" | sed -n "s/\(.*\)\:\(.*\)/\2/p"`" - file="`echo "$file_" | sed -n "s/\(.*\)\:\(.*\)/\1/p"`" - test -z "$file" && file="$file_" - -# debug_echo "[$file_]: [$type] : [$flags] / [$file] ($junk)" - - # The selected menu-item points to a directory - if test "$type" = DIR - then - show_sub_menu /etc/altboot-menu/$file >"$OUT_TTY" - wait_for_input >"$OUT_TTY" - launch_selection /etc/altboot-menu >"$OUT_TTY" - fi - - if test "$type" = MAIN - then - show_sub_menu /etc/altboot-menu >"$OUT_TTY" - wait_for_input >"$OUT_TTY" - launch_selection /etc/altboot-menu >"$OUT_TTY" - fi - - - - . $1/$file run "$file" >"$OUT_TTY" - die "WARNING: Using failsafe shell" >"$OUT_TTY" - - ;; - esac -} - - -wait_for_input() { - - # Neo has only two buttons: AUX and PWR. - # Only AUX is easily readable from userspace, so are touchscreen taps - if test "$KBD_INT" = "Neo1973 AUX button" - then - ints_old="`cat /proc/interrupts | grep "$KBD_INT" | awk '{print $2}'`" - ts_ints_old="`cat /proc/interrupts |grep action| tail -1 | awk '{print $2}'`" - - echo "Please press [AUX] to set a menu number" <"$OUT_TTY" > "$OUT_TTY" 2>&1 - echo -e "Press the touchscreen to start\n" - - x="$last_selection" ; hold_events=0 - - echo -n "Your Choice: [$x / $cnt]" - - while true - do - - ts_ints_now="`cat /proc/interrupts |grep action| tail -1 | awk '{print $2}'`" - - if test "$ts_ints_now" = "$ts_ints_old" - then - ints_now="`cat /proc/interrupts | grep "$KBD_INT" | awk '{print $2}'`" - - if test "$ints_now" -gt "$ints_old" - then - # Only react on every second interupt as both PRESS and RELEASE generate - # one. - if test -n "$tmp" - then - #debug_echo "wait_for_input(): PRESS/RELEASE EVENT [$ints_now <-> $ints_old]" - - MAX_ENTRIES="$cnt" - - test "$x" = "$cnt" && x=1 || let x=$x+1 - - #\r : go to beginning of the current line - #\033[K : completely clear the current line - echo -en "\r\033[KYour Choice: [$x / $cnt]" - - - tmp="" - else - tmp=blahh - fi - fi - - ints_old="$ints_now" - else -# debug_echo "wait_for_input(): TOUCHSCREEN EVENT [$ts_ints_now <-> $ts_ints_old]" - ts_ints_old="$ts_ints_now" - - parse_module_flags "$x" - - if test "$REMEMBER_LAST_SELECTION" != no - then - # Don't remount rw if the drive is already mounted rw - # Only helpful for testing / debugging - if test "`mount|sed -n "/\/dev\/root/s/.*(\(.*\))/\1/p"`" != "rw" - then - mount -o remount,rw / >/dev/null 2>&1 - echo "$x" > /etc/altboot.conf - mount -o remount,ro / >/dev/null 2>&1 - else - echo "$x" > /etc/altboot.conf - fi - fi - - junk="$x" - break - - fi - done - else - while true - do - - # Do _not_ change the next few lines! - # - # This is required to work around an annoying busybox bug. - # Every key you press while this script runs will be - # picked up by the next "read $junk". - # So the next read would pick up the "any" key the user pressed - # above to launch the altboot menu. - - - # Bash throws an ugly error on kill - if ! (readlink /bin/sh | grep -q bash) - then - # This filters an "" from the user as "any key" - ( while :; do read x< "$OUT_TTY" 2>&1; done; ) > /dev/null 2>&1 & - sleep 1; kill $! >/dev/null 2>&1 - fi - - echo -n "Please choose one of the above [$last_selection]: " <"$OUT_TTY" > "$OUT_TTY" 2>&1 - stty echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - read junk< "$OUT_TTY" 2>&1 - - # This filters other chars the user may have used - - junk="`echo "$junk" | sed "s/[a-zA-Z]//g"`" - - if test "$junk" -lt "$cnt" -o "$junk" -eq "$cnt" - then - if test ! -z "$junk" - then - parse_module_flags "$junk" - - if test "$REMEMBER_LAST_SELECTION" != no - then - # Don't remount rw if the drive is already mounted rw - # Only helpful for testing / debugging - if test "`mount|sed -n "/\/dev\/root/s/.*(\(.*\))/\1/p"`" != "rw" - then - mount -o remount,rw / >/dev/null 2>&1 - echo "$junk" > /etc/altboot.conf - mount -o remount,ro / >/dev/null 2>&1 - else - echo "$junk" > /etc/altboot.conf - fi - fi - else - junk="$last_selection" - parse_module_flags "$junk" - break - fi - break - fi - done - fi -} - -# * * * * * * This is the main function * * * * * * - -if ( echo "$VERSION" | egrep -iq "(snapshot|-rc)" ) -then - if test "$ENABLE_DEBUGGING" = "auto" -o -z "$ENABLE_DEBUGGING" - then - ENABLE_DEBUG="yes" - fi -fi - -test "$ENABLE_DEBUG_SHELL" = "yes" && debug_shell 4 >/dev/null 2>&1 & - -if test "$ENABLE_DEBUGGING" = "yes" -then - ENABLE_DEBUG="yes" - debug_shell 4 >/dev/null 2>&1 & -fi - -# Note: this is positively ugly. If someone knows a better way to detect whether -# we are already booted into a runlevel _without_ reading /var and / or using `runlevel` -# PLEASE let me know. -# -# The NSLU2 is an exception as it uses the way-ugly busybox "ps" -# - -mount | grep -q "^/proc" || mount -t proc proc /proc -MACHINE="`cat /proc/cpuinfo | sed -n "/^Hardware/s/.*\:\ \(.*\)/\1/p"`" - -case "$MACHINE" in - *NSLU2) if test -f /proc/cmdline -a "`ps |wc -l|tr -d " "`" -gt 25 -a "$1" != "-force" -a "$1" != "+force" - then - user_called=1 - fi - ;; - - *) if test -f /proc/cmdline -a "`ps ax|wc -l|tr -d " "`" -gt 30 -a "$1" != "-force" -a "$1"!= "+force" >/dev/null 2>&1 - then - user_called=1 - fi - ;; -esac - -if test "`basename "$0"`" = "altboot" -then - show_menu /etc/altboot-menu - exit 0 -fi - -if test "$user_called" = "1" -then - echo "altboot: Using real init [$REAL_INIT] [$*] [`ps |wc -l|tr -d " "`] *" >"$OUT_TTY" - exec $REAL_INIT $* -# exec $SH_SHELL /dev/tty0 2>&1 - exit 0 -else - # Boot original init if altboot is turned off - if test "$ENABLE_ALTBOOT" != "yes" - then - echo "altboot: Using real init [$REAL_INIT] **" >"$OUT_TTY" - exec $REAL_INIT $INIT_RUNLEVEL - exit 0 - fi - - # Execute scripts in /etc/altboot.rc before doing anything else. - # Required in special situations, like booting spitz - RC_FILES=`ls /etc/altboot.rc | grep \.sh$` - - for file in $RC_FILES - do - . /etc/altboot.rc/$file >"$OUT_TTY" 2>&1 || echo "/etc/altboot.rc/$file failed!" - done - - # Make sure altboots master password is set - set_password >"$OUT_TTY" - - test "$ASK_PW_ON_BOOT" = "yes" && verify_master_pw >"$OUT_TTY" - - # When started with -force, always print the menu - echo "$*" | grep -q -- "-force" && TIMEOUT=0 - - # This timeout works by reading /proc/interrupts to see if the keyboard interrupt - # increases while the timer is running. A TIMEOUT of 0 will always launch altboot. - run_timer >"$OUT_TTY" - - echo "" >"$OUT_TTY" - - # launch_altboot is set to "yes" by run_timer when the user presses the button during the timeout - if test "$launch_altboot" != yes - then - # last_selection is the previously selected menu item by the user - last_selection="`cat /etc/altboot.conf`" >/dev/null 2>&1 - test -z "$last_selection" && last_selection="1" - - echo "Booting last selection: [$last_selection]" >"$OUT_TTY" - - # Set up the wanna-be array of available menu entries and their numbers - show_menu /etc/altboot-menu >/dev/null 2>&1 - - junk="$last_selection" - launch_selection /etc/altboot-menu >"$OUT_TTY" - fi - - # Anything after this point will never be reached if $launch_altboot != yes - - # Show the altboot menu - stty -echo <"$OUT_TTY" >"$OUT_TTY" 2>&1 - show_menu /etc/altboot-menu >"$OUT_TTY" - - # Load last selection for use as default if is pressed at the prompt - last_selection="`cat /etc/altboot.conf`" >/dev/null 2>&1 - test -z "$last_selection" && last_selection="1" - - # Ask the user which menu-item to use - wait_for_input >"$OUT_TTY" - - # This should _never_ happen. - if test -z "$junk" - then - echo "WARNING: Trying failsafe mode" >"$OUT_TTY" - mount -o remount,rw / >"$OUT_TTY" 2>&1 - echo "Dumping environment to /altboot.env" - echo "$CURRENT_ENV" > /altboot.env - mount -o remount,ro / >"$OUT_TTY" 2>&1 - junk=1 - fi - - launch_selection /etc/altboot-menu >"$OUT_TTY" - - # Uhoh, something went terribly wrong if we reach this point! - die "WARNING: Failsafe fall-through activated. Spawning emergency shell" - -fi - - diff --git a/packages/altboot/files/nslu2le/.mtn2git_empty b/packages/altboot/files/nslu2le/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/nslu2le/altboot-2.6.cfg b/packages/altboot/files/nslu2le/altboot-2.6.cfg deleted file mode 100644 index 626c543085..0000000000 --- a/packages/altboot/files/nslu2le/altboot-2.6.cfg +++ /dev/null @@ -1,55 +0,0 @@ -# -# Altboot machine configuration for: NSLU2 / Kernel 2.6 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" - -# If set to "0" the menu will always be shown, if set to -# "[none]" there will be no menu and no delay -TIMEOUT="[none]" - -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -ENABLE_SOUND="no" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" - - -# Can't do that due to missing console -ENABLE_IMAGECONF="no" - -SD_DEVICE="" -SD_KERNEL_MODULE="" - - -USB_HOST_AVAILABLE="yes" -USB_STORAGE_MODULES="ohci_hcd usb_storage sd_mod" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -USB_NETWORKING_AVAILABLE="no" -USB_NW_MODULES="usbcore pxa27x_udc ohci-hcd g_ether" -USB_NW_DEVICE="usb0" - -INIT_RUNLEVEL="3" -NO_GUI_RL="" - -# The if set to "", altboot will force you to set a master password on -# first-boot -MASTER_PASSWORD="[none]" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" - -DISABLE_SD_BOOT="yes" -DISABLE_CF_BOOT="yes" -DISABLE_NOGUI_BOOT="yes" -DISABLE_BINSH_BOOT="yes" -DISABLE_INSTTGZ_BOOT="yes" diff --git a/packages/altboot/files/nslu2le/altboot-handlers/.mtn2git_empty b/packages/altboot/files/nslu2le/altboot-handlers/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/nslu2le/altboot-handlers/05-USB-Storage b/packages/altboot/files/nslu2le/altboot-handlers/05-USB-Storage deleted file mode 100644 index 50d35ed542..0000000000 --- a/packages/altboot/files/nslu2le/altboot-handlers/05-USB-Storage +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh -# NOTE: Ported to altboot by CoreDump -# Based on the original turnup helper script. -# -# All parts by Matthias 'CoreDump' Hentges are hereby placed -# under the terms of the GPL -# -# boot from the hard disk partition "$1" (which -# must be given) using options from the rest of -# the command line. -# - -M_TITLE="Boot USB Storage" -test "$USB_HOST_AVAILABLE" = "yes" || exit 0 - -run_module() { - x=x -} - -case "$1" in -title) echo "$M_TITLE" ; exit 0 ;; -run) run_module "$2";; -esac - -nslu2_feeback heartbeat - -bootdev_data="$*" -bootdev_mode="`echo "$bootdev_data" | awk '{print $1}'`" -bootdev_name="`echo "$bootdev_data" | awk '{print $2}'`" -bootdev_uuid="`echo "$bootdev_data" | awk '{print $3}'`" - - -# Use the standard init path (see /etc/init.d/rcS) -export PATH=/sbin:/bin:/usr/sbin:/usr/bin -# -# Load the helper functions -. /etc/default/functions -. /etc/default/modulefunctions -# -leds boot system -# -if test -n "$1" -then - device="$bootdev_name" - UUID="$bootdev_uuid" - - shift - # proc is needed for UUID mount and module load - mount -t proc proc /proc - # load USB & SCSI storage modules (/proc required!) - echo "boot: loading modules required for disk boot" - loaddiskmods - # waiting for disk (FIXME) - sleep=6 - test "$sleep" -gt 0 && sleep "$sleep" - # - # fire the boot - echo "boot: rootfs: mount $* $device [$UUID]" - # - # Mount read-write because before exec'ing init - # If a UUID is given (in the environment) this - # is used in preference to the device, but if - # the UUID mount fails a standard device mount - # is attempted. - if test -n "$UUID" && - mount "$@" -U "$UUID" /mnt || - mount "$@" "$device" /mnt - then - # checkmount checks for sh, chroot, init - # and /mnt (i.e. /mnt/mnt in this case) - if checkmount /mnt - then - # pivot to /initrd if available, else /mnt - cd / - if test -d /mnt/initrd - then - swivel mnt initrd - else - swivel mnt mnt - fi - # swivel failed - fi - # Failure: unmount the partition - umount /mnt - fi -fi - -# fallback - use the flash boot -nslu2_feeback failure -exec /boot/flash diff --git a/packages/altboot/files/nslu2le/altboot-handlers/10-Onboard-Flash b/packages/altboot/files/nslu2le/altboot-handlers/10-Onboard-Flash deleted file mode 100644 index 394279c2af..0000000000 --- a/packages/altboot/files/nslu2le/altboot-handlers/10-Onboard-Flash +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2007 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) -# -# Filename: 10-Onboard-Flash -# Date: 20070218 (YMD) - -leds beep -. /etc/default/functions -leds boot system -test -x /sbin/init && exec /sbin/init -# fallback if /sbin/init has been deleted (bad!) -leds boot system panic -exec <>/dev/console >&0 2>&0 -test -x /sbin/sulogin && exec /sbin/sulogin -test -x /bin/sh && exec /bin/sh -exit 1 diff --git a/packages/altboot/files/nslu2le/altboot-menu/.mtn2git_empty b/packages/altboot/files/nslu2le/altboot-menu/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/nslu2le/altboot-menu/00-Default b/packages/altboot/files/nslu2le/altboot-menu/00-Default deleted file mode 100644 index cb06661d72..0000000000 --- a/packages/altboot/files/nslu2le/altboot-menu/00-Default +++ /dev/null @@ -1,17 +0,0 @@ -# !/bin/sh -M_TITLE="Flash" - - -run_module() { - leds beep - leds boot system - exec $REAL_INIT "$INIT_RUNLEVEL" - exit 0 -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -*) echo "Unknown parameter [$1]";; -esac - diff --git a/packages/altboot/files/nslu2le/altboot-menu/30-bootUSB-Stick b/packages/altboot/files/nslu2le/altboot-menu/30-bootUSB-Stick deleted file mode 100644 index c6c215ecc4..0000000000 --- a/packages/altboot/files/nslu2le/altboot-menu/30-bootUSB-Stick +++ /dev/null @@ -1,174 +0,0 @@ -# !/bin/sh -# -# Copyright Matthias Hentges (c) 2005 -# -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the GPL) - - -M_TITLE="USB Attached Storage" - -test "$USB_HOST_AVAILABLE" = "yes" || exit 0 - -# This function is activated by init.altboot by calling this script with the "run" option -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - # Mount /proc, etc - init_rootfs - - echo -e "\nStarting USB..." - - for module in $USB_STORAGE_MODULES - do - echo -en "\t - $module: " - modprobe "$module" >/dev/null 2>&1 && echo ok || die "Failed to modprobe [$module]" - done - - echo "" - scan_devices - usb_show_menu - -# echo -n "Mounting $USB_STORAGE_PARTITION..." >/dev/tty0 -# -# mkdir -p /media/usb-storage >/dev/null 2>&1 -# -# sleep "$USB_STORAGE_WAIT" -# -# /bin/mount -t auto -o defaults,noatime $USB_STORAGE_PARTITION /media/usb-storage >/dev/null 2>&1 && echo ok >/dev/tty0|| die "/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT failed" -# -# echo "" -# -# # Check for a real fs and loop-images. -# check_target "/media/usb-storage" >/dev/tty0 -} - -scan_devices() { - reset_pref "available_devices" - - cnt=1 - - for scsi_disk in `ls -1 /sys/block/ | grep ^sd` - do - scsi_disk_name="`echo "$scsi_disk" | awk '{printf("%s\n",toupper($0))}'`" - test -e /sys/block/$scsi_disk/device/vendor && HDD_VENDOR="`cat /sys/block/$scsi_disk/device/vendor | sed "s/\ $//"`" - test -z "$HDD_VENDOR" && HDD_VENDOR="Unknown Vendor" - - test -e /sys/block/$scsi_disk/device/model && HDD_MODEL="`cat /sys/block/$scsi_disk/device/model`" - test -z "$HDD_MODEL" && HDD_MODEL="Unknown Model" - - scsi_disk_partition_cnt="`ls -1 /sys/block/$scsi_disk | grep ^$scsi_disk | wc -l | tr -d " "`" - test "$scsi_disk_partition_cnt" -gt 1 && scsi_disk_partition_cnt="$scsi_disk_partition_cnt partitions" || scsi_disk_partition_cnt="$scsi_disk_partition_cnt partition" - - set_pref "available_devices" "$cnt" "$scsi_disk_name ( $HDD_VENDOR $HDD_MODEL with $scsi_disk_partition_cnt)" - set_pref "available_devices_short" "$cnt" "$scsi_disk" - set_pref "available_devices_type" "$cnt" "usb" - - let cnt=$cnt+1 - done - -} - -usb_show_menu() { - - cnt2=0 ; let cnt=$cnt-1 - while test "$cnt" != "$cnt2" - do - let cnt2=$cnt2+1 - get_pref "available_devices" "$cnt2" dev - - echo -e "\t[$cnt2] - $dev" - done - - while test -z "$selected_dev" - do - echo -en "\nYour choice: " - read junk - get_pref "available_devices" "$junk" selected_dev - get_pref "available_devices_type" "$junk" part_mode - -# debug_echo "show_menu(): selected: [$selected_dev]" - done - - if ( echo "$selected_dev" | grep -q "^Flash" ) - then - boot_from flash - else - get_pref "available_devices_short" "$junk" selected_dev -# debug_echo "show_menu(): selected_devices_short: [$selected_dev]" - - partitions="`ls -1 /sys/block/$selected_dev|grep ^$selected_dev`" - test -z "$partitions" && die "No partitions found on /dev/$selected_dev!" - - - echo -e "\nPlease select a partition on $selected_dev to boot from:\n" - - cnt=1 - for partition in $partitions - do - # We assume that partitions with a "size" < 10 are extended partitions - # and should not be listed. TYPE=swap is blacklisted as well. - part_size="`cat /sys/block/$selected_dev/$partition/size`" - part_type="`blkid -s TYPE -o value /dev/$partition`" - - if test "$part_size" -gt 10 -a "$part_type" != "swap" - then - let part_size="($part_size/2)/1000" - echo -e "\t[$cnt] $partition (~ ${part_size}Mb, $part_type)" - set_pref "available_partitions" "$cnt" "$partition" - - let cnt=$cnt+1 - fi - done - - while test -z "$selected_partition" - do - echo -en "\nYour choice: " - read junk - get_pref "available_partitions" "$junk" selected_partition - done - - part_uuid="`blkid -c /dev/null -s UUID -o value /dev/$selected_partition`" - - boot_from "$part_mode" "$selected_partition" "$part_uuid" - fi -} - -boot_from() { - debug_echo "boot_from() [$*]" - - part_mode="$1" - part_name="$2" - part_uuid="$3" - - case "$part_mode" in - usb) umount /tmp/mnt.set-bootdev >/dev/null 2>&1 - rm -rf /tmp/mnt.set-bootdev ; mkdir -p /tmp/mnt.set-bootdev - - if ! ( mount -U "$part_uuid" /tmp/mnt.set-bootdev ) - then - echo "** Note: UUID mount for $part_name failed" - mount /dev/$part_name /tmp/mnt.set-bootdev && echo "** Note: Normal mount for $part_name successful" - fi - - if ! test -e /tmp/mnt.set-bootdev/sbin/init.sysvinit - then - copy_rootfs /tmp/mnt.set-bootdev/ - else - umount /tmp/mnt.set-bootdev - echo -e "\nSetting /dev/$part_name as boot-partition" - echo "3 $part_name $part_uuid" > /etc/altboot.last - fi - ;; - esac -} - -copy_rootfs() { - debug_echo "copy_rootfs() [$*]" -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/nslu2le/altboot-menu/55-bin-sh b/packages/altboot/files/nslu2le/altboot-menu/55-bin-sh deleted file mode 100644 index 1c3fccd9d9..0000000000 --- a/packages/altboot/files/nslu2le/altboot-menu/55-bin-sh +++ /dev/null @@ -1,27 +0,0 @@ -# !/bin/sh -M_TITLE="init=/bin/sh" - -test "$DISABLE_BINSH_BOOT" = yes && exit 0 - -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - test "$ASK_PW_ON_BOOT" != "yes" && verify_master_pw >$OUT_TTY - - # Mount /proc, etc - init_rootfs - - echo -e "\nBoot system with 'exec /sbin/init 5'\n" - while true - do - exec $SH_SHELL <$OUT_TTY >$OUT_TTY 2>&1 - echo "WARNING: Shell was killed!" - done -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/nslu2le/altboot.rc/.mtn2git_empty b/packages/altboot/files/nslu2le/altboot.rc/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/poodle/.mtn2git_empty b/packages/altboot/files/poodle/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/poodle/altboot-2.4.cfg b/packages/altboot/files/poodle/altboot-2.4.cfg deleted file mode 100644 index 1bce54015c..0000000000 --- a/packages/altboot/files/poodle/altboot-2.4.cfg +++ /dev/null @@ -1,26 +0,0 @@ -# -# Altboot machine configuration for: Poodle / Kernel 2.4 -# - -# -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="3" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="no" -SD_DEVICE="/dev/mmcda1" -SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o" -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -ENABLE_IMAGECONF="yes" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/poodle/altboot-2.6.cfg b/packages/altboot/files/poodle/altboot-2.6.cfg deleted file mode 100644 index f867db6b05..0000000000 --- a/packages/altboot/files/poodle/altboot-2.6.cfg +++ /dev/null @@ -1,45 +0,0 @@ -# -# Altboot machine configuration for: Poodle / Kernel 2.6 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -ENABLE_SOUND="yes" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" -ENABLE_IMAGECONF="yes" - -SD_DEVICE="/dev/mmcblk0p1" -SD_KERNEL_MODULE="" - -USB_HOST_AVAILABLE="no" -USB_STORAGE_MODULES="ohci_hcd usb_storage sd_mod" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -USB_NETWORKING_AVAILABLE="yes" -USB_NW_MODULES="usbcore pxa27x_udc ohci-hcd g_ether" -USB_NW_DEVICE="usb0" - -KEXEC_KERNEL_DIR="/boot" -KEXEC_BIN="/usr/sbin/kexec" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" - -# Poodle already boots off SD natively! -DISABLE_SD_BOOT="yes" - diff --git a/packages/altboot/files/set-bootdev b/packages/altboot/files/set-bootdev deleted file mode 100755 index 60d0283dc4..0000000000 --- a/packages/altboot/files/set-bootdev +++ /dev/null @@ -1,150 +0,0 @@ -#!/bin/sh - -VERSION="0.0.1" -ENABLE_DEBUG="yes" - -die() { - echo -e "ERROR: $1" - exit 1 -} - -. /etc/altboot.func || die "/etc/altboot.func is missing!" -test -d /sys/block || die "Sysfs problem? (/sys/block not found)" - -debug_echo() { - test "$ENABLE_DEBUG" = "yes" && echo -e "${C_YELLOW}DEBUG:${C_RESET}${C_WHITE} $1 ${C_RESET}" -} - -scan_devices() { - reset_pref "available_devices" - - cnt=1 - set_pref "available_devices" "$cnt" "Flash" ; let cnt=$cnt+1 - - for scsi_disk in `ls -1 /sys/block/ | grep ^sd` - do - scsi_disk_name="`echo "$scsi_disk" | awk '{printf("%s\n",toupper($0))}'`" - test -e /sys/block/$scsi_disk/device/vendor && HDD_VENDOR="`cat /sys/block/$scsi_disk/device/vendor | sed "s/\ $//"`" - test -z "$HDD_VENDOR" && HDD_VENDOR="Unknown Vendor" - - test -e /sys/block/$scsi_disk/device/model && HDD_MODEL="`cat /sys/block/$scsi_disk/device/model`" - test -z "$HDD_MODEL" && HDD_MODEL="Unknown Model" - - scsi_disk_partition_cnt="`ls -1 /sys/block/$scsi_disk | grep ^$scsi_disk | wc -l | tr -d " "`" - test "$scsi_disk_partition_cnt" -gt 1 && scsi_disk_partition_cnt="$scsi_disk_partition_cnt partitions" || scsi_disk_partition_cnt="$scsi_disk_partition_cnt partition" - - set_pref "available_devices" "$cnt" "$scsi_disk_name ( $HDD_VENDOR $HDD_MODEL with $scsi_disk_partition_cnt)" - set_pref "available_devices_short" "$cnt" "$scsi_disk" - set_pref "available_devices_type" "$cnt" "usb" - - let cnt=$cnt+1 - done - -} - -show_menu() { - echo -e "\nset-bootdev v$VERSION\n" - - echo -e "Please select the device you wish to boot from:\n" - - cnt2=0 ; let cnt=$cnt-1 - while test "$cnt" != "$cnt2" - do - let cnt2=$cnt2+1 - get_pref "available_devices" "$cnt2" dev - - echo -e "\t[$cnt2] - $dev" - done - - while test -z "$selected_dev" - do - echo -en "\nYour choice: " - read junk - get_pref "available_devices" "$junk" selected_dev - get_pref "available_devices_type" "$junk" part_mode - -# debug_echo "show_menu(): selected: [$selected_dev]" - done - - if ( echo "$selected_dev" | grep -q "^Flash" ) - then - boot_from flash - else - get_pref "available_devices_short" "$junk" selected_dev -# debug_echo "show_menu(): selected_devices_short: [$selected_dev]" - - partitions="`ls -1 /sys/block/$selected_dev|grep ^$selected_dev`" - test -z "$partitions" && die "No partitions found on /dev/$selected_dev!" - - - echo -e "\nPlease select a partition on $selected_dev to boot from:\n" - - cnt=1 - for partition in $partitions - do - # We assume that partitions with a "size" < 10 are extended partitions - # and should not be listed. TYPE=swap is blacklisted as well. - part_size="`cat /sys/block/$selected_dev/$partition/size`" - part_type="`blkid -s TYPE -o value /dev/$partition`" - - if test "$part_size" -gt 10 -a "$part_type" != "swap" - then - let part_size="($part_size/2)/1000" - echo -e "\t[$cnt] $partition (~ ${part_size}Mb, $part_type)" - set_pref "available_partitions" "$cnt" "$partition" - - let cnt=$cnt+1 - fi - done - - while test -z "$selected_partition" - do - echo -en "\nYour choice: " - read junk - get_pref "available_partitions" "$junk" selected_partition - done - - part_uuid="`blkid -c /dev/null -s UUID -o value /dev/$selected_partition`" - - boot_from "$part_mode" "$selected_partition" "$part_uuid" - fi -} - -boot_from() { - debug_echo "boot_from() [$*]" - - part_mode="$1" - part_name="$2" - part_uuid="$3" - - case "$part_mode" in - usb) umount /tmp/mnt.set-bootdev >/dev/null 2>&1 - rm -rf /tmp/mnt.set-bootdev ; mkdir -p /tmp/mnt.set-bootdev - - if ! ( mount -U "$part_uuid" /tmp/mnt.set-bootdev ) - then - echo "** Note: UUID mount for $part_name failed" - mount /dev/$part_name /tmp/mnt.set-bootdev && echo "** Note: Normal mount for $part_name successful" - fi - - if ! test -e /tmp/mnt.set-bootdev/sbin/init.sysvinit - then - copy_rootfs /tmp/mnt.set-bootdev/ - else - umount /tmp/mnt.set-bootdev - echo -e "\nSetting /dev/$part_name as boot-partition" - echo "$part_mode $part_name $part_uuid" > /etc/set-bootdev.conf - fi - ;; - flash) echo "Setting the onboard flash as boot-partition" - echo "$part_mode $part_name $part_uuid" > /etc/set-bootdev.conf - ;; - esac -} - -copy_rootfs() { - debug_echo "copy_rootfs() [$*]" -} - -scan_devices -show_menu diff --git a/packages/altboot/files/spitz/.mtn2git_empty b/packages/altboot/files/spitz/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/spitz/altboot-2.6.cfg b/packages/altboot/files/spitz/altboot-2.6.cfg deleted file mode 100644 index 0a2b643b76..0000000000 --- a/packages/altboot/files/spitz/altboot-2.6.cfg +++ /dev/null @@ -1,41 +0,0 @@ -# -# Altboot machine configuration for: Spitz / Kernel 2.6 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -ENABLE_SOUND="yes" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" -ENABLE_IMAGECONF="yes" - -SD_DEVICE="/dev/mmcblk0p1" -SD_KERNEL_MODULE="" - -USB_HOST_AVAILABLE="no" -USB_STORAGE_MODULES="usb_ohci_pxa27x usb-storage" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -USB_NETWORKING_AVAILABLE="yes" -USB_NW_MODULES="usbcore pxa27x_udc ohci-hcd g_ether" -USB_NW_DEVICE="usb0" - -KEXEC_KERNEL_DIR="/boot" -KEXEC_BIN="/usr/sbin/kexec" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/tosa/.mtn2git_empty b/packages/altboot/files/tosa/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/altboot/files/tosa/altboot-2.4.cfg b/packages/altboot/files/tosa/altboot-2.4.cfg deleted file mode 100644 index f84e2d57b9..0000000000 --- a/packages/altboot/files/tosa/altboot-2.4.cfg +++ /dev/null @@ -1,32 +0,0 @@ -# -# Altboot machine configuration for: Tosa / Kernel 2.4 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" -ENABLE_IMAGECONF="yes" - -SD_DEVICE="/dev/mmcda1" -SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o" - -USB_HOST_AVAILABLE="yes" -USB_STORAGE_MODULES="usb_ohci_tc6393 usb-storage" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/tosa/altboot-2.6.cfg b/packages/altboot/files/tosa/altboot-2.6.cfg deleted file mode 100644 index 62e8ea2434..0000000000 --- a/packages/altboot/files/tosa/altboot-2.6.cfg +++ /dev/null @@ -1,41 +0,0 @@ -# -# Altboot machine configuration for: Akita / Kernel 2.6 -# - -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -ENABLE_SOUND="yes" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" -ENABLE_IMAGECONF="yes" - -SD_DEVICE="/dev/mmcblk0p1" -SD_KERNEL_MODULE="" - -USB_HOST_AVAILABLE="yes" -USB_STORAGE_MODULES="ohci_hcd usb_storage sd_mod" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -USB_NETWORKING_AVAILABLE="yes" -USB_NW_MODULES="usbcore pxa27x_udc ohci-hcd g_ether" -USB_NW_DEVICE="usb0" - -KEXEC_KERNEL_DIR="/boot" -KEXEC_BIN="/usr/sbin/kexec" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" -- cgit v1.2.3