Skip to content

Commit 3b137f2

Browse files
author
Roman Kubiak
authored
[EGD-4160] renamed PureOS -> MUDITAOS (#901)
1 parent 0faa98e commit 3b137f2

File tree

15 files changed

+114
-112
lines changed

15 files changed

+114
-112
lines changed

‎config/common.sh

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@
22
# Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
33
# For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
44

5-
PURE_PARTITION_PRIMARY="PUREOS"
6-
PURE_PARTITION_RECOVERY="RECOVER"
7-
PURE_OS_CURRENT="current"
8-
PURE_OS_PREVIOUS="previous"
9-
PURE_OS_FACTORY="factory"
10-
PURE_OS_VERSION_MAJOR=""
11-
PURE_OS_VERSION_MINOR=""
12-
PURE_OS_VERSION_PATCH=""
13-
PURE_OS_GIT_TAG=""
14-
PURE_US_GIT_REV=""
15-
PURE_OS_GIT_BRANCH=""
5+
MUDITAOS_PARTITION_PRIMARY="MUDITAOS"
6+
MUDITAOS_PARTITION_RECOVERY="RECOVER"
7+
MUDITAOS_CURRENT="current"
8+
MUDITAOS_PREVIOUS="previous"
9+
MUDITAOS_FACTORY="factory"
10+
MUDITAOS_UPDATES="updates"
11+
MUDITAOS_VERSION_MAJOR=""
12+
MUDITAOS_VERSION_MINOR=""
13+
MUDITAOS_VERSION_PATCH=""
14+
MUDITAOS_GIT_TAG=""
15+
MUDITAUS_GIT_REV=""
16+
MUDITAOS_GIT_BRANCH=""
1617

1718
IMAGE_FILES="data assets country-codes.db Luts.bin user .boot.json .boot.json.crc32"
1819
IMAGE_MOVE_TO_ROOT="user .boot.json .boot.json.crc32"
@@ -31,12 +32,12 @@ check_target_linux() {
3132
check_any_arch "${@}" '(GNU/Linux)'
3233
}
3334

34-
PURE_OS_GIT_TAG=`git describe --tags | awk -F'-' '{print $2}'`
35-
PURE_OS_GIT_REV=`git log --pretty=format:'%h' -n 1`
36-
PURE_OS_GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`
35+
MUDITAOS_GIT_TAG=`git describe --tags | awk -F'-' '{print $2}'`
36+
MUDITAOS_GIT_REV=`git log --pretty=format:'%h' -n 1`
37+
MUDITAOS_GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`
3738

38-
version=( ${PURE_OS_GIT_TAG//./ } )
39-
PURE_OS_VERSION_STRING=$PURE_OS_GIT_TAG
40-
PURE_OS_VERSION_MAJOR=${version[0]}
41-
PURE_OS_VERSION_MINOR=${version[1]}
42-
PURE_OS_VERSION_PATCH=${version[2]}
39+
version=( ${MUDITAOS_GIT_TAG//./ } )
40+
MUDITAOS_VERSION_STRING=$MUDITAOS_GIT_TAG
41+
MUDITAOS_VERSION_MAJOR=${version[0]}
42+
MUDITAOS_VERSION_MINOR=${version[1]}
43+
MUDITAOS_VERSION_PATCH=${version[2]}

‎config/genupdatepkg.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,13 @@ fi
8888
vjson=update/tmp/version.json
8989
cp config/version.json.template $vjson
9090

91-
sed -i -e 's/__GIT_BRANCH__/'$PURE_OS_GIT_BRANCH'/g' $vjson
92-
sed -i -e 's/__GIT_TAG__/'$PURE_OS_GIT_TAG'/g' $vjson
93-
sed -i -e 's/__GIT_REVISION__/'$PURE_OS_GIT_REV'/g' $vjson
91+
sed -i -e 's/__GIT_BRANCH__/'$MUDITAOS_GIT_BRANCH'/g' $vjson
92+
sed -i -e 's/__GIT_TAG__/'$MUDITAOS_GIT_TAG'/g' $vjson
93+
sed -i -e 's/__GIT_REVISION__/'$MUDITAOS_GIT_REV'/g' $vjson
9494

95-
sed -i -e 's/__VERSION_MAJOR__/'$PURE_OS_VERSION_MAJOR'/g' $vjson
96-
sed -i -e 's/__VERSION_MINOR__/'$PURE_OS_VERSION_MINOR'/g' $vjson
97-
sed -i -e 's/__VERSION_PATCH__/'$PURE_OS_VERSION_PATCH'/g' $vjson
95+
sed -i -e 's/__VERSION_MAJOR__/'$MUDITAOS_VERSION_MAJOR'/g' $vjson
96+
sed -i -e 's/__VERSION_MINOR__/'$MUDITAOS_VERSION_MINOR'/g' $vjson
97+
sed -i -e 's/__VERSION_PATCH__/'$MUDITAOS_VERSION_PATCH'/g' $vjson
9898

9999
BUILD_HOST=`uname -r`
100100
BUILD_USER=`whoami`
@@ -134,11 +134,11 @@ fi
134134

135135
rm -f update/*.tar
136136
curpwd=`pwd`
137-
vstr=$PURE_OS_VERSION_MAJOR.$PURE_OS_VERSION_MINOR.$PURE_OS_VERSION_PATCH-$PURE_OS_GIT_REV
137+
vstr=$MUDITAOS_VERSION_MAJOR.$MUDITAOS_VERSION_MINOR.$MUDITAOS_VERSION_PATCH-$MUDITAOS_GIT_REV
138138
echo -ne "-- "
139139
cd update/tmp && rhash -ru checksums.txt .
140140
cd $curpwd
141-
echo "-- create tar update/pureos-$vstr.tar"
142-
cd update/tmp && tar -cf ../pureos-$vstr.tar .
141+
echo "-- create tar update/muditaos-$vstr.tar"
142+
cd update/tmp && tar -cf ../muditaos-$vstr.tar .
143143
cd $curpwd
144-
ls -alh update/pureos-$vstr.tar
144+
ls -alh update/muditaos-$vstr.tar

‎config/partition_emmc.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ part1=$(sfdisk $dev --dump | grep bootable | awk '{print $1}')
7979
part2=$(sfdisk $dev --dump | tail -n 1 | awk '{print $1}')
8080

8181
echo "create FATs"
82-
echo "FAT: $PURE_PARTITION_PRIMARY $part1"
83-
mkfs.vfat -n $PURE_PARTITION_PRIMARY $part1
84-
echo "FAT: $PURE_PARTITION_RECOVERY $part2"
85-
mkfs.vfat -n $PURE_PARTITION_RECOVERY $part2
82+
echo "FAT: $MUDITAOS_PARTITION_PRIMARY $part1"
83+
mkfs.vfat -n $MUDITAOS_PARTITION_PRIMARY $part1
84+
echo "FAT: $MUDITAOS_PARTITION_RECOVERY $part2"
85+
mkfs.vfat -n $MUDITAOS_PARTITION_RECOVERY $part2
8686

8787
echo "probe new partitions to OS"
8888
partprobe

‎flash_eMMC.sh

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,71 +16,72 @@ fi
1616

1717
check_target_rt1051 "$BUILD_PATH"
1818

19-
PURE_DEV=/dev/disk/by-id/usb-NXP_SEMI_NXP_MASS_STORAGE_0123456789ABCDEF-0:0-part1
20-
PURE_DEV_RECOVER=/dev/disk/by-id/usb-NXP_SEMI_NXP_MASS_STORAGE_0123456789ABCDEF-0:0-part2
21-
PURE_DISK=`readlink -f $PURE_DEV`
22-
PURE_DISK_RECOVER=`readlink -f $PURE_DEV_RECOVER`
19+
MUDITAOS_DEV=/dev/disk/by-id/usb-NXP_SEMI_NXP_MASS_STORAGE_0123456789ABCDEF-0:0-part1
20+
MUDITAOS_DEV_RECOVER=/dev/disk/by-id/usb-NXP_SEMI_NXP_MASS_STORAGE_0123456789ABCDEF-0:0-part2
21+
MUDITAOS_DISK=`readlink -f $MUDITAOS_DEV`
22+
MUDITAOS_DISK_RECOVER=`readlink -f $MUDITAOS_DEV_RECOVER`
2323
# check if already mouted
2424

25-
MOUNT_ENTRY_RECOVER=$(grep "$PURE_DISK_RECOVER" /etc/mtab)
26-
MOUNT_ENTRY=$(grep "$PURE_DISK" /etc/mtab)
25+
MOUNT_ENTRY_RECOVER=$(grep "$MUDITAOS_DISK_RECOVER" /etc/mtab)
26+
MOUNT_ENTRY=$(grep "$MUDITAOS_DISK" /etc/mtab)
2727
if [ $? -ne 0 ]; then
2828
>&2 echo "PurePhone not mounted. Mount or retry with Ozone. https://github.com/muditacom/PurePhone/blob/master/doc/running_on_phone.md#eMMC_upload"
2929
exit 2
3030
fi
3131

32-
PURE_PATH=$(echo $MOUNT_ENTRY | awk -F " " '{print $2}')
32+
MUDITAOS_PATH=$(echo $MOUNT_ENTRY | awk -F " " '{print $2}')
3333
# unespace
34-
PURE_PATH_CURRENT=$(echo -e $PURE_PATH)/current
35-
PURE_PATH_ROOT=$(echo -e $PURE_PATH)
34+
MUDITAOS_PATH_CURRENT=$(echo -e $MUDITAOS_PATH)/current
35+
MUDITAOS_PATH_ROOT=$(echo -e $MUDITAOS_PATH)
3636

3737
echo "PurePhone remove all files"
38-
rm -rf "$PURE_PATH_ROOT"/* -r &>/dev/null || echo "PurePhone disk alread empty"
39-
rm -f "$PURE_PATH_ROOT"/.boot.ini
40-
rm -f "$PURE_PATH_ROOT"/.boot.ini.crc32
38+
rm -rf "$MUDITAOS_PATH_ROOT"/* -r &>/dev/null || echo "PurePhone disk alread empty"
39+
rm -f "$MUDITAOS_PATH_ROOT"/.boot.ini
40+
rm -f "$MUDITAOS_PATH_ROOT"/.boot.ini.crc32
4141

4242
echo "Create directories"
43-
mkdir -p $PURE_PATH_ROOT/$PURE_OS_CURRENT
44-
mkdir -p $PURE_PATH_ROOT/$PURE_OS_PREVIOUS
45-
mkdir -p $PURE_PATH_ROOT/$PURE_OS_FACTORY
43+
mkdir -p $MUDITAOS_PATH_ROOT/$MUDITAOS_CURRENT
44+
mkdir -p $MUDITAOS_PATH_ROOT/$MUDITAOS_PREVIOUS
45+
mkdir -p $MUDITAOS_PATH_ROOT/$MUDITAOS_FACTORY
46+
mkdir -p $MUDITAOS_PATH_ROOT/$MUDITAOS_UPDATES
4647

47-
# sudo sync $PURE_DEV
48+
# sudo sync $MUDITAOS_DEV
4849

4950
echo "PurePhone copy build files"
50-
cp -v $BUILD_PATH/boot.bin "$PURE_PATH_CURRENT"/ # | sed 's/'-\>'/'→'/g'
51+
cp -v $BUILD_PATH/boot.bin "$MUDITAOS_PATH_CURRENT"/ # | sed 's/'-\>'/'→'/g'
5152

5253
for file in $IMAGE_FILES; do
5354
echo Copying $file
54-
cp -vr $BUILD_PATH/$file "$PURE_PATH_CURRENT"/
55+
cp -vr $BUILD_PATH/$file "$MUDITAOS_PATH_CURRENT"/
5556
done
5657

5758
for file in $IMAGE_MOVE_TO_ROOT; do
58-
echo "Moving $PURE_PATH_CURRENT/$file to $PURE_PATH_ROOT"
59-
mv "$PURE_PATH_CURRENT"/"$file" "$PURE_PATH_ROOT"/
59+
echo "Moving $MUDITAOS_PATH_CURRENT/$file to $MUDITAOS_PATH_ROOT"
60+
mv "$MUDITAOS_PATH_CURRENT"/"$file" "$MUDITAOS_PATH_ROOT"/
6061
done
6162

62-
# sudo sync $PURE_DEV # https://unix.stackexchange.com/a/345950
63+
# sudo sync $MUDITAOS_DEV # https://unix.stackexchange.com/a/345950
6364
echo -e "PurePhone copied\n"
6465

65-
PURE_PARTITION=$(lsblk -nlp $PURE_DISK | tail +2 | awk '{print $1}')
66+
MUDITAOS_PARTITION=$(lsblk -nlp $MUDITAOS_DISK | tail +2 | awk '{print $1}')
6667

67-
if [ -z $PURE_PARTITION ]; then
68-
PURE_PARTITION=$PURE_DISK # it is formatted like so apparently
68+
if [ -z $MUDITAOS_PARTITION ]; then
69+
MUDITAOS_PARTITION=$MUDITAOS_DISK # it is formatted like so apparently
6970
fi
7071

7172
if [ "$MOUNT_ENTRY" != "" ]; then
72-
echo "Unmounting disk: $PURE_DISK ($MOUNT_ENTRY)"
73-
udisksctl unmount -b $PURE_DISK > /dev/null
73+
echo "Unmounting disk: $MUDITAOS_DISK ($MOUNT_ENTRY)"
74+
# udisksctl unmount -b $MUDITAOS_DISK > /dev/null
7475
fi
7576

7677
if [ "$MOUNT_ENTRY_RECOVER" != "" ]; then
77-
echo "Unmounting disk: $PURE_DISK_RECOVER ($MOUNT_ENTRY_RECOVER)"
78-
udisksctl unmount -b $PURE_DISK_RECOVER > /dev/null
78+
echo "Unmounting disk: $MUDITAOS_DISK_RECOVER ($MOUNT_ENTRY_RECOVER)"
79+
# udisksctl unmount -b $MUDITAOS_DISK_RECOVER > /dev/null
7980
fi
8081

8182
sleep 1
8283
echo "PurePhone unmouted"
8384
echo "Ejecting USB"
84-
timeout --signal=SIGINT 1 udisksctl power-off -b $PURE_DISK
85+
#timeout --signal=SIGINT 1 udisksctl power-off -b $MUDITAOS_DISK
8586
echo
8687
echo "Reset your phone now"

‎generate_fatfs_image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ unit: sectors
6262

6363
PART1="$IMAGE_NAME@@1048576"
6464
PART2="$IMAGE_NAME@@14604566528"
65-
mformat -i "$PART1" -F -T 28522496 -v PUREOS
65+
mformat -i "$PART1" -F -T 28522496 -v MUDITAOS
6666
mformat -i "$PART2" -F -T 2097152 -v RECOVER
6767
mmd -i "$PART1" ::/current
6868
cd "$SRC_DATA"

‎module-apps/application-desktop/ApplicationDesktop.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <service-cellular/messages/CellularMessage.hpp>
1212
#include <service-db/messages/DBNotificationMessage.hpp>
1313
#include <module-db/queries/notifications/QueryNotificationsGetAll.hpp>
14-
#include <service-desktop/endpoints/update/UpdatePureOS.hpp>
14+
#include <service-desktop/endpoints/update/UpdateMuditaOS.hpp>
1515
#include <module-services/service-desktop/ServiceDesktop.hpp>
1616
#include "DesktopMessages.hpp"
1717

‎module-services/service-desktop/ServiceDesktop.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ServiceDesktop::ServiceDesktop() : sys::Service(service::name::service_desktop,
1313
{
1414
LOG_INFO("[ServiceDesktop] Initializing");
1515

16-
updateOS = std::make_unique<UpdatePureOS>(this);
16+
updateOS = std::make_unique<UpdateMuditaOS>(this);
1717
}
1818

1919
ServiceDesktop::~ServiceDesktop()
@@ -61,13 +61,13 @@ sys::ReturnCodes ServiceDesktop::InitHandler()
6161

6262
if (updateOsMsg != nullptr &&
6363
updateOsMsg->messageType == updateos::UpdateMessageType::UpdateCheckForUpdateOnce) {
64-
fs::path file = UpdatePureOS::checkForUpdate();
64+
fs::path file = UpdateMuditaOS::checkForUpdate();
6565

6666
if (file.has_filename()) {
6767
/* send info to applicationDesktop that there is an update waiting */
6868
auto msgToSend =
6969
std::make_shared<sdesktop::UpdateOsMessage>(updateos::UpdateMessageType::UpdateFoundOnBoot, file);
70-
msgToSend->updateStats.versioInformation = UpdatePureOS::getVersionInfoFromFile(file);
70+
msgToSend->updateStats.versioInformation = UpdateMuditaOS::getVersionInfoFromFile(file);
7171
sys::Bus::SendUnicast(msgToSend, app::name_desktop, this);
7272
}
7373
}

‎module-services/service-desktop/ServiceDesktop.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#pragma once
55

66
#include "WorkerDesktop.hpp"
7-
#include "module-services/service-desktop/endpoints/update/UpdatePureOS.hpp"
7+
#include "module-services/service-desktop/endpoints/update/UpdateMuditaOS.hpp"
88

99
namespace service::name
1010
{
@@ -28,6 +28,6 @@ class ServiceDesktop : public sys::Service
2828
sys::ReturnCodes SwitchPowerModeHandler(const sys::ServicePowerMode mode) override;
2929
sys::Message_t DataReceivedHandler(sys::DataMessage *msg, sys::ResponseMessage *resp) override;
3030

31-
std::unique_ptr<UpdatePureOS> updateOS;
31+
std::unique_ptr<UpdateMuditaOS> updateOS;
3232
std::unique_ptr<WorkerDesktop> desktopWorker;
3333
};

‎module-services/service-desktop/endpoints/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ target_sources(${PROJECT_NAME}
3333
"factoryReset/FactoryReset.cpp"
3434
"restore/RestoreEndpoint.cpp"
3535
"update/UpdateEndpoint.cpp"
36-
"update/UpdatePureOS.cpp"
36+
"update/UpdateMuditaOS.cpp"
3737
"developerMode/DeveloperModeEndpoint.cpp"
3838
"developerMode/DeveloperModeHelper.cpp"
3939

0 commit comments

Comments
 (0)