Compare commits

...
2 Commits
Author SHA1 Message Date
Tudor Marcu 2401aae76e Release v3.2.9
This release fixes the path where the server reads the bundle metadata from.

Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>
2016-09-29 17:17:30 -07:00
Patrick McCarty 30b46b9027 Update for new noship dir location
The bundle-chroot-builder changed the location where it stores bundle
includes metadata, so swupd-server needs to read from the new location.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2016-09-29 13:40:12 -07:00
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ([2.66]) AC_PREREQ([2.66])
AC_INIT(swupd-server, 3.2.8, timothy.c.pepper@linux.intel.com) AC_INIT(swupd-server, 3.2.9, timothy.c.pepper@linux.intel.com)
AM_INIT_AUTOMAKE([foreign -Wall -W subdir-objects]) AM_INIT_AUTOMAKE([foreign -Wall -W subdir-objects])
AM_SILENT_RULES([yes]) AM_SILENT_RULES([yes])
AC_PROG_CC AC_PROG_CC
+1 -1
View File
@@ -418,7 +418,7 @@ GList *get_sub_manifest_includes(char *component, int version)
char *included; char *included;
char line[8192]; char line[8192];
conf = config_output_dir(); conf = config_image_base();
if (conf == NULL) { if (conf == NULL) {
assert(0); assert(0);
} }
+2 -2
View File
@@ -58,9 +58,9 @@ gen_includes_file() {
local bundle=$1 local bundle=$1
local ver=$2 local ver=$2
local includes="${@:3}" local includes="${@:3}"
mkdir -p $DIR/www/$ver/noship mkdir -p $DIR/image/$ver/noship
for b in $includes; do for b in $includes; do
cat >> $DIR/www/$ver/noship/"$bundle"-includes << EOF cat >> $DIR/image/$ver/noship/"$bundle"-includes << EOF
$b $b
EOF EOF
done done