summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/debianslug.conf12
-rw-r--r--conf/distro/openslug.conf12
-rw-r--r--conf/distro/slugos-bag.conf2
-rw-r--r--conf/distro/slugos-bau.conf2
-rw-r--r--conf/distro/slugos-btu.conf2
-rw-r--r--conf/distro/slugos-lag.conf13
-rw-r--r--conf/distro/slugos-lau.conf4
-rw-r--r--conf/distro/slugos-ltu.conf10
-rw-r--r--conf/distro/slugos.conf7
-rw-r--r--conf/distro/ucslugc.conf2
-rw-r--r--packages/slugos-init/files/boot/disk2
-rw-r--r--packages/slugos-init/slugos-init_0.10.bb2
12 files changed, 32 insertions, 38 deletions
diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
index 88be1c516c..c5c9f6868c 100644
--- a/conf/distro/debianslug.conf
+++ b/conf/distro/debianslug.conf
@@ -7,7 +7,7 @@
#----------------------------------------------------------------------------------
DISTRO_NAME = "DebianSlug"
# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
-DISTRO_FEED = "unstable"
+# DISTRO_FEED = "unstable"
DISTRO_TYPE = "beta"
SLUGOS_IMAGENAME = "debianslug"
SLUGOS_IMAGESEX = "little-endian"
@@ -21,16 +21,6 @@ SLUGOS_FLASH_IMAGE = "yes"
DEBIANSLUG_EXTRA_BBFILES ?= ""
#----------------------------------------------------------------------------------
-# FEEDS
-# The following lines define where on the internet DebianSlug looks for packages
-# when downloading new packages or updating existing packages. Additional feeds
-# (such as a local feed) can be defined in local.conf
-#----------------------------------------------------------------------------------
-# Add to the user's feeds from local.conf (there may be none)
-FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/slugos-lag/cross/${DISTRO_FEED}"
-FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-lag/native/${DISTRO_FEED}"
-
-#----------------------------------------------------------------------------------
# FIRMWARE CONFIGURATION
#----------------------------------------------------------------------------------
# EXTRA PACKAGES
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 80b650dce0..304cd6dcfa 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -7,7 +7,7 @@
#----------------------------------------------------------------------------------
DISTRO_NAME = "OpenSlug"
# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
-DISTRO_FEED = "unstable"
+# DISTRO_FEED = "unstable"
DISTRO_TYPE = "beta"
SLUGOS_IMAGENAME = "openslug"
SLUGOS_IMAGESEX = "big-endian"
@@ -21,16 +21,6 @@ SLUGOS_FLASH_IMAGE = "yes"
OPENSLUG_EXTRA_BBFILES ?= ""
#----------------------------------------------------------------------------------
-# FEEDS
-# The following lines define where on the internet OpenSlug looks for packages
-# when downloading new packages or updating existing packages. Additional feeds
-# (such as a local feed) can be defined in local.conf
-#----------------------------------------------------------------------------------
-# Add to the user's feeds from local.conf (there may be none)
-FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/slugos-bag/cross/${DISTRO_FEED}"
-FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-bag/native/${DISTRO_FEED}"
-
-#----------------------------------------------------------------------------------
# FIRMWARE CONFIGURATION
#----------------------------------------------------------------------------------
# EXTRA PACKAGES
diff --git a/conf/distro/slugos-bag.conf b/conf/distro/slugos-bag.conf
index 9da0eb0707..037ca09644 100644
--- a/conf/distro/slugos-bag.conf
+++ b/conf/distro/slugos-bag.conf
@@ -7,7 +7,7 @@
# This slugos variant corresponds to OpenSlug
DISTRO_NAME ?= "slugos-bag"
# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
-DISTRO_FEED ?= "unstable"
+# DISTRO_FEED ?= "unstable"
DISTRO_TYPE ?= "beta"
ARCH_BYTE_SEX = "be"
diff --git a/conf/distro/slugos-bau.conf b/conf/distro/slugos-bau.conf
index b9070cb234..5f4cb26ba8 100644
--- a/conf/distro/slugos-bau.conf
+++ b/conf/distro/slugos-bau.conf
@@ -8,7 +8,7 @@
# regular builds and there is no feed.
DISTRO_NAME ?= "slugos-bau"
# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
-DISTRO_FEED ?= "unstable"
+# DISTRO_FEED ?= "unstable"
DISTRO_TYPE ?= "alpha"
ARCH_BYTE_SEX = "be"
diff --git a/conf/distro/slugos-btu.conf b/conf/distro/slugos-btu.conf
index 12a9553197..fc584d75d9 100644
--- a/conf/distro/slugos-btu.conf
+++ b/conf/distro/slugos-btu.conf
@@ -7,7 +7,7 @@
# This slugos variant corresponds to UcSlugC
DISTRO_NAME ?= "slugos-btu"
# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
-DISTRO_FEED ?= "unstable"
+# DISTRO_FEED ?= "unstable"
DISTRO_TYPE ?= "beta"
ARCH_BYTE_SEX = "be"
diff --git a/conf/distro/slugos-lag.conf b/conf/distro/slugos-lag.conf
index b5d069dc34..f8a0631ef8 100644
--- a/conf/distro/slugos-lag.conf
+++ b/conf/distro/slugos-lag.conf
@@ -2,16 +2,21 @@
#@NAME: SLUGOS-LAG
#@DESCRIPTION: Linux Distribution for the NSLU2
-# This slugos variant is not supported - there are no nslu2-linux.org
-# regular builds and there is no feed.
+# See slugos.conf for an explanation of this file.
+
+# This slugos variant corresponds to DebianSlug
DISTRO_NAME ?= "slugos-lag"
# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
-DISTRO_FEED ?= "unstable"
-DISTRO_TYPE ?= "alpha"
+# DISTRO_FEED ?= "unstable"
+DISTRO_TYPE ?= "beta"
ARCH_BYTE_SEX = "le"
ARM_INSTRUCTION_SET = "arm"
TARGET_OS = "linux"
SLUGOS_IMAGESEX ?= "big-endian"
+FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/slugos-lag/cross/${DISTRO_FEED}"
+FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-lag/native/${DISTRO_FEED}"
+
+
include conf/distro/slugos.conf
diff --git a/conf/distro/slugos-lau.conf b/conf/distro/slugos-lau.conf
index c83cdff881..6bf60df15f 100644
--- a/conf/distro/slugos-lau.conf
+++ b/conf/distro/slugos-lau.conf
@@ -6,7 +6,7 @@
# regular builds and there is no feed.
DISTRO_NAME ?= "slugos-lau"
# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
-DISTRO_FEED ?= "unstable"
+# DISTRO_FEED ?= "unstable"
DISTRO_TYPE ?= "alpha"
ARCH_BYTE_SEX = "le"
@@ -14,4 +14,6 @@ ARM_INSTRUCTION_SET = "arm"
TARGET_OS = "linux-uclibc"
SLUGOS_IMAGESEX ?= "big-endian"
+# no feeds
+
include conf/distro/slugos.conf
diff --git a/conf/distro/slugos-ltu.conf b/conf/distro/slugos-ltu.conf
index 652be9d481..dbf444748c 100644
--- a/conf/distro/slugos-ltu.conf
+++ b/conf/distro/slugos-ltu.conf
@@ -2,11 +2,11 @@
#@NAME: SLUGOS-LTU
#@DESCRIPTION: Linux Distribution for the NSLU2
-# This slugos variant is not supported - there are no nslu2-linux.org
-# regular builds and there is no feed.
+# See slugos.conf for an explanation of this file.
+
DISTRO_NAME ?= "slugos-ltu"
# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
-DISTRO_FEED ?= "unstable"
+# DISTRO_FEED ?= "unstable"
DISTRO_TYPE ?= "beta"
ARCH_BYTE_SEX = "le"
@@ -14,4 +14,8 @@ ARM_INSTRUCTION_SET = "thumb"
TARGET_OS = "linux-uclibc"
SLUGOS_IMAGESEX ?= "big-endian"
+FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/slugos-ltu/cross/${DISTRO_FEED}"
+FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-ltu/native/${DISTRO_FEED}"
+
+
include conf/distro/slugos.conf
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index 964176a270..3b094d769d 100644
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@ -33,13 +33,15 @@
# The following must be set in the top level distro file:
#
#DISTRO_NAME
-#DISTRO_FEED
#DISTRO_TYPE
# The following may be overridden to make sub-versions
-SLUGOS_VERSION = "3.4"
+SLUGOS_VERSION = "3.6"
DISTRO_REVISION ?= ""
DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
+# For release (only):
+# DISTRO_FEED ?= "${SLUGOS_VERSION}-${DISTRO_TYPE}"
+DISTRO_FEED ?= "unstable"
# The following must also be set, they define the basic format of the build
#
@@ -54,7 +56,6 @@ USE_NLS ?= "no"
# To make errors easier to identify:
DISTRO_NAME ?= "INVALID-${ARCH_BYTE_SEX}-${ARM_INSTRUCTION_SET}-${TARGET_OS}"
-DISTRO_FEED ?= "INVALID"
DISTRO_TYPE ?= "INVALID"
# The following must not be changed.
diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
index 52cc4ab106..24ef6e6c33 100644
--- a/conf/distro/ucslugc.conf
+++ b/conf/distro/ucslugc.conf
@@ -5,7 +5,7 @@
# This is SLUGOS-BTU with a different name...
DISTRO_NAME = "UcSlugC"
# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
-DISTRO_FEED = "unstable"
+# DISTRO_FEED = "unstable"
DISTRO_TYPE = "beta"
SLUGOS_IMAGENAME = "ucslugc"
SLUGOS_IMAGESEX = "big-endian"
diff --git a/packages/slugos-init/files/boot/disk b/packages/slugos-init/files/boot/disk
index 724dc3af5d..6dd7788197 100644
--- a/packages/slugos-init/files/boot/disk
+++ b/packages/slugos-init/files/boot/disk
@@ -20,6 +20,8 @@ then
# wait if required
test "$sleep" -gt 0 && sleep "$sleep"
#
+ # proc is needed for UUID mount
+ mount -t proc proc /proc
# 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
diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb
index ed183b9278..3f1ab456ac 100644
--- a/packages/slugos-init/slugos-init_0.10.bb
+++ b/packages/slugos-init/slugos-init_0.10.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
LICENSE = "GPL"
DEPENDS = "base-files devio"
RDEPENDS = "busybox devio"
-PR = "r56"
+PR = "r57"
SRC_URI = "file://boot/flash \
file://boot/disk \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 10:31:13 +0000