SlugOS: Set PREFERRED_VERSION for gettext, e2fsprogs, and add a temporary

hack to e2fsprogs_1.38.bb to work around the autotools and gettext version
incompatabilities.

diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 45e8e91..3f92a91 100644 (file)
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -43,7 +43,7 @@ TARGET_FPU = "soft"
 USE_NLS_glib-2.0 = "yes"
 USE_NLS_glib-2.0-native = "yes"
 
-INHERIT += "package_ipk debian testlab"
+INHERIT += "package_ipk debian testlab packaged-staging"
 
 # FULL_OPTIMIZATION
 #    Optimization settings.  Os works fine and is significantly better than O2.
@@ -157,9 +157,12 @@ PREFERRED_VERSION_linux-libc-headers ?= "2.6.20"
 PREFERRED_VERSION_pango    ?= 1.20.5
 PREFERRED_VERSION_glib-2.0 ?= 2.16.1
 
-# Stick with an older gettext
-#PREFERRED_VERSION_gettext ?= "0.14.1"
-#PREFERRED_VERSION_gettext-native ?= "0.14.1"
+# Stick with an older gettext and e2fsprogs stuff
+PREFERRED_VERSION_gettext          ?= "0.14.1"
+PREFERRED_VERSION_gettext-native   ?= "0.14.1"
+PREFERRED_VERSION_e2fsprogs-libs   ?= "1.39"
+PREFERRED_VERSION_e2fsprogs        ?= "1.38"
+PREFERRED_VERSION_e2fsprogs-native ?= "1.38"
 
 # we don't ship gtk-directfb by default
 PREFERRED_PROVIDER_gtk+                   ?= "gtk+"

diff --git a/packages/e2fsprogs/e2fsprogs_1.38.bb b/packages/e2fsprogs/e2fsprogs_1.38.bb
index f3d952a..bcbd68f 100644 (file)
--- a/packages/e2fsprogs/e2fsprogs_1.38.bb
+++ b/packages/e2fsprogs/e2fsprogs_1.38.bb
@@ -1,11 +1,19 @@
 require e2fsprogs.inc
 
-PR = "r14"
+PR = "r15"
 
 SRC_URI += "file://no-hardlinks.patch;patch=1 \
            file://mkinstalldirs.patch;patch=1 \
           "
 
+# Temporary solution; the mkinstalldirs patch kills SlugOS builds regardless
+# of version of gettext in use -- the lines below need to be removed when
+# the feeds are frozen and SlugOS is upgraded.
+SRC_URI_slugos = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
+                 file://no-hardlinks.patch;patch=1 \
+                "
+
+
 do_compile_prepend () {
        find ./ -print|xargs chmod u=rwX
        ( cd util; ${BUILD_CC} subst.c -o subst )