merge of '359cb2ede75783898c85d7b22cc9699eaf345d8a'

     and '81ad048dfdc6a3a80a0a2fa696910b31ad099b1d'

4 files changed, 0 insertions, 96 deletions

diff --git a/packages/tasks/task-bootstrap-unionroot.bb b/packages/tasks/task-bootstrap-unionroot.bb
deleted file mode 100644
index e737e31608..0000000000
--- a/packages/tasks/task-bootstrap-unionroot.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "Core packages required for a basic installation with unionroot"
-PROVIDES = "task-bootstrap"
-RPROVIDES = "task-bootstrap"
-PR = "r2"
-DEFAULT_PREFERENCE = "-1"
-
-# The BOOTSTRAP_EXTRA_ variables are often manipulated by the
-# MACHINE .conf files, so adjust PACKAGE_ARCH accordingly.
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-ALLOW_EMPTY = "1"
-PACKAGES = "${PN}"
-
-MODUTILS ?= "24 26"
-
-require task-bootstrap.inc
-
-HOTPLUG ?= "linux-hotplug"
-
-RDEPENDS = 'base-files base-passwd busybox \
-	initscripts \
-	netbase sysvinit sysvinit-pidof tinylogin \
-	modutils-initscripts \
-	${HOTPLUG} \
-	${BOOTSTRAP_EXTRA_RDEPENDS} \
-	${@bootstrap_modutils_rdepends(d)} \
-	unionfs-modules \
-	unionfs-utils \
-	unionroot \
-	unionroot-utils'
-
-RRECOMMENDS = 'dropbear portmap \
-	${BOOTSTRAP_EXTRA_RRECOMMENDS}'
-LICENSE = "MIT"
diff --git a/packages/tasks/task-bootstrap.bb b/packages/tasks/task-bootstrap.bb
deleted file mode 100644
index d84f331102..0000000000
--- a/packages/tasks/task-bootstrap.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Core packages required for a basic installation"
-PR = "r25"
-
-# The BOOTSTRAP_EXTRA_ variables are often manipulated by the
-# MACHINE .conf files, so adjust PACKAGE_ARCH accordingly.
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-ALLOW_EMPTY = "1"
-PACKAGES = "${PN}"
-
-MODUTILS ?= "24 26"
-
-require task-bootstrap.inc
-
-HOTPLUG ?= "linux-hotplug"
-
-RDEPENDS = 'base-files base-passwd busybox \
-	initscripts \
-	netbase sysvinit sysvinit-pidof tinylogin \
-	modutils-initscripts fuser setserial\
-	${HOTPLUG} \
-	${BOOTSTRAP_EXTRA_RDEPENDS} \
-	${@bootstrap_modutils_rdepends(d)}'
-
-RRECOMMENDS = 'dropbear portmap \
-	${BOOTSTRAP_EXTRA_RRECOMMENDS}'
-LICENSE = "MIT"
diff --git a/packages/tasks/task-bootstrap.inc b/packages/tasks/task-bootstrap.inc
deleted file mode 100644
index 073da7055f..0000000000
--- a/packages/tasks/task-bootstrap.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-def bootstrap_modutils_rdepends(d):
-    import bb
-    m = bb.data.getVar('MODUTILS', d, 1)
-    r = []
-    if '24' in m:
-        r.append('modutils-depmod')
-    if '26' in m:
-        r.append('module-init-tools-depmod')
-    return ' '.join(r)
diff --git a/packages/tasks/task-pivotboot.bb b/packages/tasks/task-pivotboot.bb
deleted file mode 100644
index 14397e288c..0000000000
--- a/packages/tasks/task-pivotboot.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Basic packages required for a pivot root image"
-PR = "r0"
-
-# The PIVOTBOOT_EXTRA_ variables are often manipulated by the
-# MACHINE .conf files, so adjust PACKAGE_ARCH accordingly.
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-ALLOW_EMPTY = "1"
-PACKAGES = "${PN}"
-
-MODUTILS ?= "24 26"
-
-require task-bootstrap.inc
-
-HOTPLUG ?= "linux-hotplug"
-PIVOTBOOT_EXTRA_RDEPENDS ?= ""
-PIVOTBOOT_EXTRA_RRECOMMENDS ?= ""
-
-RDEPENDS = 'base-files base-passwd busybox \
-	netbase modutils-initscripts \
-	${HOTPLUG} \
-	${PIVOTBOOT_EXTRA_RDEPENDS} \
-	${@bootstrap_modutils_rdepends(d)}'
-
-RRECOMMENDS = '${PIVOTBOOT_EXTRA_RRECOMMENDS}'
-LICENSE = "MIT"